ActionBar: Verkaufsrechnungen: Drucken über Dialog implementiert

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 4f7e9e410ab39acac191578e8d4b09a053c774d7..6eae18e3964508ab4c6ef8a8379a78210962c4a2 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -339,7 +339,7 @@ sub setup_is_action_bar {
         action => [ t8('Export') ],
         action => [
           ($form->{id} ? t8('Print') : t8('Preview')),
         action => [ t8('Export') ],
         action => [
           ($form->{id} ? t8('Print') : t8('Preview')),

-          submit   => [ '#form', { action => "print" } ],
+          call     => [ 'kivi.SalesPurchase.show_print_dialog', $form->{id} ? 'print' : 'preview' ],

           checks   => [ @req_trans_desc ],
           disabled => !$form->{id} && $form->{locked} ? t8('The billing period has already been locked.') : undef,
         ],
           checks   => [ @req_trans_desc ],
           disabled => !$form->{id} && $form->{locked} ? t8('The billing period has already been locked.') : undef,
         ],

diff --git a/js/kivi.SalesPurchase.js b/js/kivi.SalesPurchase.js
index 0b09bebf89ab8e4942d4fafd75bbe833644fdc5f..3eae14e946b4e7fba676842441b40b6918ee363d 100644 (file)
--- a/js/kivi.SalesPurchase.js
+++ b/js/kivi.SalesPurchase.js
@@ -303,10 +303,12 @@ namespace('kivi.SalesPurchase', function(ns) {
   this.print_record = function() {
     $('#print_dialog').dialog('close');
 
   this.print_record = function() {
     $('#print_dialog').dialog('close');
 

-    kivi.submit_form_with_action('#form', 'print');
+    kivi.submit_form_with_action('#form', $('#form').data('print-action'));

   };
 
   };
 

-  this.show_print_dialog = function() {
+  this.show_print_dialog = function(print_action) {
+    $('#form').data('print-action', print_action || 'print');
+

     kivi.popup_dialog({
       id:    'print_dialog',
       dialog: {
     kivi.popup_dialog({
       id:    'print_dialog',
       dialog: {

diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html
index 837cd46dc884e516ce54d84e610fe520ab46206f..23646f105c1823d7c5a9427dd02d006a47d1a12c 100644 (file)
--- a/templates/webpages/is/form_footer.html
+++ b/templates/webpages/is/form_footer.html
@@ -166,3 +166,6 @@
 </script>
 
 <div id="shipto_dialog" class="hidden"></div>
 </script>
 
 <div id="shipto_dialog" class="hidden"></div>

+<div id="print_dialog" class="hidden">
+ [%- PROCESS 'common/_print_dialog.html' %]
+</div>