From: Jan Büren Date: Mon, 14 Feb 2022 09:40:29 +0000 (+0100) Subject: manueller Zahlungseingang beim Beleg, nur bei alten Rechnungstypen X-Git-Tag: kivitendo-mebil_0.1-0~10^2~2^2~217^2~2 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=332e327b6613bf762b34d841442378de255d946b;hp=b92770c71959c10c35321f585ff670fd567bcb66;p=kivitendo-erp.git manueller Zahlungseingang beim Beleg, nur bei alten Rechnungstypen und nicht bei Anzahlungs- oder Schlußrechnungen --- diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index 0be63a546..14b472fdb 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -624,11 +624,11 @@ sub form_header { $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; } - $TMPL_VAR{is_type_invoice_for_advance_payment} = $form->{type} eq "invoice_for_advance_payment"; - $TMPL_VAR{is_type_credit_note} = $form->{type} eq "credit_note"; - $TMPL_VAR{is_format_html} = $form->{format} eq 'html'; - $TMPL_VAR{dateformat} = $myconfig{dateformat}; - $TMPL_VAR{numberformat} = $myconfig{numberformat}; + $TMPL_VAR{is_type_normal_invoice} = $form->{type} eq "invoice"; + $TMPL_VAR{is_type_credit_note} = $form->{type} eq "credit_note"; + $TMPL_VAR{is_format_html} = $form->{format} eq 'html'; + $TMPL_VAR{dateformat} = $myconfig{dateformat}; + $TMPL_VAR{numberformat} = $myconfig{numberformat}; # hiddens $TMPL_VAR{HIDDENS} = [qw( @@ -768,7 +768,7 @@ sub form_footer { } print $form->parse_html_template('is/form_footer', { - is_type_invoice_for_advance_payment => ($form->{type} eq "invoice_for_advance_payment"), + is_type_normal_invoice => ($form->{type} eq "invoice"), is_type_credit_note => ($form->{type} eq "credit_note"), totalpaid => $totalpaid, paid_missing => $form->{invtotal} - $totalpaid, diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html index a31168515..856c7f488 100644 --- a/templates/webpages/is/form_footer.html +++ b/templates/webpages/is/form_footer.html @@ -134,8 +134,7 @@ - -[% IF !is_type_invoice_for_advance_payment %] +[% IF is_type_normal_invoice OR is_type_credit_note %] [% PROCESS 'is/_payments.html' %] [% END %]