ActionBar: Verwendung in Berichtsfunktion in ar.pl

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index ecd357eeb13bffb92c5af096004f00011c937240..a4f559034fd11c4af2ce055d78e3df8ed8a7ef92 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -909,6 +909,46 @@ sub yes {
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

+sub setup_ar_search_action_bar {
+  my %params = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        $::locale->text('Search'),
+        submit    => [ '#form' ],
+        accesskey => 'enter',
+      ],
+    );
+  }
+}
+
+sub setup_ar_transactions_action_bar {
+  my %params = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        $::locale->text('Print'),
+        call     => [ 'kivi.MassInvoiceCreatePrint.showMassPrintOptionsOrDownloadDirectly' ],
+        disabled => !$params{num_rows} ? $::locale->text('The report doesn\'t contain entries.') : undef,
+      ],
+
+      combobox => [
+        action => [ $::locale->text('Create new') ],
+        action => [
+          $::locale->text('AR Transaction'),
+          submit => [ '#create_new_form', { action => 'ar_transaction' } ],
+        ],
+        action => [
+          $::locale->text('Sales Invoice'),
+          submit => [ '#create_new_form', { action => 'sales_invoice' } ],
+        ],
+      ], # end of combobox "Create new"
+    );
+  }
+}
+

 sub search {
   $main::lxdebug->enter_sub();
 
 sub search {
   $main::lxdebug->enter_sub();
 


@@ -936,6 +976,8 @@ sub search {
 
   $::request->layout->add_javascripts("autocomplete_project.js");
 
 
   $::request->layout->add_javascripts("autocomplete_project.js");
 

+  setup_ar_search_action_bar();
+

   $form->header;
   print $form->parse_html_template('ar/search', { %myconfig });
 
   $form->header;
   print $form->parse_html_template('ar/search', { %myconfig });
 


@@ -1202,7 +1244,10 @@ sub ar_transactions {
   $report->add_separator();
   $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
 
   $report->add_separator();
   $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
 

-  $report->generate_with_headers();
+  $::request->layout->add_javascripts('kivi.MassInvoiceCreatePrint.js');
+  setup_ar_transactions_action_bar(num_rows => scalar(@{ $form->{AR} }));
+
+  $report->generate_with_headers(action_bar => 1);

 
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }

diff --git a/js/kivi.MassInvoiceCreatePrint.js b/js/kivi.MassInvoiceCreatePrint.js
index bfb215e80239446ece238aa26e61623b5bd035d6..d00e56ab9614b9f170c3b88df8b41c186ea61168 100644 (file)
--- a/js/kivi.MassInvoiceCreatePrint.js
+++ b/js/kivi.MassInvoiceCreatePrint.js
@@ -12,6 +12,7 @@ namespace('kivi.MassInvoiceCreatePrint', function(ns) {
     alert(kivi.t8('No delivery orders have been selected.'));
     return false;
   };
     alert(kivi.t8('No delivery orders have been selected.'));
     return false;
   };

+

   this.checkInvoiceSelection = function() {
     if ($("[data-checkall=1]:checked").size() > 0)
       return true;
   this.checkInvoiceSelection = function() {
     if ($("[data-checkall=1]:checked").size() > 0)
       return true;


@@ -78,7 +79,41 @@ namespace('kivi.MassInvoiceCreatePrint', function(ns) {
   this.setup = function() {
     $('#create_button').click(kivi.MassInvoiceCreatePrint.submitMassCreationForm);
     $('#create_print_all_button').click(kivi.MassInvoiceCreatePrint.createPrintAllInitialize);
   this.setup = function() {
     $('#create_button').click(kivi.MassInvoiceCreatePrint.submitMassCreationForm);
     $('#create_print_all_button').click(kivi.MassInvoiceCreatePrint.createPrintAllInitialize);

-    $('#action_print').click(kivi.MassInvoiceCreatePrint.checkInvoiceSelection);
+  };
+
+  ns.showMassPrintOptions = function() {
+    $('#printer_options_printer_id').val($('#printer_id').val());
+
+    kivi.popup_dialog({
+      id: 'print_options',
+      dialog: {
+        title: kivi.t8('Print options'),
+        width:  600,
+        height: 200
+      }
+    });
+
+    return true;
+  };
+
+  ns.showMassPrintOptionsOrDownloadDirectly = function() {
+    if (!kivi.MassInvoiceCreatePrint.checkInvoiceSelection())
+      return false;
+
+    if ($('#print_options_printer_id').length === 0)
+      return kivi.MassInvoiceCreatePrint.massPrint();
+    return kivi.MassInvoiceCreatePrint.showMassPrintOptions();
+  };
+
+  ns.massPrint = function() {
+    $('#print_options').dialog('close');
+
+    $('#printer_id').val($('#print_options_printer_id').val());
+    $('#action').val('MassInvoiceCreatePrint/print');
+
+    $('#report_form').submit();
+
+    return true;

   };
 });
 
   };
 });
 

diff --git a/locale/de/all b/locale/de/all
index c1a3845e8e83c2acc799045dce8865f28d6b3f6c..175f0cf9773f67983c5b84e80e7618fd1bb4fb9a 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -3071,6 +3071,7 @@ $self->{texts} = {
   'The recipient, subject or body is missing.' => 'Der Empfäger, der Betreff oder der Text ist leer.',
   'The record template \'#1\' has been loaded.' => 'Die Belegvorlage »#1« wurde geladen.',
   'The record template \'#1\' has been saved.' => 'Die Belegvorlage »#1« wurde gespeichert.',
   'The recipient, subject or body is missing.' => 'Der Empfäger, der Betreff oder der Text ist leer.',
   'The record template \'#1\' has been loaded.' => 'Die Belegvorlage »#1« wurde geladen.',
   'The record template \'#1\' has been saved.' => 'Die Belegvorlage »#1« wurde gespeichert.',

+  'The report doesn\'t contain entries.' => 'Der Bericht enthält keine Einträge.',

   'The required information consists of the IBAN and the BIC.' => 'Die benötigten Informationen bestehen aus der IBAN und der BIC. Zusätzlich wird die SEPA-Kreditoren-Identifikation aus der Mandantenkonfiguration benötigt.',
   'The required information consists of the IBAN, the BIC, the mandator ID and the mandate\'s date of signature.' => 'Die benötigten Informationen bestehen aus IBAN, BIC, Mandanten-ID und dem Unterschriftsdatum des Mandates. Zusätzlich wird die SEPA-Kreditoren-Identifikation aus der Mandantenkonfiguration benötigt.',
   'The requirement spec has been deleted.' => 'Das Pflichtenheft wurde gelöscht.',
   'The required information consists of the IBAN and the BIC.' => 'Die benötigten Informationen bestehen aus der IBAN und der BIC. Zusätzlich wird die SEPA-Kreditoren-Identifikation aus der Mandantenkonfiguration benötigt.',
   'The required information consists of the IBAN, the BIC, the mandator ID and the mandate\'s date of signature.' => 'Die benötigten Informationen bestehen aus IBAN, BIC, Mandanten-ID und dem Unterschriftsdatum des Mandates. Zusätzlich wird die SEPA-Kreditoren-Identifikation aus der Mandantenkonfiguration benötigt.',
   'The requirement spec has been deleted.' => 'Das Pflichtenheft wurde gelöscht.',

diff --git a/templates/webpages/ar/ar_transactions_bottom.html b/templates/webpages/ar/ar_transactions_bottom.html
index d2c0cdc1c6ca2c2fd2b72fbb1707a9617190dde2..bb939a5698d463e43791aef5c59386c34e31d24d 100644 (file)
--- a/templates/webpages/ar/ar_transactions_bottom.html
+++ b/templates/webpages/ar/ar_transactions_bottom.html
@@ -1,27 +1,24 @@
 [% USE T8 %][% USE HTML %][%- USE LxERP -%][%- USE L -%]
 
 [% USE T8 %][% USE HTML %][%- USE LxERP -%][%- USE L -%]
 

-  [% IF ALL_PRINTERS.size %]
-   <p>
-    [% LxERP.t8("Print destination") %]:
-    [% SET  printers = [ { description=LxERP.t8("Download PDF, do not print") } ] ;
-       CALL printers.import(ALL_PRINTERS);
-       L.select_tag("printer_id", printers, title_key="description", default=printer_id) %]
-   </p>
-  [% END %]
-
-  <p>
-   [% L.hidden_tag("action", "MassInvoiceCreatePrint/dispatch") %]
-   [% L.submit_tag("action_print", LxERP.t8("Print")) %]
-  </p>
+  [% L.hidden_tag("action", "MassInvoiceCreatePrint/dispatch") %]
+  [% L.hidden_tag("printer_id") %]

  </form>
 
  </form>
 

- <form method="post" action="dispatcher.pl?M=ar">
-
-  <input name="callback" type="hidden" value="[% callback %]">
-
-  [% 'Create new' | $T8 %]<br>
+ <form method="post" action="ar.pl" id="create_new_form">
+  [% L.hidden_tag("callback", callback) %]
+ </form>

 
 

-  <input class="submit" type="submit" name="A_ar_transaction" value="[%- 'AR Transaction' | $T8 %]">
-  <input class="submit" type="submit" name="A_sales_invoice" value="[%- 'Sales Invoice' | $T8 %]">
+[% IF ALL_PRINTERS.size %]
+ <div id="print_options" class="hidden">
+  <p>
+  [% LxERP.t8("Print destination") %]:
+  [% SET  printers = [ { description=LxERP.t8("Download PDF, do not print") } ] ;
+     CALL printers.import(ALL_PRINTERS);
+     L.select_tag("", printers, id="print_options_printer_id", title_key="description", default=printer_id) %]
+  </p>

 
 

- </form>
+  <p>
+   [% L.button_tag("kivi.MassInvoiceCreatePrint.massPrint()", LxERP.t8('Print')) %]
+  </p>
+ </div>
+[% END %]

diff --git a/templates/webpages/ar/ar_transactions_header.html b/templates/webpages/ar/ar_transactions_header.html
index a583aa92a80795b81aaabaad7e8bfadfa1853ff4..fcb318483989061e9e7bef6cbe611590cc2c9816 100644 (file)
--- a/templates/webpages/ar/ar_transactions_header.html
+++ b/templates/webpages/ar/ar_transactions_header.html
@@ -1 +1 @@
-<form method="post" action="controller.pl">
+<form method="post" action="controller.pl" id="report_form">

diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html
index d3e606bb11868808fa5873d9b00c9f51f0fe22a9..ceac6ce5a88bde58cd648956ea4f9950251742c0 100644 (file)
--- a/templates/webpages/ar/search.html
+++ b/templates/webpages/ar/search.html
@@ -3,7 +3,8 @@
 [%- SET style="width: 250px" %]
 <h1>[% title %]</h1>
 
 [%- SET style="width: 250px" %]
 <h1>[% title %]</h1>
 

- <form method=post name="search" action=[% script %]>
+ <form method=post name="search" id="form" action=[% script %]>
+  [% L.hidden_tag("action", nextsub) %]

 
   <table width=100% border="0">
   <tr>
 
   <table width=100% border="0">
   <tr>


@@ -206,11 +207,5 @@
       </table>
      </td>
     </tr>
       </table>
      </td>
     </tr>

-    <tr>
-     <td><hr size=3 noshade></td>
-    </tr>

    </table>
    </table>

-   <input type=hidden name=nextsub value=[% nextsub %]>
-   <br>
-   <input class=submit type=submit name=action id="continue" value="[% 'Continue' | $T8 %]">

   </form>
   </form>