use parent qw(Exporter);
our @EXPORT = qw(pay_invoice);
-our @EXPORT_OK = qw(skonto_date skonto_charts amount_less_skonto within_skonto_period percent_skonto reference_account reference_amount open_amount open_percent remaining_skonto_days skonto_amount check_skonto_configuration valid_skonto_amount get_payment_suggestions validate_payment_type open_sepa_transfer_amount get_payment_select_options_for_bank_transaction create_bank_transaction exchangerate forex);
+our @EXPORT_OK = qw(skonto_date skonto_charts amount_less_skonto within_skonto_period percent_skonto reference_account reference_amount open_amount open_percent remaining_skonto_days skonto_amount check_skonto_configuration valid_skonto_amount get_payment_suggestions validate_payment_type open_sepa_transfer_amount get_payment_select_options_for_bank_transaction exchangerate forex);
our %EXPORT_TAGS = (
"ALL" => [@EXPORT, @EXPORT_OK],
);
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 $reference_account = $self->reference_account;
croak "can't find reference account (link = AR/AP) for invoice" unless ref $reference_account;
- my $memo = $params{'memo'} || '';
- my $source = $params{'source'} || '';
+ my $memo = $params{memo} // '';
+ my $source = $params{source} // '';
my $rounded_params_amount = _round( $params{amount} ); # / $exchangerate);
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)
# 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";
# 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->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') });
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;
return 1;
}
-sub create_bank_transaction {
- my ($self, %params) = @_;
-
- require SL::DB::Chart;
- require SL::DB::BankAccount;
-
- my $bank_chart;
- if ( $params{chart_id} ) {
- $bank_chart = SL::DB::Manager::Chart->find_by(chart_id => $params{chart_id}) or die "Can't find bank chart";
- } elsif ( $::instance_conf->get_ar_paid_accno_id ) {
- $bank_chart = SL::DB::Manager::Chart->find_by(id => $::instance_conf->get_ar_paid_accno_id);
- } else {
- $bank_chart = SL::DB::Manager::Chart->find_by(description => 'Bank') or die "Can't find bank chart";
- };
- my $bank_account = SL::DB::Manager::BankAccount->find_by(chart_id => $bank_chart->id) or die "Can't find bank account for chart";
-
- my $multiplier = $self->is_sales ? 1 : -1;
- my $amount = ($params{amount} || $self->amount) * $multiplier;
-
- my $transdate = $params{transdate} || DateTime->today;
-
- my $bt = SL::DB::BankTransaction->new(
- local_bank_account_id => $bank_account->id,
- remote_bank_code => $self->customervendor->bank_code,
- remote_account_number => $self->customervendor->account_number,
- transdate => $transdate,
- valutadate => $transdate,
- amount => $::form->round_amount($amount, 2),
- currency => $self->currency->id,
- remote_name => $self->customervendor->depositor,
- purpose => $params{purpose} || $self->invnumber
- )->save;
-};
-
-
sub forex {
my ($self) = @_;
$self->currency_id == $::instance_conf->get_currency_id ? return 0 : return 1;
without_skonto and with_skonto_pt if payment date is within skonto_date,
preselect with_skonto_pt, otherwise preselect without skonto.
-=item C<create_bank_transaction %params>
-
-Method used for testing purposes, allows you to quickly create bank
-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<exchangerate>
Returns 1 immediately if the record uses the default currency.