Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 437c5cd4

Von Jan Büren vor mehr als 2 Jahren hinzugefügt

  • ID 437c5cd4b59253c7e68d9e8ea53b6b4e9dc0c0e4
  • Vorgänger 40416dee
  • Nachfolger 203d1f43

Rückgabewert für invoice_amount auch wirklich aufaddieren. Ferner ...

... Wechselkursgewinne auch im Nebenbuch erfassen.
OFFEN: erneuter manueller Test

Unterschiede anzeigen:

SL/DB/Helper/Payment.pm
# currency has to be passed and caller has to be sure to assign it for a forex invoice
# dies if called for a invoice with the default currency (TODO: Params::Validate before)
my ($exchangerate, $currency, $fx_gain_loss_amount, $return_bank_amount);
$return_bank_amount = 0;
if ($params{currency} || $params{currency_id} && $self->forex) { # currency was specified
$currency = SL::DB::Manager::Currency->find_by(name => $params{currency}) || SL::DB::Manager::Currency->find_by(id => $params{currency_id});
# set exchangerate - no fallback
......
taxkey => 0,
tax_id => SL::DB::Manager::Tax->find_by(taxkey => 0)->id);
$new_acc_trans->save;
$return_bank_amount = $amount;
$return_bank_amount += $amount; # dont exclude fx_booking ;-)
push @new_acc_ids, $new_acc_trans->acc_trans_id;
# deal with fxtransaction ...
# if invoice exchangerate differs from exchangerate of payment
......
my $fxloss_chart = SL::DB::Manager::Chart->find_by(id => $::instance_conf->get_fxloss_accno_id) || die "Can't determine fxloss chart";
$main::lxdebug->message(0, 'was sagt gain loss' . $fx_gain_loss_amount);
my $gain_loss_chart = $fx_gain_loss_amount > 0 ? $fxgain_chart : $fxloss_chart;
$paid_amount += $fx_gain_loss_amount if $fx_gain_loss_amount < 0; # only add if we have fx_loss
$paid_amount += abs($fx_gain_loss_amount); # if $fx_gain_loss_amount < 0; # only add if we have fx_loss
$main::lxdebug->message(0, 'paid2 ' . $paid_amount);
$main::lxdebug->message(0, 'paid2chart ' . $fx_gain_loss_amount);
# $fx_gain_loss_amount = $gain_loss_amount;

Auch abrufbar als: Unified diff