projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Locales für Skonto-Steuerkorrektur
[kivitendo-erp.git]
/
SL
/
DB
/
BankTransaction.pm
diff --git
a/SL/DB/BankTransaction.pm
b/SL/DB/BankTransaction.pm
index
0d6895b
..
e8c98cb
100644
(file)
--- a/
SL/DB/BankTransaction.pm
+++ b/
SL/DB/BankTransaction.pm
@@
-79,7
+79,7
@@
sub get_agreement_with_invoice {
payment_within_30_days => 1,
remote_account_number => 3,
skonto_exact_amount => 5,
payment_within_30_days => 1,
remote_account_number => 3,
skonto_exact_amount => 5,
- wrong_sign => -
1
,
+ wrong_sign => -
4
,
sepa_export_item => 5,
batch_sepa_transaction => 20,
);
sepa_export_item => 5,
batch_sepa_transaction => 20,
);
@@
-122,7
+122,7
@@
sub get_agreement_with_invoice {
# 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 &&
# 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 &&
- $::form->format_amount(\%::myconfig,abs($invoice->
amount_less_skonto
),2) eq
+ $::form->format_amount(\%::myconfig,abs($invoice->
open_amount
),2) eq
$::form->format_amount(\%::myconfig,abs($self->amount),2)
) {
$agreement += $points{exact_open_amount};
$::form->format_amount(\%::myconfig,abs($self->amount),2)
) {
$agreement += $points{exact_open_amount};
@@
-162,12
+162,13
@@
sub get_agreement_with_invoice {
}
#check sign
}
#check sign
- if ( $invoice->is_sales && $self->amount < 0 ) { # TODO debit note
+ if (( $invoice->is_sales && $invoice->amount > 0 && $self->amount < 0 ) ||
+ ( $invoice->is_sales && $invoice->amount < 0 && $self->amount > 0 ) ) { # sales credit note
$agreement += $points{wrong_sign};
$rule_matches .= 'wrong_sign(' . $points{'wrong_sign'} . ') ';
}
if (( !$invoice->is_sales && $invoice->amount > 0 && $self->amount > 0) ||
$agreement += $points{wrong_sign};
$rule_matches .= 'wrong_sign(' . $points{'wrong_sign'} . ') ';
}
if (( !$invoice->is_sales && $invoice->amount > 0 && $self->amount > 0) ||
- ( !$invoice->is_sales && $invoice->amount < 0 && $self->amount < 0) ) { # credit note
+ ( !$invoice->is_sales && $invoice->amount < 0 && $self->amount < 0) ) { #
purchase
credit note
$agreement += $points{wrong_sign};
$rule_matches .= 'wrong_sign(' . $points{'wrong_sign'} . ') ';
}
$agreement += $points{wrong_sign};
$rule_matches .= 'wrong_sign(' . $points{'wrong_sign'} . ') ';
}