Revision 17f43ff5
Von Kivitendo Admin vor fast 7 Jahren hinzugefügt
SL/Controller/BankTransaction.pm | ||
---|---|---|
155 | 155 |
|
156 | 156 |
$bt->{remote_name} .= $bt->{remote_name_1} if $bt->{remote_name_1}; |
157 | 157 |
|
158 |
if ( $bt->is_collective_transaction ) {
|
|
158 |
if ( $bt->is_batch_transaction ) {
|
|
159 | 159 |
foreach ( keys %sepa_exports) { |
160 | 160 |
if ( abs(($sepa_exports{$_}->{amount} * 1) - ($bt->amount * 1)) < 0.01 ) { |
161 | 161 |
## jupp |
... | ... | |
166 | 166 |
next; |
167 | 167 |
} |
168 | 168 |
} |
169 |
# colletive transaction has no remotename !!
|
|
169 |
# batch transaction has no remotename !!
|
|
170 | 170 |
} else { |
171 | 171 |
next unless $bt->{remote_name}; # bank has no name, usually fees, use create invoice to assign |
172 | 172 |
} |
SL/DB/BankTransaction.pm | ||
---|---|---|
47 | 47 |
return [ @linked_invoices ]; |
48 | 48 |
} |
49 | 49 |
|
50 |
sub is_collective_transaction {
|
|
50 |
sub is_batch_transaction {
|
|
51 | 51 |
$_[0]->transaction_code eq "191"; |
52 | 52 |
} |
53 | 53 |
|
... | ... | |
78 | 78 |
skonto_exact_amount => 5, |
79 | 79 |
wrong_sign => -1, |
80 | 80 |
sepa_export_item => 5, |
81 |
collective_sepa_transaction => 20,
|
|
81 |
batch_sepa_transaction => 20,
|
|
82 | 82 |
); |
83 | 83 |
|
84 | 84 |
my ($agreement,$rule_matches); |
85 | 85 |
|
86 |
if ( $self->is_collective_transaction && $self->{sepa_export_ok}) {
|
|
87 |
$agreement += $points{collective_sepa_transaction};
|
|
88 |
$rule_matches .= 'collective_sepa_transaction(' . $points{'collective_sepa_transaction'} . ') ';
|
|
86 |
if ( $self->is_batch_transaction && $self->{sepa_export_ok}) {
|
|
87 |
$agreement += $points{batch_sepa_transaction};
|
|
88 |
$rule_matches .= 'batch_sepa_transaction(' . $points{'batch_sepa_transaction'} . ') ';
|
|
89 | 89 |
} |
90 | 90 |
|
91 | 91 |
# compare banking arrangements |
Auch abrufbar als: Unified diff
SEPA: collective_transaction nach batch_transaction umbenannt