Revision f8c31b75
Von Kivitendo Admin vor 11 Monaten hinzugefügt
| bin/mozilla/is.pl | ||
|---|---|---|
| 258 | 258 |
$form->{"memo_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{memo};
|
| 259 | 259 |
|
| 260 | 260 |
$form->{paidaccounts} = $i;
|
| 261 |
# hook for calc of of fx_paid and check if banktransaction has a record exchangerate
|
|
| 261 |
# hook for calc of of defaultcurrency_paid and check if banktransaction has a record exchangerate
|
|
| 262 | 262 |
if ($form->{"exchangerate_$i"}) {
|
| 263 | 263 |
my $bt_acc_trans = SL::DB::Manager::BankTransactionAccTrans->find_by(acc_trans_id => $form->{"acc_trans_id_$i"});
|
| 264 | 264 |
if ($bt_acc_trans) {
|
| ... | ... | |
| 268 | 268 |
$form->{"record_forex_$i"} = 1;
|
| 269 | 269 |
} |
| 270 | 270 |
} |
| 271 |
$form->{"fx_paid_$i"} = $form->{"paid_$i"} / $form->{"exchangerate_$i"};
|
|
| 272 |
$form->{"fx_totalpaid"} += $form->{"fx_paid_$i"};
|
|
| 273 |
} # end hook fx_paid |
|
| 271 |
$form->{"defaultcurrency_paid_$i"} = $form->{"paid_$i"} * $form->{"exchangerate_$i"};
|
|
| 272 |
$form->{"defaultcurrency_totalpaid"} += $form->{"defaultcurrency_paid_$i"};
|
|
| 273 |
} # end hook defaultcurrency_paid |
|
| 274 |
|
|
| 274 | 275 |
} |
| 275 | 276 |
} else {
|
| 276 | 277 |
$form->{$key} = "$form->{acc_trans}{$key}->[0]->{accno}--$form->{acc_trans}{$key}->[0]->{description}";
|
| templates/webpages/is/_payments.html | ||
|---|---|---|
| 88 | 88 |
<td align="center"> |
| 89 | 89 |
[% SET forex = 'forex_' _ i %] |
| 90 | 90 |
[% SET exchangerate = 'exchangerate_' _ i %] |
| 91 |
[% SET fx_paid = 'fx_paid_' _ i %]
|
|
| 91 |
[% SET defaultcurrency_paid = 'defaultcurrency_paid_' _ i %]
|
|
| 92 | 92 |
[% SET record_forex = 'record_forex_' _ i %] |
| 93 | 93 |
[% IF $forex %] |
| 94 | 94 |
<input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 5) %]"> |
| 95 |
[% LxERP.format_amount($forex, 5) %] = [% LxERP.format_amount($fx_paid, 5) %] [% currency %] </br>
|
|
| 95 |
[% LxERP.format_amount($forex, 5) %] = [% LxERP.format_amount($defaultcurrency_paid, 5) %] [% defaultcurrency %] </br>
|
|
| 96 | 96 |
[% IF $record_forex %][% 'bank transaction exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %] |
| 97 | 97 |
[% ELSE %] |
| 98 | 98 |
[% IF $changeable %] |
| ... | ... | |
| 121 | 121 |
<td></td> |
| 122 | 122 |
<td></td> |
| 123 | 123 |
<td align="center">[%- 'Total' | $T8 %]</td> |
| 124 |
<td align="center">[% LxERP.format_amount(totalpaid, 2) | html %] [% defaultcurrency %]</td>
|
|
| 124 |
<td align="center">[% LxERP.format_amount(totalpaid, 2) | html %] [% currency %]</td> |
|
| 125 | 125 |
<td></td> |
| 126 | 126 |
[% IF show_exchangerate %] |
| 127 |
<td align="center">[% LxERP.format_amount(fx_totalpaid, 2) | html %] [% currency %]</td>
|
|
| 127 |
<td align="center">[% LxERP.format_amount(defaultcurrency_totalpaid, 2) | html %] [% defaultcurrency %]</td>
|
|
| 128 | 128 |
[% END %] |
| 129 | 129 |
</tr> |
| 130 |
[% UNLESS show_exchangerate %] |
|
| 131 | 130 |
<tr> |
| 132 | 131 |
<td></td> |
| 133 | 132 |
<td></td> |
| 134 | 133 |
<td align="center">[%- 'Missing amount' | $T8 %]</td> |
| 135 |
<td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td> |
|
| 134 |
<td align="center">[% LxERP.format_amount(paid_missing, 2) | html %] [% currency %]</td>
|
|
| 136 | 135 |
</tr> |
| 137 |
[% END %] |
|
| 138 | 136 |
<tr style='display:none'> |
| 139 | 137 |
<td> |
| 140 | 138 |
<input type="hidden" name="paidaccounts" value="[% paidaccounts %]"> |
Auch abrufbar als: Unified diff
Verkaufsrechnungen - fx_paid -> defaultcurrency_paid
siehe Ticket #563, Währung und Fremdwährung war vertauscht.