Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 5ef28dc4

Von Jan Büren vor fast 2 Jahren hinzugefügt

  • ID 5ef28dc4aeafd6b6c983c82aaa950a06b758b1a7
  • Vorgänger 92044939
  • Nachfolger cb08bb5b

fx_loss doch erstmal ignorieren für invoice_amount

Unterschiede anzeigen:

SL/Controller/BankTransaction.pm
739 739
                          transdate     => $bank_transaction->valutadate->to_kivitendo);
740 740
    # First element is the booked amount for accno bank
741 741
    my $booked_amount = shift @acc_ids;
742
    # hotfix why
743
    $booked_amount = $bank_transaction->amount if abs($booked_amount > $bank_transaction->invoice_amount);
742 744
    $bank_transaction->invoice_amount($bank_transaction->invoice_amount + $booked_amount * $sign);
743 745
    # ... and record the origin via BankTransactionAccTrans
744 746
    if (scalar(@acc_ids) < 2) {
SL/DB/Helper/Payment.pm
195 195
        my $fxloss_chart = SL::DB::Manager::Chart->find_by(id => $::instance_conf->get_fxloss_accno_id) || die "Can't determine fxloss chart";
196 196
        $main::lxdebug->message(0, 'was sagt gain loss' . $fx_gain_loss_amount);
197 197
        my $gain_loss_chart  = $fx_gain_loss_amount > 0 ? $fxgain_chart : $fxloss_chart;
198
        $paid_amount += abs($fx_gain_loss_amount); # if $fx_gain_loss_amount < 0; # only add if we have fx_loss
198
        # $paid_amount += abs($fx_gain_loss_amount); # if $fx_gain_loss_amount < 0; # only add if we have fx_loss
199
        $paid_amount += $fx_gain_loss_amount if $fx_gain_loss_amount < 0; # only add if we have fx_loss
200

  
199 201
        $main::lxdebug->message(0, 'paid2 ' . $paid_amount);
200 202
        $main::lxdebug->message(0, 'paid2chart ' . $fx_gain_loss_amount);
201 203
        # $fx_gain_loss_amount = $gain_loss_amount;

Auch abrufbar als: Unified diff