From 01ce6afc819dd2b322ceaac1c35f1fcaa4d4f702 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Tue, 10 Jan 2017 16:47:27 +0100 Subject: [PATCH] =?utf8?q?ActionBar:=20Rechnungen:=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/is.pl | 8 ++++---- templates/webpages/is/form_footer.html | 12 ++++++----- templates/webpages/is/form_header.html | 28 +++++++++++++------------- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index 208da110f..72b4dceca 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -344,7 +344,7 @@ sub setup_is_action_bar { disabled => !$form->{id} && $form->{locked} ? t8('The billing period has already been locked.') : undef, ], action => [ t8('E Mail'), - submit => [ '#form', { action_print => 1 } ], + call => [ 'kivi.SalesPurchase.show_email_dialog' ], checks => [ @req_trans_desc ], disabled => !$form->{id} ? t8('This invoice has not been posted yet.') : undef, ], @@ -463,10 +463,10 @@ sub form_header { # hiddens $TMPL_VAR{HIDDENS} = [qw( - id type media format queued printed emailed title vc discount + id type queued printed emailed vc discount title creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id max_dunning_level dunning_amount dunning_description - message email subject cc bcc taxaccounts cursor_fokus + taxaccounts cursor_fokus convert_from_do_ids convert_from_oe_ids convert_from_ar_ids useasnew invoice_id show_details @@ -602,7 +602,7 @@ sub form_footer { is_type_credit_note => ($form->{type} eq "credit_note"), totalpaid => $totalpaid, paid_missing => $form->{invtotal} - $totalpaid, - print_options => print_options(inline => 1), + print_options => setup_sales_purchase_print_options(), show_storno => $form->{id} && !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar") && !$totalpaid, show_delete => ($::instance_conf->get_is_changeable == 2) ? ($form->current_date(\%myconfig) eq $form->{gldate}) diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html index 56b39651b..d7e01c30b 100644 --- a/templates/webpages/is/form_footer.html +++ b/templates/webpages/is/form_footer.html @@ -144,11 +144,7 @@ -
- -

[% print_options %]

- - + [% P.hidden_tag('draft_id', draft_id) %] @@ -159,6 +155,12 @@ + + + +