Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 2aa88240

Von Tamino Steinert vor mehr als 1 Jahr hinzugefügt

FIX: _tax_row für Auftrag und Reklamation

Falsche If-Abfragen und fehlende Übergaben

Unterschiede anzeigen:

SL/Controller/Order.pm
1836 1836 
  foreach my $tax (sort { $a->{tax}->rate cmp $b->{tax}->rate } @{ $self->{taxes} }) {
1837 1837 
    $rows_as_html .= $self->p->render(
1838 1838 
      'order/tabs/_tax_row',
1839 
      SELF => $self,
1839 1840 
      TAX => $tax,
1840 1841 
      TAXINCLUDED => $self->order->taxincluded,
1841 1842 
      QUOTATION => $self->order->quotation
SL/Controller/Reclamation.pm
1423 1423 
  foreach my $tax (sort { $a->{tax}->rate cmp $b->{tax}->rate } @{ $self->reclamation->taxes }) {
1424 1424 
    $rows_as_html .= $self->p->render(
1425 1425 
                       'reclamation/tabs/basic_data/_tax_row',
1426 
                       SELF => $self,
1426 1427 
                       TAX => $tax,
1427 1428 
                       TAXINCLUDED => $self->reclamation->taxincluded,
1428 1429 
                     );
templates/design40_webpages/order/tabs/basic_data.html
386 386 
      [%- IF SELF.show_update_button -%]
387 387 
      <td></td>
388 388 
      [%- END -%]
389 
      <th colspan="3">[% IF SELF.order.taxincluded %][% 'Subtotal' | $T8 %][% END %]</th>
390 
      <td>[% IF SELF.order.taxincluded %][% L.div_tag(SELF.order.netamount_as_number, id='netamount_id') %][% END %]</td>
389 
      <th colspan="3">[% IF !SELF.order.taxincluded %][% 'Subtotal' | $T8 %][% END %]</th>
390 
      <td class="numeric">[% IF !SELF.order.taxincluded %][% L.div_tag(SELF.order.netamount_as_number, id='netamount_id') %][% END %]</td>
391 391 
    </tr>
392 392 
    [% FOREACH tax = SELF.taxes %]
393 393 
      [% PROCESS order/tabs/_tax_row.html TAX=tax TAXINCLUDED=SELF.order.taxincluded QUOTATION=SELF.order.quotation %]
templates/design40_webpages/reclamation/tabs/basic_data.html
344 344 
        [%- IF SELF.show_update_button -%]
345 345 
        <td></td>
346 346 
        [%- END -%]
347 
        <th colspan="3">[%- 'Subtotal' | $T8 %]</th>
348 
        <td class="numeric">[% IF SELF.reclamation.taxincluded %][%- L.div_tag(SELF.reclamation.netamount_as_number, id='netamount_id') %][% END %]</td>
347 
        <th colspan="3">[% IF !SELF.reclamation.taxincluded %][%- 'Subtotal' | $T8 %][% END %]</th>
348 
        <td class="numeric">[% IF !SELF.reclamation.taxincluded %][%- L.div_tag(SELF.reclamation.netamount_as_number, id='netamount_id') %][% END %]</td>
349 349 
      </tr>
350 350 
      [%- FOREACH tax = SELF.reclamation.taxes %]
351 351 
        [%- PROCESS reclamation/tabs/basic_data/_tax_row.html TAX=tax TAXINCLUDED=SELF.reclamation.taxincluded %]

Auch abrufbar als: Unified diff