Revision a371de77
Von Kivitendo Admin vor etwa 1 Jahr hinzugefügt
| bin/mozilla/ap.pl | ||
|---|---|---|
|
# default account for current assets (i.e. 1801 - SKR04)
|
||
|
$form->{accno_arap} = IS->get_standard_accno_current_assets(\%myconfig, \%$form);
|
||
|
|
||
|
# reset form value of defaultcurrency_totalpaid, as it is currently a hidden and otherwise it gets accumulated after each update
|
||
|
# is only used if there are exchange rates
|
||
|
$form->{"defaultcurrency_totalpaid"} = 0;
|
||
|
|
||
|
for my $i (1 .. $form->{paidaccounts}) {
|
||
|
# hook for calc of of fx_paid and check if banktransaction has a record exchangerate
|
||
|
if ($form->{"exchangerate_$i"}) {
|
||
|
# hook for calc of of defaultcurrency_paid and check if banktransaction has a record exchangerate
|
||
|
if ($form->{"exchangerate_$i"} && $form->{"acc_trans_id_$i"}) {
|
||
|
my $bt_acc_trans = SL::DB::Manager::BankTransactionAccTrans->find_by(acc_trans_id => $form->{"acc_trans_id_$i"});
|
||
|
if ($bt_acc_trans) {
|
||
|
if ($bt_acc_trans->bank_transaction->exchangerate > 0) {
|
||
| ... | ... | |
|
$form->{"record_forex_$i"} = 1;
|
||
|
}
|
||
|
}
|
||
|
$form->{"fx_paid_$i"} = $form->{"paid_$i"} / $form->{"exchangerate_$i"};
|
||
|
$form->{"fx_totalpaid"} += $form->{"fx_paid_$i"};
|
||
|
} # end hook fx_paid
|
||
|
$form->{"defaultcurrency_paid_$i"} = $form->{"paid_$i"} * $form->{"exchangerate_$i"};
|
||
|
$form->{"defaultcurrency_totalpaid"} += $form->{"defaultcurrency_paid_$i"};
|
||
|
} # end hook defaultcurrency_paid
|
||
|
# format amounts
|
||
|
if ($form->{"paid_$i"}) {
|
||
|
$form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
|
||
| templates/webpages/ap/form_header.html | ||
|---|---|---|
|
<td align="center">
|
||
|
[% 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 %]">
|
||
| ... | ... | |
|
<td></td>
|
||
|
<td></td>
|
||
|
<td align="center">[% 'Total' | $T8 %]</td>
|
||
|
<td align="right">[% LxERP.format_amount(totalpaid, 2) | html %] [% defaultcurrency %]</td>
|
||
|
<td align="right">[% LxERP.format_amount(totalpaid, 2) | html %] [% currency %]</td>
|
||
|
[% IF ( !defaultcurrency || (currency != defaultcurrency) ) %]
|
||
|
<td></td>
|
||
|
<td align="center">[% LxERP.format_amount(fx_totalpaid, 2) | html %] [% currency %]</td>
|
||
|
<input type="hidden" name="fx_totalpaid" value="[% fx_totalpaid %]">
|
||
|
<td align="center">[% 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 align="center">[% 'Missing amount' | $T8 %]</td>
|
||
|
<td align="right">[% LxERP.format_amount(paid_missing, 2) | html %] [% defaultcurrency %]</td>
|
||
|
<td align="right">[% LxERP.format_amount(paid_missing, 2) | html %] [% currency %]</td>
|
||
|
</tr>
|
||
|
</table>
|
||
|
[% END %]
|
||
Auch abrufbar als: Unified diff
Kreditorenbuchungen - fx_paid -> defaultcurrency_paid
siehe Ticket #563, Währung und Fremdwährung waren vertauscht.