Revision 977d7264
Von Sven Schöling vor 10 Monaten hinzugefügt
| templates/design40_webpages/ap/form_header.html | ||
|---|---|---|
| 343 | 343 |
<td> |
| 344 | 344 |
[% temp = "exchangerate_"_ i %] |
| 345 | 345 |
[% temp_forex = "forex_"_ i %] |
| 346 |
[% SET fx_paid = 'fx_paid_' _ i %]
|
|
| 346 |
[% SET defaultcurrency_paid = 'defaultcurrency_paid_' _ i %]
|
|
| 347 | 347 |
[% SET record_forex = 'record_forex_' _ i %] |
| 348 | 348 |
|
| 349 | 349 |
[% IF( $temp_forex || !changeable ) %] |
| 350 |
[% $temp | html %] = [% LxERP.format_amount($fx_paid,2) %] [% currency %] </br>
|
|
| 350 |
[% $temp | html %] = [% LxERP.format_amount($defaultcurrency_paid,2) %] [% defaultcurrency %] </br>
|
|
| 351 | 351 |
[% IF $record_forex %][% 'bank transaction exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %] |
| 352 | 352 |
<input type="hidden" name="[% temp %]" value="[% $temp | html %]"> |
| 353 | 353 |
[% ELSE %] |
| ... | ... | |
| 376 | 376 |
<td></td> |
| 377 | 377 |
<td></td> |
| 378 | 378 |
<th class="right">[% 'Total' | $T8 %]</th> |
| 379 |
<td class="numeric">[% LxERP.format_amount(totalpaid, 2) | html %] [% defaultcurrency %]</td>
|
|
| 379 |
<td class="numeric">[% LxERP.format_amount(totalpaid, 2) | html %] [% currency %]</td> |
|
| 380 | 380 |
<td></td> |
| 381 | 381 |
[% IF ( !defaultcurrency || (currency != defaultcurrency) ) %] |
| 382 |
<td class="numeric">[% LxERP.format_amount(fx_totalpaid, 2) | html %] [% currency %]</td>
|
|
| 383 |
<input type="hidden" name="fx_totalpaid" value="[% fx_totalpaid %]">
|
|
| 382 |
<td align="numeric">[% LxERP.format_amount(defaultcurrency_totalpaid, 2) | html %] [% defaultcurrency %]</td>
|
|
| 383 |
<input type="hidden" name="defaultcurrency_totalpaid" value="[% defaultcurrency_totalpaid %]">
|
|
| 384 | 384 |
<input type="hidden" name="is_linked_bank_transaction" value="[% is_linked_bank_transaction %]"> |
| 385 | 385 |
[% END %] |
| 386 | 386 |
<td></td> |
| ... | ... | |
| 390 | 390 |
<td></td> |
| 391 | 391 |
<td></td> |
| 392 | 392 |
<th class="right">[% 'Missing amount' | $T8 %]</th> |
| 393 |
<td class="numeric">[% LxERP.format_amount(paid_missing, 2) | html %] [% defaultcurrency %]</td>
|
|
| 393 |
<td class="numeric">[% LxERP.format_amount(paid_missing, 2) | html %] [% currency %]</td> |
|
| 394 | 394 |
<td></td> |
| 395 | 395 |
[% IF ( !defaultcurrency || (currency != defaultcurrency) ) %] |
| 396 | 396 |
<td></td> |
| templates/design40_webpages/ar/form_header.html | ||
|---|---|---|
| 331 | 331 |
<td class="numeric"> |
| 332 | 332 |
[% IF row.forex || !row.changeable%] |
| 333 | 333 |
<input type="hidden" name="exchangerate_[% loop.count %]" value="[% LxERP.format_amount(row.exchangerate, 5, 1) %]"> |
| 334 |
[%- LxERP.format_amount(row.exchangerate, 5, 0) -%] = [% LxERP.format_amount(row.fx_paid, 2) %] [% currency %]</br>
|
|
| 334 |
[%- LxERP.format_amount(row.exchangerate, 5, 0) -%] = [% LxERP.format_amount(row.defaultcurrency_paid, 2) %] [% defaultcurrency %]</br>
|
|
| 335 | 335 |
[% IF $record_forex %][% 'bank transaction exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %] |
| 336 | 336 |
[% ELSE %] |
| 337 | 337 |
<input type="text" name="exchangerate_[% loop.count %]" size="10" value="[% LxERP.format_amount(row.exchangerate, 5, 1) %]"> |
| ... | ... | |
| 364 | 364 |
<td></td> |
| 365 | 365 |
<td></td> |
| 366 | 366 |
<th class="right">[% 'Total' | $T8 %]</th> |
| 367 |
<td class="numeric">[% LxERP.format_amount(totalpaid, 2) | html %] [% defaultcurrency %]</td>
|
|
| 367 |
<td align="numeric">[% LxERP.format_amount(totalpaid, 2) | html %] [% currency %] </td>
|
|
| 368 | 368 |
<td></td> |
| 369 | 369 |
[% IF show_exch %] |
| 370 |
<td class="numeric">[% LxERP.format_amount(fx_totalpaid, 2) | html %] [% currency %]</td>
|
|
| 371 |
<input type="hidden" name="fx_totalpaid" value="[% fx_totalpaid %]">
|
|
| 370 |
<td align="numeric">[% LxERP.format_amount(defaultcurrency_totalpaid, 2) | html %] [% defaultcurrency %]</td>
|
|
| 371 |
<input type="hidden" name="defaultcurrency_totalpaid" value="[% defaultcurrency_totalpaid %]">
|
|
| 372 | 372 |
<input type="hidden" name="is_linked_bank_transaction" value="[% is_linked_bank_transaction %]"> |
| 373 | 373 |
[% END %] |
| 374 | 374 |
<td></td> |
| ... | ... | |
| 379 | 379 |
<td></td> |
| 380 | 380 |
<th class="right">[% 'Missing amount' | $T8 %]</th> |
| 381 | 381 |
<td class="numeric"> |
| 382 |
[% LxERP.format_amount(paid_missing, 2) | html %] |
|
| 382 |
[% LxERP.format_amount(paid_missing, 2) | html %] [% currency %]
|
|
| 383 | 383 |
<input type="hidden" name="paidaccounts" value="[% paidaccounts %]"> |
| 384 | 384 |
</td> |
| 385 | 385 |
<td></td> |
| templates/design40_webpages/ir/_payments.html | ||
|---|---|---|
| 83 | 83 |
<td class="numeric"> |
| 84 | 84 |
[% SET forex = 'forex_' _ i %] |
| 85 | 85 |
[% SET exchangerate = 'exchangerate_' _ i %] |
| 86 |
[% SET fx_paid = 'fx_paid_' _ i %]
|
|
| 86 |
[% SET defaultcurrency_paid = 'defaultcurrency_paid_' _ i %]
|
|
| 87 | 87 |
[% SET record_forex = 'record_forex_' _ i %] |
| 88 | 88 |
[% IF $forex %] |
| 89 | 89 |
<input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 5) %]"> |
| 90 | 90 |
<input type="hidden" name="record_forex_[% i %]" value="[% $record_forex %]"> |
| 91 | 91 |
<input type="hidden" name="forex_[% i %]" value="[% $forex %]"> |
| 92 |
<input type="hidden" name="fx_paid_[% i %]" value="[% $fx_paid %]">
|
|
| 93 |
[% LxERP.format_amount($forex, 5) %] = [% LxERP.format_amount($fx_paid, 5) %] [% currency %] </br>
|
|
| 92 |
<input type="hidden" name="defaultcurrency_paid_[% i %]" value="[% $defaultcurrency_paid %]">
|
|
| 93 |
[% LxERP.format_amount($forex, 5) %] = [% LxERP.format_amount($defaultcurrency_paid, 5) %] [% defaultcurrency %] </br>
|
|
| 94 | 94 |
[% IF $record_forex %][% 'bank transaction exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %] |
| 95 | 95 |
[% ELSE %] |
| 96 | 96 |
[% IF $changeable %] |
| ... | ... | |
| 121 | 121 |
<td></td> |
| 122 | 122 |
<td></td> |
| 123 | 123 |
<td>[% 'Total' | $T8 %]</td> |
| 124 |
<td>[% LxERP.format_amount(totalpaid, 2) | html %] [% defaultcurrency %]</td>
|
|
| 124 |
<td>[% LxERP.format_amount(totalpaid, 2) | html %] [% currency %]</td> |
|
| 125 | 125 |
<td></td> |
| 126 | 126 |
[% IF show_exchangerate %] |
| 127 |
<td class="numeric">[% LxERP.format_amount(fx_totalpaid, 2) | html %] [% currency %]</td>
|
|
| 128 |
<input type="hidden" name="fx_totalpaid" value="[% fx_totalpaid %]">
|
|
| 127 |
<td align="numeric">[% LxERP.format_amount(defaultcurrency_totalpaid, 2) | html %] [% defaultcurrency %]</td>
|
|
| 128 |
<input type="hidden" name="defaultcurrency_totalpaid" value="[% defaultcurrency_totalpaid %]">
|
|
| 129 | 129 |
[% END %] |
| 130 | 130 |
<td colspan="2"></td> |
| 131 | 131 |
</tr> |
| templates/design40_webpages/is/_payments.html | ||
|---|---|---|
| 84 | 84 |
<td class="numeric"> |
| 85 | 85 |
[% SET forex = 'forex_' _ i %] |
| 86 | 86 |
[% SET exchangerate = 'exchangerate_' _ i %] |
| 87 |
[% SET fx_paid = 'fx_paid_' _ i %]
|
|
| 87 |
[% SET defaultcurrency_paid = 'defaultcurrency_paid_' _ i %]
|
|
| 88 | 88 |
[% SET record_forex = 'record_forex_' _ i %] |
| 89 | 89 |
[% IF $forex %] |
| 90 | 90 |
<input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 5) %]"> |
| 91 |
[% LxERP.format_amount($forex, 5) %] = [% LxERP.format_amount($fx_paid, 5) %] [% currency %] </br>
|
|
| 91 |
[% LxERP.format_amount($forex, 5) %] = [% LxERP.format_amount($defaultcurrency_paid, 5) %] [% defaultcurrency %] </br>
|
|
| 92 | 92 |
[% IF $record_forex %][% 'bank transaction exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %] |
| 93 | 93 |
[% ELSE %] |
| 94 | 94 |
[% IF $changeable %] |
| ... | ... | |
| 115 | 115 |
<tr> |
| 116 | 116 |
<td colspan="2"></td> |
| 117 | 117 |
<td class="right">[% 'Total' | $T8 %]</td> |
| 118 |
<td class="numeric">[% LxERP.format_amount(totalpaid, 2) | html %] [% defaultcurrency %]</td>
|
|
| 118 |
<td align="numeric">[% LxERP.format_amount(totalpaid, 2) | html %] [% currency %]</td>
|
|
| 119 | 119 |
<td></td> |
| 120 | 120 |
[% IF show_exchangerate %] |
| 121 |
<td class="numeric ">[% LxERP.format_amount(fx_totalpaid, 2) | html %] [% currency %]</td>
|
|
| 121 |
<td align="numeric">[% LxERP.format_amount(defaultcurrency_totalpaid, 2) | html %] [% defaultcurrency %]</td>
|
|
| 122 | 122 |
[% ELSE %] |
| 123 | 123 |
[% END %] |
| 124 | 124 |
<td></td> |
| 125 | 125 |
</tr> |
| 126 |
[% UNLESS show_exchangerate %] |
|
| 127 | 126 |
<tr> |
| 128 | 127 |
<td colspan="2"></td> |
| 129 | 128 |
<td class="right">[% 'Missing amount' | $T8 %]</td> |
| 130 |
<td class="numeric">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
|
|
| 129 |
<td align="numeric">[% LxERP.format_amount(paid_missing, 2) | html %] [% currency %]</td>
|
|
| 131 | 130 |
<td colspan="2"> |
| 132 | 131 |
</td> |
| 133 | 132 |
</tr> |
| 134 |
[% END %] |
|
| 135 | 133 |
</tfoot> |
| 136 | 134 |
</table> |
| 137 | 135 |
<input type="hidden" name="paidaccounts" value="[% paidaccounts %]"> |
Auch abrufbar als: Unified diff
fx_paid -> defaultcurrency_paid in design40
Dieser Commit implementiert die template Anpassungen von Geoffrey für
die design40 templates