From: Bernd Bleßmann Date: Mon, 8 Nov 2021 14:51:08 +0000 (+0100) Subject: Anzahlungs-Rg.: Kein Zahlungsabschnitt in der Maske X-Git-Tag: kivitendo-mebil_0.1-0~10^2~2^2~217^2~50 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=3ab333a09811914aa2a259cce23e6dbcbef91d77;p=kivitendo-erp.git Anzahlungs-Rg.: Kein Zahlungsabschnitt in der Maske --- diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index e199bcadf..14b3946d9 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -246,8 +246,13 @@ sub prepare_invoice { if ($form->{type} eq "credit_note") { $form->{type} = "credit_note"; $form->{formname} = "credit_note"; + + } elsif ($form->{type} eq "invoice_for_advance_payment") { + $form->{type} = "invoice_for_advance_payment"; + } elsif ($form->{formname} eq "proforma" ) { $form->{type} = "invoice"; + } else { $form->{type} = "invoice"; $form->{formname} = "invoice"; @@ -559,6 +564,7 @@ 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}; @@ -702,6 +708,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_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 7d4c6089d..a31168515 100644 --- a/templates/webpages/is/form_footer.html +++ b/templates/webpages/is/form_footer.html @@ -135,7 +135,9 @@ -[% PROCESS 'is/_payments.html' %] +[% IF !is_type_invoice_for_advance_payment %] + [% PROCESS 'is/_payments.html' %] +[% END %] [% PROCESS 'webdav/_list.html' %]