From: Jan Büren Date: Wed, 26 Sep 2018 10:08:11 +0000 (+0200) Subject: Einkaufsrechnung: Sinnfreie Weiche für Gutschrift entfernt (toter Code) X-Git-Tag: release-3.5.4~262 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=acbd9d0f24ae02d58ca34d480d84886b75ff7017;p=kivitendo-erp.git Einkaufsrechnung: Sinnfreie Weiche für Gutschrift entfernt (toter Code) Da es keine Einkaufsrechnungen-Gutschriften gibt, sind die entsprechend Weichen eher irritierend als hilfreich => entfernt. --- diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl index bf966587b..6d157fc8f 100644 --- a/bin/mozilla/ir.pl +++ b/bin/mozilla/ir.pl @@ -395,8 +395,6 @@ sub form_header { $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; } - # TODO There is no credit_note for vendor invoices (remove template code) - $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}; @@ -528,7 +526,6 @@ sub form_footer { $form->{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted(); print $form->parse_html_template('ir/form_footer', { - is_type_credit_note => ($form->{type} eq "credit_note"), totalpaid => $totalpaid, paid_missing => $form->{invtotal} - $totalpaid, show_storno => $form->{id} && !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ap") && !$totalpaid, diff --git a/templates/webpages/ir/_payments.html b/templates/webpages/ir/_payments.html index bef8c338e..d47ecd4f0 100644 --- a/templates/webpages/ir/_payments.html +++ b/templates/webpages/ir/_payments.html @@ -6,14 +6,8 @@ -[% IF is_type_credit_note || vc == 'vendor' %] -[% ELSE %] - -[%- END %] - - diff --git a/templates/webpages/ir/form_header.html b/templates/webpages/ir/form_header.html index 4c3d29a94..3b6843f8e 100644 --- a/templates/webpages/ir/form_header.html +++ b/templates/webpages/ir/form_header.html @@ -139,17 +139,6 @@ - -[%- IF is_type_credit_note %] - - - - - - - - -[%- ELSE %] @@ -165,8 +154,6 @@ -[%- END %] -
[% 'Payments' | $T8 %][% 'Incoming Payments' | $T8 %]
[% 'Date' | $T8 %] [% 'Source' | $T8 %][% 'Employee' | $T8 %] [% L.select_tag('employee_id', ALL_EMPLOYEES, default = employee_id, title_key = 'safe_name') %]
[% 'Credit Note Number' | $T8 %]
[% 'Credit Note Date' | $T8 %][% L.date_tag('invdate', invdate) %]
[% 'Invoice Number' | $T8 %] [% L.input_tag("invnumber", invnumber, size="11") %]
[% 'Order Number' | $T8 %]