Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 44da8173

Von Sven Schöling vor fast 16 Jahren hinzugefügt

  • ID 44da81735f9d1f9ca2d8c22e230a00b8ef24d17e
  • Vorgänger daec8d7a
  • Nachfolger 0dd879bc

Bugfix: subtotal wurde nicht ans template weitergereicht.

Unterschiede anzeigen:

bin/mozilla/oe.pl
420 420
      }
421 421
    }
422 422

  
423
    $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0);
423
#    $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0); # template does this
424 424

  
425 425
  } else {
426 426
    foreach $item (split / /, $form->{taxaccounts}) {
templates/webpages/oe/form_footer_de.html
57 57
            <input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b>Steuer im Preis inbegriffen</b><br><br>
58 58
[%- END %]
59 59
            <table>
60
              [% subtotal %]
60
[%- IF NOT taxincluded %]
61
              <tr>
62
                <th align='right'>Zwischensumme</th>
63
                <td align='right'>[% LxERP.format_amount(invsubtotal, 2) %]</td>
64
              </tr>
65
[%- END %]
61 66
              [% tax %]
62 67
              <tr>
63 68
                <th align="right">Summe</th>
templates/webpages/oe/form_footer_master.html
57 57
            <input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b><translate>Tax Included</translate></b><br><br>
58 58
[%- END %]
59 59
            <table>
60
              [% subtotal %]
60
[%- IF NOT taxincluded %]
61
              <tr>
62
                <th align='right'><translate>Subtotal</translate></th>
63
                <td align='right'>[% LxERP.format_amount(invsubtotal, 2) %]</td>
64
              </tr>
65
[%- END %]
61 66
              [% tax %]
62 67
              <tr>
63 68
                <th align="right"><translate>Total</translate></th>

Auch abrufbar als: Unified diff