Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 272d7a97

Von Tamino Steinert vor fast 2 Jahren hinzugefügt

FIX: Zeile in Zusammenfassung hinzufügen wenn show_update_button aktiv

Unterschiede anzeigen:

templates/design40_webpages/order/tabs/_tax_row.html
11 11

  
12 12
<tr class="tax_row">
13 13
  <td colspan="[%- n_col %]"></td>
14
  [%- IF SELF.show_update_button -%]
15
  <td></td>
16
  [%- END -%]
14 17
  <th colspan="3">[% IF TAXINCLUDED %][% 'Including' | $T8 %]&nbsp;[% END %][% TAX.tax.taxdescription %] [% TAX.tax.rate_as_percent %]%</th>
15 18
  <td class="numeric">[% LxERP.format_amount(TAX.amount, 2, 0) %]</td>
16 19
</tr>
17 20
[% IF TAXINCLUDED %]
18 21
<tr class="tax_row">
19 22
  <td colspan="[%- n_col %]"></td>
23
  [%- IF SELF.show_update_button -%]
24
  <td></td>
25
  [%- END -%]
20 26
  <th colspan="3">[% 'Net amount' | $T8 %]</th>
21 27
  <td class="numeric">[% LxERP.format_amount(TAX.netamount, 2, 0) %]</td>
22 28
</tr>
templates/design40_webpages/order/tabs/basic_data.html
383 383
    [% END %]
384 384
    <tr id="subtotal_row_id">
385 385
      <td colspan="[%- 10 + add_col %]"></td>
386
      [%- IF SELF.show_update_button -%]
387
      <td></td>
388
      [%- END -%]
386 389
      <th colspan="3">[% IF SELF.order.taxincluded %][% 'Subtotal' | $T8 %][% END %]</th>
387 390
      <td>[% IF SELF.order.taxincluded %][% L.div_tag(SELF.order.netamount_as_number, id='netamount_id') %][% END %]</td>
388 391
    </tr>
......
399 402
      [%- ELSE -%]
400 403
      <td colspan="7"></td>
401 404
      [%- END -%]
405
      [%- IF SELF.show_update_button -%]
406
      <td></td>
407
      [%- END -%]
402 408
      <td colspan="[%- 3 + add_col %]"></td>
403 409
      <th colspan="3">[% 'Total' | $T8 %]</th>
404 410
      <td class="numeric">[% L.div_tag(SELF.order.amount_as_number, id='amount_id') %]</td>
templates/design40_webpages/reclamation/tabs/basic_data.html
341 341
    <tfoot>
342 342
      <tr id="subtotal_row_id">
343 343
        <td colspan="13"></td>
344
        [%- IF SELF.show_update_button -%]
345
        <td></td>
346
        [%- END -%]
344 347
        <th colspan="3">[%- 'Subtotal' | $T8 %]</th>
345 348
        <td class="numeric">[% IF SELF.reclamation.taxincluded %][%- L.div_tag(SELF.reclamation.netamount_as_number, id='netamount_id') %][% END %]</td>
346 349
      </tr>
......
349 352
      [%- END %]
350 353
      <tr id="amount_row_id">
351 354
        <td colspan="13"></td>
355
        [%- IF SELF.show_update_button -%]
356
        <td></td>
357
        [%- END -%]
352 358
        <th colspan="3">[%- 'Total' | $T8 %]</th>
353 359
        <td class="numeric">
354 360
          [%- L.div_tag(SELF.reclamation.amount_as_number, id='amount_id') %]
templates/design40_webpages/reclamation/tabs/basic_data/_tax_row.html
5 5

  
6 6
<tr class="tax_row">
7 7
  <td colspan="13"></td>
8
  [%- IF SELF.show_update_button -%]
9
  <td></td>
10
  [%- END -%]
8 11
  <th colspan="3">[%- IF TAXINCLUDED %][%- 'Including' | $T8 %]&nbsp;[%- END %][%- TAX.tax.taxdescription %] [% TAX.tax.rate_as_percent %]%</th>
9 12
  <td class="numeric">[%- LxERP.format_amount(TAX.amount, 2, 0) %]</td>
10 13
</tr>
11 14
[%- IF TAXINCLUDED %]
12 15
<tr class="tax_row">
13 16
  <td colspan="13"></td>
17
  [%- IF SELF.show_update_button -%]
18
  <td></td>
19
  [%- END -%]
14 20
  <th colspan="3">[%- 'Net amount' | $T8 %]</th>
15 21
  <td class="numeric">[%- LxERP.format_amount(TAX.netamount, 2, 0) %]</td>
16 22
</tr>

Auch abrufbar als: Unified diff