From 307f0b13b5d0b1068cb7eacad1601f4786b28353 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Wed, 25 Jan 2017 12:41:56 +0100 Subject: [PATCH] =?utf8?q?ActionBar:=20Lieferscheine:=20E-Mail-Versand=20?= =?utf8?q?=C3=BCber=20Dialog=20implementiert?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- bin/mozilla/do.pl | 4 +- templates/webpages/do/form_footer.html | 12 ++-- templates/webpages/do/form_header.html | 99 ++++++++++++-------------- 3 files changed, 54 insertions(+), 61 deletions(-) diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index 8d57f0118..000fc6eee 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -328,7 +328,7 @@ sub setup_do_action_bar { ], action => [ t8('E Mail'), - submit => [ '#form', { action_print => 1 } ], + call => [ 'kivi.SalesPurchase.show_email_dialog' ], checks => [ @req_trans_desc ], ], ], # end of combobox "Export" @@ -479,7 +479,7 @@ sub form_footer { my $form = $main::form; - $form->{PRINT_OPTIONS} = print_options('inline' => 1); + $form->{PRINT_OPTIONS} = setup_sales_purchase_print_options(); $form->{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted(); print $form->parse_html_template('do/form_footer', diff --git a/templates/webpages/do/form_footer.html b/templates/webpages/do/form_footer.html index 4848b178c..a24ad0a0f 100644 --- a/templates/webpages/do/form_footer.html +++ b/templates/webpages/do/form_footer.html @@ -62,11 +62,7 @@ -
- -

[% PRINT_OPTIONS %]

- - + @@ -76,6 +72,12 @@ [%- PROCESS 'common/_ship_to_dialog.html' vc_obj=VC_OBJ %] [%- END %] + + + +