Merge pull request #1 from freiphone/patch-1

Vorbereitung für Drucken und Buchen

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 8f4f28ac479f7e71312824acd3051283ae68d402..4c2d05916e409ce6f43d79ce645af418d6a8453f 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -581,9 +581,9 @@ sub form_header {
   if ($form->{resubmit} && ($form->{format} eq "html")) {
       $dispatch_to_popup  = "window.open('about:blank','Beleg'); document.oe.target = 'Beleg';";
       $dispatch_to_popup .= "document.do.submit();";
-  } elsif ($form->{resubmit}) {
+  } elsif ($form->{resubmit}  && $form->{action_print}) {
     # emulate click for resubmitting actions
-    $dispatch_to_popup  = "document.oe.${_}.click(); " for grep { /^action_/ } keys %$form;
+    $dispatch_to_popup  = "kivi.SalesPurchase.show_print_dialog(); kivi.SalesPurchase.print_record();";
   } elsif ($creditwarning) {
     $::request->{layout}->add_javascripts_inline("alert('$credittext');");
   }

diff --git a/locale/de/all b/locale/de/all
index f27c0e121dedd0732830103a8d9aa9b2b0b25035..e3457c76b3792828bfab602b6fe9a2ac9eff2145 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -2221,6 +2221,7 @@ $self->{texts} = {
   'Pricegroups'                 => 'Preisgruppen',
   'Prices'                      => 'Preise',
   'Print'                       => 'Drucken',
+  'Print and Post'              => 'Drucken und Buchen',
   'Print automatically'         => 'Automatisch ausdrucken',
   'Print both sided'            => 'Beidseitig ausdrucken',
   'Print delivery orders'       => 'Drucke Lieferscheine',