From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 16 Jan 2017 12:21:07 +0000 (+0100)
Subject: ActionBar: Verwendung bei Massenerstellen von Rechnungen standardisiert
X-Git-Tag: release-3.5.4~1307
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=f372dca8af799141b0bc19e4ede7951ae579a967;p=kivitendo-erp.git

ActionBar: Verwendung bei Massenerstellen von Rechnungen standardisiert
---

diff --git a/SL/Controller/MassInvoiceCreatePrint.pm b/SL/Controller/MassInvoiceCreatePrint.pm
index 54313a6a2..bccd4a2c4 100644
--- a/SL/Controller/MassInvoiceCreatePrint.pm
+++ b/SL/Controller/MassInvoiceCreatePrint.pm
@@ -341,14 +341,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 +360,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 => [
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 a7b5d9364..67666ba65 100644
--- a/templates/webpages/mass_invoice_create_print_from_do/_filter.html
+++ b/templates/webpages/mass_invoice_create_print_from_do/_filter.html
@@ -26,6 +26,7 @@
    [% L.hidden_tag('sort_by', FORM.sort_by) %]
    [% L.hidden_tag('sort_dir', FORM.sort_dir) %]
    [% L.hidden_tag('page', FORM.page) %]
+   [% L.button_tag('$("#search_form").resetForm()', LxERP.t8('Reset')) %]
   </div>
 
  </form>