Revision 04e282bb
Von Jan Büren vor mehr als 1 Jahr hinzugefügt
- ID 04e282bbc55baa91048fddcd607303af6054b546
- Vorgänger e8a7f983
| SL/Controller/BankTransaction.pm | ||
|---|---|---|
| 671 | 671 |
} else {
|
| 672 | 672 |
$payment_type = 'without_skonto'; |
| 673 | 673 |
} |
| 674 |
|
|
| 675 |
if ($payment_type eq 'free_skonto') {
|
|
| 674 |
# hack payment type use free_skonto for with_fuzzy_skonto |
|
| 675 |
if ($payment_type eq 'with_fuzzy_skonto_pt') {
|
|
| 676 |
$free_skonto_amount = abs($invoice->open_amount - abs($bank_transaction->not_assigned_amount)); |
|
| 677 |
die "Invalid state for fuzzy skonto amount" unless $free_skonto_amount > 0; |
|
| 678 |
$payment_type = 'free_skonto'; # we have a valid free_skonto amount, therefore go ... |
|
| 679 |
} elsif ($payment_type eq 'free_skonto') {
|
|
| 676 | 680 |
# parse user input > 0 |
| 677 | 681 |
if ($::form->parse_amount(\%::myconfig, $::form->{"free_skonto_amount"}->{"$bt_id"}{$invoice->id}) > 0) {
|
| 678 | 682 |
$free_skonto_amount = $::form->parse_amount(\%::myconfig, $::form->{"free_skonto_amount"}->{"$bt_id"}{$invoice->id});
|
| SL/DB/BankTransaction.pm | ||
|---|---|---|
| 79 | 79 |
payment_within_30_days => 1, |
| 80 | 80 |
remote_account_number => 3, |
| 81 | 81 |
skonto_exact_amount => 5, |
| 82 |
skonto_fuzzy_amount => 3, |
|
| 82 | 83 |
wrong_sign => -4, |
| 83 | 84 |
sepa_export_item => 5, |
| 84 | 85 |
batch_sepa_transaction => 20, |
| ... | ... | |
| 150 | 151 |
$agreement += $points{skonto_exact_amount};
|
| 151 | 152 |
$rule_matches .= 'skonto_exact_amount(' . $points{'skonto_exact_amount'} . ') ';
|
| 152 | 153 |
$invoice->{skonto_type} = 'with_skonto_pt';
|
| 154 |
} elsif ( $invoice->skonto_date && abs(abs($invoice->amount_less_skonto) - abs($self->amount)) < 0.2) {
|
|
| 155 |
$agreement += $points{skonto_fuzzy_amount};
|
|
| 156 |
$rule_matches .= 'skonto_fuzzy_amount(' . $points{'skonto_fuzzy_amount'} . ') ';
|
|
| 157 |
$invoice->{skonto_type} = 'with_fuzzy_skonto_pt';
|
|
| 153 | 158 |
} |
| 154 | 159 |
|
| 155 | 160 |
#search invoice number in purpose |
Auch abrufbar als: Unified diff
Unscharfes Skonto in Vorschlagsliste bis 20 Cent erlauben