Revision 38018893
Von Sven Schöling vor 10 Monaten hinzugefügt
| SL/AR.pm | ||
|---|---|---|
| 852 | 852 |
$form->{"forex_$j"} = $form->{acc_trans}{$key}->[$i - 1]->{exchangerate};
|
| 853 | 853 |
$form->{"exchangerate_$i"} = $form->{"forex_$j"};
|
| 854 | 854 |
$form->{"paid_project_id_$j"} = $form->{acc_trans}{$key}->[$i - 1]->{project_id};
|
| 855 |
$form->{"defaultcurrency_paid_$j"} = $form->{acc_trans}{$key}->[$i - 1]->{defaultcurrency_paid};
|
|
| 856 |
$form->{"fx_transaction_$j"} = $form->{acc_trans}{$key}->[$i - 1]->{fx_transaction};
|
|
| 855 | 857 |
$form->{paidaccounts}++;
|
| 856 | 858 |
|
| 857 | 859 |
} else { # e.g. AR_amount, AR, AR_tax
|
| bin/mozilla/ar.pl | ||
|---|---|---|
| 532 | 532 |
$form->{"record_forex_$i"} = 1;
|
| 533 | 533 |
} |
| 534 | 534 |
} |
| 535 |
$form->{"defaultcurrency_paid_$i"} = $form->{"paid_$i"} * $form->{"exchangerate_$i"};
|
|
| 535 |
if (!$form->{"fx_transaction_$i"}) {
|
|
| 536 |
# this is a banktransaction that was paid in internal currency. revert paid/defaultcurrency_paid |
|
| 537 |
$form->{"defaultcurrency_paid_$i"} = $form->{"paid_$i"};
|
|
| 538 |
$form->{"paid_$i"} /= $form->{"exchangerate_$i"};
|
|
| 539 |
} |
|
| 540 |
$form->{"defaultcurrency_paid_$i"} //= $form->{"paid_$i"} * $form->{"exchangerate_$i"};
|
|
| 536 | 541 |
$form->{"defaultcurrency_totalpaid"} += $form->{"defaultcurrency_paid_$i"};
|
| 537 | 542 |
} # end hook defaultcurrency_paid |
| 538 | 543 |
|
| templates/webpages/ar/form_header.html | ||
|---|---|---|
| 308 | 308 |
</td> |
| 309 | 309 |
[%- IF show_exch %] |
| 310 | 310 |
<td align=center> |
| 311 |
<input type="hidden" name="fx_transaction_[% loop.count %]" value="1"> |
|
| 311 | 312 |
[%- IF row.forex || !row.changeable%] |
| 312 | 313 |
<input type=hidden name="exchangerate_[% loop.count %]" value="[%- LxERP.format_amount(row.exchangerate, 5, 1) -%]"> |
| 313 | 314 |
[%- LxERP.format_amount(row.exchangerate, 5, 0) -%] = [% LxERP.format_amount(row.defaultcurrency_paid, 2) %] [% defaultcurrency %]</br> |
Auch abrufbar als: Unified diff
AR: fx_transaction payments
Es wird jetzt das fx_transaction flag durchgereicht, wenn die Zahlung im
FGrontend angelegt wurde, oder in Fremdwährung in der Datenbank gefunden
wurde.
Interne Währungszahlungen werden initial ohne fx_transaction geladen,
dann aber wie "normale" Fremdbuchungen durchgereicht