X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FMassInvoiceCreatePrint.pm;h=a3cf2a07d8daf0fe891f0452a4e1411bc6a2824c;hb=141b46dfdd43b461bbbe2fdd4c5fcadc3d5247b4;hp=54313a6a24506456dca7a8eed9dba83c8fd27f32;hpb=31f989254ce9f2ab881af7aee5d07dd63df0e004;p=kivitendo-erp.git

diff --git a/SL/Controller/MassInvoiceCreatePrint.pm b/SL/Controller/MassInvoiceCreatePrint.pm
index 54313a6a2..a3cf2a07d 100644
--- a/SL/Controller/MassInvoiceCreatePrint.pm
+++ b/SL/Controller/MassInvoiceCreatePrint.pm
@@ -15,6 +15,7 @@ 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;
@@ -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'),
     },
@@ -324,8 +325,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 +342,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 +361,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 +372,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},
         ],