X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/784c28807172339502f72e0e793172c3a3f6d67b..c954dea7c1b814d66b8c31d04fa70a1bbbcce71e:/SL/DB/Helper/Payment.pm diff --git a/SL/DB/Helper/Payment.pm b/SL/DB/Helper/Payment.pm index 969c55829..4403b0238 100644 --- a/SL/DB/Helper/Payment.pm +++ b/SL/DB/Helper/Payment.pm @@ -94,7 +94,7 @@ sub pay_invoice { if ( $params{'payment_type'} eq 'difference_as_skonto' ) { croak "amount $params{amount} doesn't match open amount " . $self->open_amount . ", diff = " . ($params{amount}-$self->open_amount) if $params{amount} && abs($self->open_amount - $params{amount} ) > 0.0000001; } elsif ( $params{'payment_type'} eq 'with_skonto_pt' ) { - croak "amount $params{amount} doesn't match amount less skonto: " . $self->open_amount . "\n" if $params{amount} && abs($self->amount_less_skonto - $params{amount} ) > 0.0000001; + croak "amount $params{amount} doesn't match amount less skonto: " . $self->amount_less_skonto . "\n" if $params{amount} && abs($self->amount_less_skonto - $params{amount} ) > 0.0000001; croak "payment type with_skonto_pt can't be used if payments have already been made" if $self->paid != 0; }; @@ -119,7 +119,7 @@ sub pay_invoice { my $fx_gain_loss_amount = 0; # for fx_gain and fx_loss my $db = $self->db; - $db->do_transaction(sub { + $db->with_transaction(sub { my $new_acc_trans; # all three payment type create 1 AR/AP booking (the paid part) @@ -278,36 +278,38 @@ sub pay_invoice { # than adding them to the transaction relation array. $self->forget_related('transactions'); - my $datev_check = 0; - if ( $is_sales ) { - if ( ( $self->invoice && $::instance_conf->get_datev_check_on_sales_invoice ) || - ( !$self->invoice && $::instance_conf->get_datev_check_on_ar_transaction )) { - $datev_check = 1; - }; - } else { - if ( ( $self->invoice && $::instance_conf->get_datev_check_on_purchase_invoice ) || - ( !$self->invoice && $::instance_conf->get_datev_check_on_ap_transaction )) { - $datev_check = 1; - }; - }; + my $datev_check = 0; + if ( $is_sales ) { + if ( ( $self->invoice && $::instance_conf->get_datev_check_on_sales_invoice ) || + ( !$self->invoice && $::instance_conf->get_datev_check_on_ar_transaction )) { + $datev_check = 1; + } + } else { + if ( ( $self->invoice && $::instance_conf->get_datev_check_on_purchase_invoice ) || + ( !$self->invoice && $::instance_conf->get_datev_check_on_ap_transaction )) { + $datev_check = 1; + } + } - if ( $datev_check ) { + if ( $datev_check ) { - my $datev = SL::DATEV->new( - exporttype => DATEV_ET_BUCHUNGEN, - format => DATEV_FORMAT_KNE, - dbh => $db->dbh, - trans_id => $self->{id}, - ); + my $datev = SL::DATEV->new( + exporttype => DATEV_ET_BUCHUNGEN, + format => DATEV_FORMAT_KNE, + dbh => $db->dbh, + trans_id => $self->{id}, + ); - $datev->clean_temporary_directories; - $datev->export; + $datev->clean_temporary_directories; + $datev->export; - if ($datev->errors) { - # this exception should be caught by do_transaction, which handles the rollback - die join "\n", $::locale->text('DATEV check returned errors:'), $datev->errors; + if ($datev->errors) { + # this exception should be caught by with_transaction, which handles the rollback + die join "\n", $::locale->text('DATEV check returned errors:'), $datev->errors; + } } - }; + + 1; }) || die t8('error while paying invoice #1 : ', $self->invnumber) . $db->error . "\n"; @@ -385,7 +387,7 @@ sub open_amount { # if the difference is 0.01 Cent this may end up as 0.009999999999998 # numerically, so round this value when checking for cent threshold >= 0.01 - return $self->amount - $self->paid; + return ($self->amount // 0) - ($self->paid // 0); }; sub open_percent { @@ -633,11 +635,12 @@ sub get_payment_select_options_for_bank_transaction { die unless $bt; my $open_amount = $self->open_amount; - + #$main::lxdebug->message(LXDebug->DEBUG2(),"skonto_date=".$self->skonto_date." open amount=".$open_amount); my @options; if ( $open_amount && # invoice amount not 0 $self->skonto_date && # check whether skonto applies - abs(abs($self->amount_less_skonto) - abs($bt->amount)) < 0.01 && + ( abs(abs($self->amount_less_skonto) - abs($bt->amount)) < 0.01 || + ( $bt->transaction_code eq "191" && abs($self->amount_less_skonto) < abs($bt->amount) )) && $self->check_skonto_configuration) { if ( $self->within_skonto_period($bt->transdate) ) { push(@options, { payment_type => 'without_skonto', display => t8('without skonto') }); @@ -704,6 +707,13 @@ sub get_payment_suggestions { return 1; }; +# locales for payment type +# +# $main::locale->text('without_skonto') +# $main::locale->text('with_skonto_pt') +# $main::locale->text('difference_as_skonto') +# + sub validate_payment_type { my $payment_type = shift; @@ -743,7 +753,7 @@ sub create_bank_transaction { amount => $::form->round_amount($amount, 2), currency => $self->currency->id, remote_name => $self->customervendor->depositor, - purpose => $self->invnumber + purpose => $params{purpose} || $self->invnumber )->save; }; @@ -1108,9 +1118,31 @@ transactions from invoices to have something to test payments against. my $ap = SL::DB::Manager::Invoice->find_by(id => 41); $ap->create_bank_transaction(amount => $ap->amount/2, transdate => DateTime->today->add(days => 5)); +To create a payment for 3 invoices that were all paid together, all with skonto: + my $ar1 = SL::DB::Manager::Invoice->find_by(invnumber=>'20'); + my $ar2 = SL::DB::Manager::Invoice->find_by(invnumber=>'21'); + my $ar3 = SL::DB::Manager::Invoice->find_by(invnumber=>'22'); + $ar1->create_bank_transaction(amount => ($ar1->amount_less_skonto + $ar2->amount_less_skonto + $ar2->amount_less_skonto), + purpose => 'Rechnungen 20, 21, 22', + ); + Amount is always relative to the absolute amount of the invoice, use positive values for sales and purchases. +The following params can be passed to override the defaults: + +=over 2 + +=item * amount + +=item * purpose + +=item * chart_id (the chart the amount is to be paid to) + +=item * transdate + +=back + =item C Returns 1 immediately if the record uses the default currency.