Massenerstellen von Rechnungen aus LS: Filtern nach Kundentyp

diff --git a/SL/Controller/MassInvoiceCreatePrint.pm b/SL/Controller/MassInvoiceCreatePrint.pm
index a3cf2a07d8daf0fe891f0452a4e1411bc6a2824c..78e7859c0dc89511d5583f48c9bf03b29b1897ce 100644 (file)
--- a/SL/Controller/MassInvoiceCreatePrint.pm
+++ b/SL/Controller/MassInvoiceCreatePrint.pm
@@ -22,7 +22,7 @@ use SL::SessionFile;
 use SL::System::TaskServer;
 use Rose::Object::MakeMethods::Generic
 (
 use SL::System::TaskServer;
 use Rose::Object::MakeMethods::Generic
 (

-  'scalar --get_set_init' => [ qw(invoice_models invoice_ids sales_delivery_order_models printers default_printer_id today) ],
+  'scalar --get_set_init' => [ qw(invoice_models invoice_ids sales_delivery_order_models printers default_printer_id today all_businesses) ],

 );
 
 __PACKAGE__->run_before('setup');
 );
 
 __PACKAGE__->run_before('setup');


@@ -262,6 +262,10 @@ sub init_default_printer_id {
   return $pr ? $pr->id : undef;
 }
 
   return $pr ? $pr->id : undef;
 }
 

+sub init_all_businesses {
+  return SL::DB::Manager::Business->get_all_sorted;
+}
+

 sub setup {
   my ($self) = @_;
   $::auth->assert('invoice_edit');
 sub setup {
   my ($self) = @_;
   $::auth->assert('invoice_edit');

diff --git a/templates/webpages/mass_invoice_create_print_from_do/_filter.html b/templates/webpages/mass_invoice_create_print_from_do/_filter.html
index 4508ba46057fb5646501f0788e595500153ba85f..08caf095264078331d2670e1ba4155b3b9f66aa9 100644 (file)
--- a/templates/webpages/mass_invoice_create_print_from_do/_filter.html
+++ b/templates/webpages/mass_invoice_create_print_from_do/_filter.html
@@ -13,6 +13,17 @@
      <th align="right">[% LxERP.t8('Customer') %]</th>
      <td>[% L.input_tag('filter.customer.name:substr::ilike', filter.customer.name_substr__ilike, size = 20) %]</td>
     </tr>
      <th align="right">[% LxERP.t8('Customer') %]</th>
      <td>[% L.input_tag('filter.customer.name:substr::ilike', filter.customer.name_substr__ilike, size = 20) %]</td>
     </tr>

+    <tr>
+     <th align="right">[% LxERP.t8('Customer type') %]</th>
+     <td>
+      [% L.select_tag('filter.customer.business_id', SELF.all_businesses,
+                      default    => filter.customer.business_id
+                      title_key  => 'description',
+                      value_key  => 'id',
+                      with_empty => 1,
+                      style      => 'width: 200px') %]
+     </td>
+    </tr>

     <tr>
      <th align="right">[% LxERP.t8('Delivery Order Date') %] [% LxERP.t8('From Date') %]</th>
      <td>[% L.date_tag('filter.transdate:date::ge', filter.transdate_date__ge) %]</td>
     <tr>
      <th align="right">[% LxERP.t8('Delivery Order Date') %] [% LxERP.t8('From Date') %]</th>
      <td>[% L.date_tag('filter.transdate:date::ge', filter.transdate_date__ge) %]</td>