projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mehrere Lieferscheine koennen zu einer Rechnung zusammengefasst werden, dementspreche...
[kivitendo-erp.git]
/
SL
/
IR.pm
diff --git
a/SL/IR.pm
b/SL/IR.pm
index
4c57f85
..
e36b7f3
100644
(file)
--- a/
SL/IR.pm
+++ b/
SL/IR.pm
@@
-1187,34
+1187,34
@@
sub _delete_payments {
my ($self, $form, $dbh) = @_;
my ($self, $form, $dbh) = @_;
- my @delete_
o
ids;
+ my @delete_
acc_trans_
ids;
# Delete old payment entries from acc_trans.
my $query =
# Delete old payment entries from acc_trans.
my $query =
- qq|SELECT
o
id
+ qq|SELECT
acc_trans_
id
FROM acc_trans
WHERE (trans_id = ?) AND fx_transaction
UNION
FROM acc_trans
WHERE (trans_id = ?) AND fx_transaction
UNION
- SELECT at.
o
id
+ SELECT at.
acc_trans_
id
FROM acc_trans at
LEFT JOIN chart c ON (at.chart_id = c.id)
WHERE (trans_id = ?) AND (c.link LIKE '%AP_paid%')|;
FROM acc_trans at
LEFT JOIN chart c ON (at.chart_id = c.id)
WHERE (trans_id = ?) AND (c.link LIKE '%AP_paid%')|;
- push @delete_
o
ids, selectall_array_query($form, $dbh, $query, conv_i($form->{id}), conv_i($form->{id}));
+ push @delete_
acc_trans_
ids, selectall_array_query($form, $dbh, $query, conv_i($form->{id}), conv_i($form->{id}));
$query =
$query =
- qq|SELECT at.
o
id
+ qq|SELECT at.
acc_trans_
id
FROM acc_trans at
LEFT JOIN chart c ON (at.chart_id = c.id)
WHERE (trans_id = ?)
AND ((c.link = 'AP') OR (c.link LIKE '%:AP') OR (c.link LIKE 'AP:%'))
FROM acc_trans at
LEFT JOIN chart c ON (at.chart_id = c.id)
WHERE (trans_id = ?)
AND ((c.link = 'AP') OR (c.link LIKE '%:AP') OR (c.link LIKE 'AP:%'))
- ORDER BY at.
o
id
+ ORDER BY at.
acc_trans_
id
OFFSET 1|;
OFFSET 1|;
- push @delete_
o
ids, selectall_array_query($form, $dbh, $query, conv_i($form->{id}));
+ push @delete_
acc_trans_
ids, selectall_array_query($form, $dbh, $query, conv_i($form->{id}));
- if (@delete_
o
ids) {
- $query = qq|DELETE FROM acc_trans WHERE
oid IN (| . join(", ", @delete_o
ids) . qq|)|;
+ if (@delete_
acc_trans_
ids) {
+ $query = qq|DELETE FROM acc_trans WHERE
acc_trans_id IN (| . join(", ", @delete_acc_trans_
ids) . qq|)|;
do_query($form, $dbh, $query);
}
do_query($form, $dbh, $query);
}
@@
-1271,7
+1271,7
@@
sub post_payment {
LEFT JOIN chart c ON (at.chart_id = c.id)
WHERE (trans_id = ?)
AND ((c.link = 'AP') OR (c.link LIKE '%:AP') OR (c.link LIKE 'AP:%'))
LEFT JOIN chart c ON (at.chart_id = c.id)
WHERE (trans_id = ?)
AND ((c.link = 'AP') OR (c.link LIKE '%:AP') OR (c.link LIKE 'AP:%'))
- ORDER BY at.
o
id
+ ORDER BY at.
acc_trans_
id
LIMIT 1|;
($form->{AP}) = selectfirst_array_query($form, $dbh, $query, conv_i($form->{id}));
LIMIT 1|;
($form->{AP}) = selectfirst_array_query($form, $dbh, $query, conv_i($form->{id}));