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;
};
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)
$datev->export;
if ($datev->errors) {
- # this exception should be caught by do_transaction, which handles the rollback
+ # 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";
return 1;
# 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 {
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->transactioncode 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') });
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;