Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 2aa88240

Von Tamino Steinert vor etwa 2 Jahren hinzugefügt

FIX: _tax_row für Auftrag und Reklamation

Falsche If-Abfragen und fehlende Übergaben

Unterschiede anzeigen:

SL/Controller/Order.pm
foreach my $tax (sort { $a->{tax}->rate cmp $b->{tax}->rate } @{ $self->{taxes} }) {
$rows_as_html .= $self->p->render(
'order/tabs/_tax_row',
SELF => $self,
TAX => $tax,
TAXINCLUDED => $self->order->taxincluded,
QUOTATION => $self->order->quotation
SL/Controller/Reclamation.pm
foreach my $tax (sort { $a->{tax}->rate cmp $b->{tax}->rate } @{ $self->reclamation->taxes }) {
$rows_as_html .= $self->p->render(
'reclamation/tabs/basic_data/_tax_row',
SELF => $self,
TAX => $tax,
TAXINCLUDED => $self->reclamation->taxincluded,
);
templates/design40_webpages/order/tabs/basic_data.html
[%- IF SELF.show_update_button -%]
<td></td>
[%- END -%]
<th colspan="3">[% IF SELF.order.taxincluded %][% 'Subtotal' | $T8 %][% END %]</th>
<td>[% IF SELF.order.taxincluded %][% L.div_tag(SELF.order.netamount_as_number, id='netamount_id') %][% END %]</td>
<th colspan="3">[% IF !SELF.order.taxincluded %][% 'Subtotal' | $T8 %][% END %]</th>
<td class="numeric">[% IF !SELF.order.taxincluded %][% L.div_tag(SELF.order.netamount_as_number, id='netamount_id') %][% END %]</td>
</tr>
[% FOREACH tax = SELF.taxes %]
[% PROCESS order/tabs/_tax_row.html TAX=tax TAXINCLUDED=SELF.order.taxincluded QUOTATION=SELF.order.quotation %]
templates/design40_webpages/reclamation/tabs/basic_data.html
[%- IF SELF.show_update_button -%]
<td></td>
[%- END -%]
<th colspan="3">[%- 'Subtotal' | $T8 %]</th>
<td class="numeric">[% IF SELF.reclamation.taxincluded %][%- L.div_tag(SELF.reclamation.netamount_as_number, id='netamount_id') %][% END %]</td>
<th colspan="3">[% IF !SELF.reclamation.taxincluded %][%- 'Subtotal' | $T8 %][% END %]</th>
<td class="numeric">[% IF !SELF.reclamation.taxincluded %][%- L.div_tag(SELF.reclamation.netamount_as_number, id='netamount_id') %][% END %]</td>
</tr>
[%- FOREACH tax = SELF.reclamation.taxes %]
[%- PROCESS reclamation/tabs/basic_data/_tax_row.html TAX=tax TAXINCLUDED=SELF.reclamation.taxincluded %]

Auch abrufbar als: Unified diff