return [ @linked_invoices ];
}
+sub is_batch_transaction {
+ ($_[0]->transaction_code // '') eq "191";
+}
+
+
sub get_agreement_with_invoice {
- my ($self, $invoice) = @_;
+ my ($self, $invoice, %params) = @_;
carp "get_agreement_with_invoice needs an invoice object as its first argument"
unless ref($invoice) eq 'SL::DB::Invoice' or ref($invoice) eq 'SL::DB::PurchaseInvoice';
depositor_matches => 2,
exact_amount => 4,
exact_open_amount => 4,
- invnumber_in_purpose => 2,
- own_invnumber_in_purpose => 5,
+ invoice_in_purpose => 2,
+ own_invoice_in_purpose => 5,
+ invnumber_in_purpose => 1,
+ own_invnumber_in_purpose => 4,
# overpayment => -1, # either other invoice is more likely, or several invoices paid at once
payment_before_invoice => -2,
payment_within_30_days => 1,
skonto_exact_amount => 5,
wrong_sign => -1,
sepa_export_item => 5,
+ batch_sepa_transaction => 20,
);
my ($agreement,$rule_matches);
+ if ( $self->is_batch_transaction && $self->{sepa_export_ok}) {
+ $agreement += $points{batch_sepa_transaction};
+ $rule_matches .= 'batch_sepa_transaction(' . $points{'batch_sepa_transaction'} . ') ';
+ }
+
# compare banking arrangements
my ($iban, $bank_code, $account_number);
$bank_code = $invoice->customer->bank_code if $invoice->is_sales;
if ( $bank_code eq $self->remote_bank_code && $account_number eq $self->remote_account_number ) {
$agreement += $points{remote_account_number};
$rule_matches .= 'remote_account_number(' . $points{'remote_account_number'} . ') ';
- };
+ }
if ( $iban eq $self->remote_account_number ) {
$agreement += $points{remote_account_number};
$rule_matches .= 'remote_account_number(' . $points{'remote_account_number'} . ') ';
- };
+ }
my $datediff = $self->transdate->{utc_rd_days} - $invoice->transdate->{utc_rd_days};
$invoice->{datediff} = $datediff;
# compare amount
- if (abs(abs($invoice->amount) - abs($self->amount)) < 0.01) {
+ if (abs(abs($invoice->amount) - abs($self->amount)) < 0.01 &&
+ $::form->format_amount(\%::myconfig,abs($invoice->amount),2) eq
+ $::form->format_amount(\%::myconfig,abs($self->amount),2)
+ ) {
$agreement += $points{exact_amount};
$rule_matches .= 'exact_amount(' . $points{'exact_amount'} . ') ';
- };
+ }
# compare open amount, preventing double points when open amount = invoice amount
- if ( $invoice->amount != $invoice->open_amount && abs(abs($invoice->open_amount) - abs($self->amount)) < 0.01) {
+ if ( $invoice->amount != $invoice->open_amount && abs(abs($invoice->open_amount) - abs($self->amount)) < 0.01 &&
+ $::form->format_amount(\%::myconfig,abs($invoice->amount_less_skonto),2) eq
+ $::form->format_amount(\%::myconfig,abs($self->amount),2)
+ ) {
$agreement += $points{exact_open_amount};
$rule_matches .= 'exact_open_amount(' . $points{'exact_open_amount'} . ') ';
- };
+ }
- if ( $invoice->skonto_date && abs(abs($invoice->amount_less_skonto) - abs($self->amount)) < 0.01) {
+ if ( $invoice->skonto_date && abs(abs($invoice->amount_less_skonto) - abs($self->amount)) < 0.01 &&
+ $::form->format_amount(\%::myconfig,abs($invoice->amount_less_skonto),2) eq
+ $::form->format_amount(\%::myconfig,abs($self->amount),2)
+ ) {
$agreement += $points{skonto_exact_amount};
$rule_matches .= 'skonto_exact_amount(' . $points{'skonto_exact_amount'} . ') ';
- };
+ $invoice->{skonto_type} = 'with_skonto_pt';
+ }
#search invoice number in purpose
my $invnumber = $invoice->invnumber;
my $squashed_purpose = $self->purpose;
$squashed_purpose =~ s/ //g;
if (length($invnumber) > 4 && $squashed_purpose =~ /$invnumber/ && $invoice->is_sales){
- $agreement += $points{own_invnumber_in_purpose};
- $rule_matches .= 'own_invnumber_in_purpose(' . $points{'own_invnumber_in_purpose'} . ') ';
+ $agreement += $points{own_invoice_in_purpose};
+ $rule_matches .= 'own_invoice_in_purpose(' . $points{'own_invoice_in_purpose'} . ') ';
} elsif (length($invnumber) > 3 && $squashed_purpose =~ /$invnumber/ ) {
- $agreement += $points{invnumber_in_purpose};
- $rule_matches .= 'invnumber_in_purpose(' . $points{'invnumber_in_purpose'} . ') ';
+ $agreement += $points{invoice_in_purpose};
+ $rule_matches .= 'invoice_in_purpose(' . $points{'invoice_in_purpose'} . ') ';
+ } else {
+ # only check number part of invoice number
+ $invnumber =~ s/[A-Za-z_]+//g;
+ if (length($invnumber) > 4 && $squashed_purpose =~ /$invnumber/ && $invoice->is_sales){
+ $agreement += $points{own_invnumber_in_purpose};
+ $rule_matches .= 'own_invnumber_in_purpose(' . $points{'own_invnumber_in_purpose'} . ') ';
+ } elsif (length($invnumber) > 3 && $squashed_purpose =~ /$invnumber/ ) {
+ $agreement += $points{invnumber_in_purpose};
+ $rule_matches .= 'invnumber_in_purpose(' . $points{'invnumber_in_purpose'} . ') ';
+ }
}
#check sign
if ( $invoice->is_sales && $self->amount < 0 ) {
$agreement += $points{wrong_sign};
$rule_matches .= 'wrong_sign(' . $points{'wrong_sign'} . ') ';
- };
+ }
if ( ! $invoice->is_sales && $self->amount > 0 ) {
$agreement += $points{wrong_sign};
$rule_matches .= 'wrong_sign(' . $points{'wrong_sign'} . ') ';
- };
+ }
# search customer/vendor number in purpose
my $cvnumber;
my $cvname;
$cvname = $invoice->customer->name if $invoice->is_sales;
$cvname = $invoice->vendor->name if ! $invoice->is_sales;
- if ( $cvname && $self->purpose =~ /\b$cvname\b/i ) {
+ if ( $cvname && $self->purpose =~ /\b\Q$cvname\E\b/i ) {
$agreement += $points{cust_vend_name_in_purpose};
$rule_matches .= 'cust_vend_name_in_purpose(' . $points{'cust_vend_name_in_purpose'} . ') ';
- };
+ }
# compare depositorname, don't try to match empty depositors
my $depositorname;
if ( $depositorname && $self->remote_name =~ /$depositorname/ ) {
$agreement += $points{depositor_matches};
$rule_matches .= 'depositor_matches(' . $points{'depositor_matches'} . ') ';
- };
+ }
#Check if words in remote_name appear in cvname
my $check_string_points = _check_string($self->remote_name,$cvname);
if ( $check_string_points ) {
$agreement += $check_string_points;
$rule_matches .= 'remote_name(' . $check_string_points . ') ';
- };
+ }
# transdate prefilter: compare transdate of bank_transaction with transdate of invoice
if ( $datediff < -5 ) { # this might conflict with advance payments
$agreement += $points{payment_before_invoice};
$rule_matches .= 'payment_before_invoice(' . $points{'payment_before_invoice'} . ') ';
- };
+ }
if ( $datediff < 30 ) {
$agreement += $points{payment_within_30_days};
$rule_matches .= 'payment_within_30_days(' . $points{'payment_within_30_days'} . ') ';
- };
+ }
# only if we already have a good agreement, let date further change value of agreement.
# this is so that if there are several plausible open invoices which are all equal
$agreement += $points{datebonus_negative};
$rule_matches .= 'datebonus_negative(' . $points{'datebonus_negative'} . ') ';
} else {
- # e.g. datediff > 120
- };
- };
+ # e.g. datediff > 120
+ }
+ }
# if there is exactly one non-executed sepa_export_item for the invoice
- if ( my $seis = $invoice->find_sepa_export_items({ executed => 0 }) ) {
- if ( scalar @$seis == 1 ) {
+ my $seis = $params{sepa_export_items}
+ ? [ grep { $invoice->id == ($invoice->is_sales ? $_->ar_id : $_->ap_id) } @{ $params{sepa_export_items} } ]
+ : $invoice->find_sepa_export_items({ executed => 0 });
+ if ($seis) {
+ if (scalar @$seis == 1) {
my $sei = $seis->[0];
# test for amount and id matching only, sepa transfer date and bank
# transaction date needn't match
- my $arap = $invoice->is_sales ? 'ar' : 'ap';
- if ( abs($self->amount) == ($sei->amount)
- && $invoice->id == $sei->arap_id
- ) {
- $agreement += $points{sepa_export_item};
- $rule_matches .= 'sepa_export_item(' . $points{'sepa_export_item'} . ') ';
- };
+ if (abs($self->amount) == ($sei->amount) && $invoice->id == $sei->arap_id) {
+ $agreement += $points{sepa_export_item};
+ $rule_matches .= 'sepa_export_item(' . $points{'sepa_export_item'} . ') ';
+ }
} else {
# zero or more than one sepa_export_item, do nothing for this invoice
# zero: do nothing, no sepa_export_item exists, no match
# more than one: does this ever apply? Currently you can't create sepa
# exports for invoices that already have a non-executed sepa_export
- };
- };
+ # TODO: Catch the more than one case. User is allowed to split
+ # payments for one invoice item in one sepa export.
+ }
+ }
return ($agreement,$rule_matches);
};
projects / kivitendo-erp.git / blobdiff