Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 877a603b

Von Kivitendo Admin vor etwa 1 Jahr hinzugefügt

  • ID 877a603b6980a33e392907296995e1141a092de9
  • Vorgänger f8c31b75
  • Nachfolger 853e4147

Einkaufsrechnungen - fx_paid -> defaultcurrency_paid

siehe Ticket #563, Währung und Fremdwährung waren vertauscht.

Unterschiede anzeigen:

bin/mozilla/ir.pl
$form->{"memo_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{memo};
$form->{paidaccounts} = $i;
# hook for calc of of fx_paid and check if banktransaction has a record exchangerate
# hook for calc of of defaultcurrency_paid and check if banktransaction has a record exchangerate
if ($form->{"exchangerate_$i"}) {
my $bt_acc_trans = SL::DB::Manager::BankTransactionAccTrans->find_by(acc_trans_id => $form->{"acc_trans_id_$i"});
if ($bt_acc_trans) {
......
$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
}
} else {
$form->{$key} =
templates/webpages/ir/_payments.html
<td align="center">
[% 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 align="center">[%- 'Total' | $T8 %]</td>
<td align="center">[% LxERP.format_amount(totalpaid, 2) | html %] [% defaultcurrency %]</td>
<td align="center">[% LxERP.format_amount(totalpaid, 2) | html %] [% currency %]</td>
<td></td>
[% IF show_exchangerate %]
<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 %]">
[% END %]
</tr>
[% UNLESS show_exchangerate %]

Auch abrufbar als: Unified diff