X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/31f989254ce9f2ab881af7aee5d07dd63df0e004..dc2a8f704fb1cf452e11fc1c80c2f5e39ea8f30f:/SL/Controller/MassInvoiceCreatePrint.pm

diff --git a/SL/Controller/MassInvoiceCreatePrint.pm b/SL/Controller/MassInvoiceCreatePrint.pm
index 54313a6a2..aab63731a 100644
--- a/SL/Controller/MassInvoiceCreatePrint.pm
+++ b/SL/Controller/MassInvoiceCreatePrint.pm
@@ -15,13 +15,14 @@ use SL::DB::Order;
 use SL::DB::Printer;
 use SL::Helper::MassPrintCreatePDF qw(:all);
 use SL::Helper::CreatePDF qw(:all);
+use SL::Helper::File qw(store_pdf append_general_pdf_attachments doc_storage_enabled);
 use SL::Helper::Flash;
 use SL::Locale::String;
 use SL::SessionFile;
 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');
@@ -112,7 +113,7 @@ sub action_print {
     return $self->redirect_to(action => 'list_invoices');
   }
 
-  $self->download_or_print_documents(printer_id => $::form->{printer_id}, invoices => \@invoices);
+  $self->download_or_print_documents(printer_id => $::form->{printer_id}, invoices => \@invoices, bothsided => $::form->{bothsided});
 }
 
 sub action_create_print_all_start {
@@ -213,7 +214,7 @@ sub _init_sales_delivery_order_models {
       },
       customer     => t8('Customer'),
       employee     => t8('Employee'),
-      transdate    => t8('Date'),
+      transdate    => t8('Delivery Order Date'),
       donumber     => t8('Delivery Order Number'),
       ordnumber     => t8('Order Number'),
     },
@@ -261,6 +262,10 @@ sub init_default_printer_id {
   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');
@@ -290,7 +295,7 @@ sub download_or_print_documents {
       });
 
     @pdf_file_names = $self->create_pdfs(%pdf_params);
-    my $merged_pdf  = $self->merge_pdfs(file_names => \@pdf_file_names);
+    my $merged_pdf  = $self->merge_pdfs(file_names => \@pdf_file_names, bothsided => $params{bothsided});
     unlink @pdf_file_names;
 
     if (!$params{printer_id}) {
@@ -324,8 +329,8 @@ sub make_filter_summary {
 
   my @filters = (
     [ $filter->{customer}{"name:substr::ilike"}, t8('Customer') ],
-    [ $filter->{"transdate:date::ge"},           t8('Transdate') . " " . t8('From Date') ],
-    [ $filter->{"transdate:date::le"},           t8('Transdate') . " " . t8('To Date')   ],
+    [ $filter->{"transdate:date::ge"},           t8('Delivery Order Date') . " " . t8('From Date') ],
+    [ $filter->{"transdate:date::le"},           t8('Delivery Order Date') . " " . t8('To Date')   ],
   );
 
   for (@filters) {
@@ -341,14 +346,10 @@ sub setup_list_invoices_action_bar {
   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
       action => [
-        t8('Search'),
+        t8('Update'),
         submit    => [ '#search_form', { action => 'MassInvoiceCreatePrint/list_invoices' } ],
         accesskey => 'enter',
       ],
-      action => [
-        t8('Reset'),
-        call => [ 'kivi.call_jquery', '#search_form', 'resetForm' ],
-      ],
       action => [
         $::locale->text('Print'),
         call     => [ 'kivi.MassInvoiceCreatePrint.showMassPrintOptionsOrDownloadDirectly' ],
@@ -364,14 +365,10 @@ sub setup_list_sales_delivery_orders_action_bar {
   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
       action => [
-        t8('Search'),
+        $params{show_creation_buttons} ? t8('Update') : t8('Search'),
         submit    => [ '#search_form', { action => 'MassInvoiceCreatePrint/list_sales_delivery_orders' } ],
         accesskey => 'enter',
       ],
-      action => [
-        t8('Reset'),
-        call => [ 'kivi.call_jquery', '#search_form', 'resetForm' ],
-      ],
 
       combobox => [
         action => [
@@ -379,17 +376,15 @@ sub setup_list_sales_delivery_orders_action_bar {
           tooltip => t8("Create and print invoices")
         ],
         action => [
-          t8('for selected entries'),
+          t8("Create and print invoices for all selected delivery orders"),
           call     => [ 'kivi.MassInvoiceCreatePrint.submitMassCreationForm' ],
-          tooltip  => t8("Create and print invoices for all selected delivery orders"),
           disabled => !$params{num_rows} ? $::locale->text('The report doesn\'t contain entries.') : undef,
           only_if  => $params{show_creation_buttons},
         ],
 
         action => [
-          t8('for all entries'),
+          t8("Create and print invoices for all delivery orders matching the filter"),
           call     => [ 'kivi.MassInvoiceCreatePrint.createPrintAllInitialize' ],
-          tooltip  => t8("Create and print invoices for all delivery orders matching the filter"),
           disabled => !$params{num_rows} ? $::locale->text('The report doesn\'t contain entries.') : undef,
           only_if  => $params{show_creation_buttons},
         ],