projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix für Bug 1136. Die Prüfung für not_discountable war zu früh. Zunächst muss form...
[kivitendo-erp.git]
/
SL
/
GL.pm
diff --git
a/SL/GL.pm
b/SL/GL.pm
index
51b1d4b
..
db9d9ae
100644
(file)
--- a/
SL/GL.pm
+++ b/
SL/GL.pm
@@
-344,9
+344,9
@@
sub all_transactions {
my $query =
qq|SELECT
my $query =
qq|SELECT
- ac.
oid AS aco
id, g.id, 'gl' AS type, $false AS invoice, g.reference, ac.taxkey, c.link,
+ ac.
acc_trans_
id, g.id, 'gl' AS type, $false AS invoice, g.reference, ac.taxkey, c.link,
g.description, ac.transdate, ac.source, ac.trans_id,
g.description, ac.transdate, ac.source, ac.trans_id,
- ac.amount, c.accno, g.notes, t.chart_id
, ac.oid
+ ac.amount, c.accno, g.notes, t.chart_id
$project_columns
$columns_for_sorting{gl}
FROM gl g, acc_trans ac $project_join, chart c
$project_columns
$columns_for_sorting{gl}
FROM gl g, acc_trans ac $project_join, chart c
@@
-357,9
+357,9
@@
sub all_transactions {
UNION
UNION
- SELECT ac.
oid AS aco
id, a.id, 'ar' AS type, a.invoice, a.invnumber, ac.taxkey, c.link,
+ SELECT ac.
acc_trans_
id, a.id, 'ar' AS type, a.invoice, a.invnumber, ac.taxkey, c.link,
ct.name, ac.transdate, ac.source, ac.trans_id,
ct.name, ac.transdate, ac.source, ac.trans_id,
- ac.amount, c.accno, a.notes, t.chart_id
, ac.oid
+ ac.amount, c.accno, a.notes, t.chart_id
$project_columns
$columns_for_sorting{arap}
FROM ar a, acc_trans ac $project_join, customer ct, chart c
$project_columns
$columns_for_sorting{arap}
FROM ar a, acc_trans ac $project_join, customer ct, chart c
@@
-371,9
+371,9
@@
sub all_transactions {
UNION
UNION
- SELECT ac.
oid AS aco
id, a.id, 'ap' AS type, a.invoice, a.invnumber, ac.taxkey, c.link,
+ SELECT ac.
acc_trans_
id, a.id, 'ap' AS type, a.invoice, a.invnumber, ac.taxkey, c.link,
ct.name, ac.transdate, ac.source, ac.trans_id,
ct.name, ac.transdate, ac.source, ac.trans_id,
- ac.amount, c.accno, a.notes, t.chart_id
, ac.oid
+ ac.amount, c.accno, a.notes, t.chart_id
$project_columns
$columns_for_sorting{arap}
FROM ap a, acc_trans ac $project_join, vendor ct, chart c
$project_columns
$columns_for_sorting{arap}
FROM ap a, acc_trans ac $project_join, vendor ct, chart c
@@
-383,7
+383,7
@@
sub all_transactions {
AND (a.vendor_id = ct.id)
AND (a.id = ac.trans_id)
AND (a.vendor_id = ct.id)
AND (a.id = ac.trans_id)
- ORDER BY $sortorder, ac
o
id $sortdir|;
+ ORDER BY $sortorder, ac
c_trans_
id $sortdir|;
my @values = (@glvalues, @arvalues, @apvalues);
my @values = (@glvalues, @arvalues, @apvalues);
@@
-635,7
+635,7
@@
sub transaction {
ORDER BY startdate DESC LIMIT 1))
WHERE (a.trans_id = ?)
AND (a.fx_transaction = '0')
ORDER BY startdate DESC LIMIT 1))
WHERE (a.trans_id = ?)
AND (a.fx_transaction = '0')
- ORDER BY a.
o
id, a.transdate|;
+ ORDER BY a.
acc_trans_
id, a.transdate|;
$form->{GL} = selectall_hashref_query($form, $dbh, $query, conv_i($form->{id}));
} else {
$form->{GL} = selectall_hashref_query($form, $dbh, $query, conv_i($form->{id}));
} else {