Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 977d7264

Von Sven Schöling vor etwa 1 Jahr hinzugefügt

  • ID 977d726492d44276f2d3d4c15f3dbff2c427777b
  • Vorgänger 5f82335a
  • Nachfolger f57617a6

fx_paid -> defaultcurrency_paid in design40

Dieser Commit implementiert die template Anpassungen von Geoffrey für
die design40 templates

Unterschiede anzeigen:

templates/design40_webpages/ap/form_header.html
<td>
[% temp = "exchangerate_"_ i %]
[% temp_forex = "forex_"_ i %]
[% SET fx_paid = 'fx_paid_' _ i %]
[% SET defaultcurrency_paid = 'defaultcurrency_paid_' _ i %]
[% SET record_forex = 'record_forex_' _ i %]
[% IF( $temp_forex || !changeable ) %]
[% $temp | html %] = [% LxERP.format_amount($fx_paid,2) %] [% currency %] </br>
[% $temp | html %] = [% LxERP.format_amount($defaultcurrency_paid,2) %] [% defaultcurrency %] </br>
[% IF $record_forex %][% 'bank transaction exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
<input type="hidden" name="[% temp %]" value="[% $temp | html %]">
[% ELSE %]
......
<td></td>
<td></td>
<th class="right">[% 'Total' | $T8 %]</th>
<td class="numeric">[% LxERP.format_amount(totalpaid, 2) | html %] [% defaultcurrency %]</td>
<td class="numeric">[% LxERP.format_amount(totalpaid, 2) | html %] [% currency %]</td>
<td></td>
[% IF ( !defaultcurrency || (currency != defaultcurrency) ) %]
<td class="numeric">[% LxERP.format_amount(fx_totalpaid, 2) | html %] [% currency %]</td>
<input type="hidden" name="fx_totalpaid" value="[% fx_totalpaid %]">
<td align="numeric">[% LxERP.format_amount(defaultcurrency_totalpaid, 2) | html %] [% defaultcurrency %]</td>
<input type="hidden" name="defaultcurrency_totalpaid" value="[% defaultcurrency_totalpaid %]">
<input type="hidden" name="is_linked_bank_transaction" value="[% is_linked_bank_transaction %]">
[% END %]
<td></td>
......
<td></td>
<td></td>
<th class="right">[% 'Missing amount' | $T8 %]</th>
<td class="numeric">[% LxERP.format_amount(paid_missing, 2) | html %] [% defaultcurrency %]</td>
<td class="numeric">[% LxERP.format_amount(paid_missing, 2) | html %] [% currency %]</td>
<td></td>
[% IF ( !defaultcurrency || (currency != defaultcurrency) ) %]
<td></td>
templates/design40_webpages/ar/form_header.html
<td class="numeric">
[% IF row.forex || !row.changeable%]
<input type="hidden" name="exchangerate_[% loop.count %]" value="[% LxERP.format_amount(row.exchangerate, 5, 1) %]">
[%- LxERP.format_amount(row.exchangerate, 5, 0) -%] = [% LxERP.format_amount(row.fx_paid, 2) %] [% currency %]</br>
[%- LxERP.format_amount(row.exchangerate, 5, 0) -%] = [% LxERP.format_amount(row.defaultcurrency_paid, 2) %] [% defaultcurrency %]</br>
[% IF $record_forex %][% 'bank transaction exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
[% ELSE %]
<input type="text" name="exchangerate_[% loop.count %]" size="10" value="[% LxERP.format_amount(row.exchangerate, 5, 1) %]">
......
<td></td>
<td></td>
<th class="right">[% 'Total' | $T8 %]</th>
<td class="numeric">[% LxERP.format_amount(totalpaid, 2) | html %] [% defaultcurrency %]</td>
<td align="numeric">[% LxERP.format_amount(totalpaid, 2) | html %] [% currency %] </td>
<td></td>
[% IF show_exch %]
<td class="numeric">[% LxERP.format_amount(fx_totalpaid, 2) | html %] [% currency %]</td>
<input type="hidden" name="fx_totalpaid" value="[% fx_totalpaid %]">
<td align="numeric">[% LxERP.format_amount(defaultcurrency_totalpaid, 2) | html %] [% defaultcurrency %]</td>
<input type="hidden" name="defaultcurrency_totalpaid" value="[% defaultcurrency_totalpaid %]">
<input type="hidden" name="is_linked_bank_transaction" value="[% is_linked_bank_transaction %]">
[% END %]
<td></td>
......
<td></td>
<th class="right">[% 'Missing amount' | $T8 %]</th>
<td class="numeric">
[% LxERP.format_amount(paid_missing, 2) | html %]
[% LxERP.format_amount(paid_missing, 2) | html %] [% currency %]
<input type="hidden" name="paidaccounts" value="[% paidaccounts %]">
</td>
<td></td>
templates/design40_webpages/ir/_payments.html
<td class="numeric">
[% SET forex = 'forex_' _ i %]
[% SET exchangerate = 'exchangerate_' _ i %]
[% SET fx_paid = 'fx_paid_' _ i %]
[% SET defaultcurrency_paid = 'defaultcurrency_paid_' _ i %]
[% SET record_forex = 'record_forex_' _ i %]
[% IF $forex %]
<input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 5) %]">
<input type="hidden" name="record_forex_[% i %]" value="[% $record_forex %]">
<input type="hidden" name="forex_[% i %]" value="[% $forex %]">
<input type="hidden" name="fx_paid_[% i %]" value="[% $fx_paid %]">
[% LxERP.format_amount($forex, 5) %] = [% LxERP.format_amount($fx_paid, 5) %] [% currency %] </br>
<input type="hidden" name="defaultcurrency_paid_[% i %]" value="[% $defaultcurrency_paid %]">
[% LxERP.format_amount($forex, 5) %] = [% LxERP.format_amount($defaultcurrency_paid, 5) %] [% defaultcurrency %] </br>
[% IF $record_forex %][% 'bank transaction exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
[% ELSE %]
[% IF $changeable %]
......
<td></td>
<td></td>
<td>[% 'Total' | $T8 %]</td>
<td>[% LxERP.format_amount(totalpaid, 2) | html %] [% defaultcurrency %]</td>
<td>[% LxERP.format_amount(totalpaid, 2) | html %] [% currency %]</td>
<td></td>
[% IF show_exchangerate %]
<td class="numeric">[% LxERP.format_amount(fx_totalpaid, 2) | html %] [% currency %]</td>
<input type="hidden" name="fx_totalpaid" value="[% fx_totalpaid %]">
<td align="numeric">[% LxERP.format_amount(defaultcurrency_totalpaid, 2) | html %] [% defaultcurrency %]</td>
<input type="hidden" name="defaultcurrency_totalpaid" value="[% defaultcurrency_totalpaid %]">
[% END %]
<td colspan="2"></td>
</tr>
templates/design40_webpages/is/_payments.html
<td class="numeric">
[% SET forex = 'forex_' _ i %]
[% SET exchangerate = 'exchangerate_' _ i %]
[% SET fx_paid = 'fx_paid_' _ i %]
[% SET defaultcurrency_paid = 'defaultcurrency_paid_' _ i %]
[% SET record_forex = 'record_forex_' _ i %]
[% IF $forex %]
<input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 5) %]">
[% LxERP.format_amount($forex, 5) %] = [% LxERP.format_amount($fx_paid, 5) %] [% currency %] </br>
[% LxERP.format_amount($forex, 5) %] = [% LxERP.format_amount($defaultcurrency_paid, 5) %] [% defaultcurrency %] </br>
[% IF $record_forex %][% 'bank transaction exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
[% ELSE %]
[% IF $changeable %]
......
<tr>
<td colspan="2"></td>
<td class="right">[% 'Total' | $T8 %]</td>
<td class="numeric">[% LxERP.format_amount(totalpaid, 2) | html %] [% defaultcurrency %]</td>
<td align="numeric">[% LxERP.format_amount(totalpaid, 2) | html %] [% currency %]</td>
<td></td>
[% IF show_exchangerate %]
<td class="numeric ">[% LxERP.format_amount(fx_totalpaid, 2) | html %] [% currency %]</td>
<td align="numeric">[% LxERP.format_amount(defaultcurrency_totalpaid, 2) | html %] [% defaultcurrency %]</td>
[% ELSE %]
[% END %]
<td></td>
</tr>
[% UNLESS show_exchangerate %]
<tr>
<td colspan="2"></td>
<td class="right">[% 'Missing amount' | $T8 %]</td>
<td class="numeric">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
<td align="numeric">[% LxERP.format_amount(paid_missing, 2) | html %] [% currency %]</td>
<td colspan="2">
</td>
</tr>
[% END %]
</tfoot>
</table>
<input type="hidden" name="paidaccounts" value="[% paidaccounts %]">

Auch abrufbar als: Unified diff