projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
L.dump
[kivitendo-erp.git]
/
SL
/
GL.pm
diff --git
a/SL/GL.pm
b/SL/GL.pm
index
51b1d4b
..
320be1e
100644
(file)
--- a/
SL/GL.pm
+++ b/
SL/GL.pm
@@
-41,6
+41,8
@@
package GL;
use Data::Dumper;
use SL::DBUtils;
use Data::Dumper;
use SL::DBUtils;
+use strict;
+
sub delete_transaction {
my ($self, $myconfig, $form) = @_;
$main::lxdebug->enter_sub();
sub delete_transaction {
my ($self, $myconfig, $form) = @_;
$main::lxdebug->enter_sub();
@@
-86,7
+88,7
@@
sub post_transaction {
$form->{taxincluded} = 0;
}
$form->{taxincluded} = 0;
}
- my ($query, $sth);
+ my ($query, $sth
, @values, $taxkey, $rate, $posted
);
if ($form->{id}) {
if ($form->{id}) {
@@
-196,7
+198,7
@@
sub all_transactions {
# connect to database
my $dbh = $form->dbconnect($myconfig);
# connect to database
my $dbh = $form->dbconnect($myconfig);
- my ($query, $sth, $source, $null);
+ my ($query, $sth, $source, $null
, $space
);
my ($glwhere, $arwhere, $apwhere) = ("1 = 1", "1 = 1", "1 = 1");
my (@glvalues, @arvalues, @apvalues);
my ($glwhere, $arwhere, $apwhere) = ("1 = 1", "1 = 1", "1 = 1");
my (@glvalues, @arvalues, @apvalues);
@@
-294,7
+296,7
@@
sub all_transactions {
push(@apvalues, $project_id, $project_id);
}
push(@apvalues, $project_id, $project_id);
}
- my ($project_columns,
%
project_join);
+ my ($project_columns,
$
project_join);
if ($form->{"l_projectnumbers"}) {
$project_columns = qq|, ac.project_id, pr.projectnumber|;
$project_join = qq|LEFT JOIN project pr ON (ac.project_id = pr.id)|;
if ($form->{"l_projectnumbers"}) {
$project_columns = qq|, ac.project_id, pr.projectnumber|;
$project_join = qq|LEFT JOIN project pr ON (ac.project_id = pr.id)|;
@@
-315,7
+317,7
@@
sub all_transactions {
}
}
}
}
- my $false = ($myconfig->{dbdriver} eq 'Pg') ?
FALSE
: q|'0'|;
+ my $false = ($myconfig->{dbdriver} eq 'Pg') ?
"FALSE"
: q|'0'|;
my %sort_columns = (
'id' => [ qw(id) ],
my %sort_columns = (
'id' => [ qw(id) ],
@@
-342,11
+344,11
@@
sub all_transactions {
map { $columns_for_sorting{$_} .= sprintf(', lower(%s) AS lower_%s', $lowered_columns{$column}->{$_}, $column) } qw(gl arap);
}
map { $columns_for_sorting{$_} .= sprintf(', lower(%s) AS lower_%s', $lowered_columns{$column}->{$_}, $column) } qw(gl arap);
}
-
my
$query =
+ $query =
qq|SELECT
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
+359,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
+373,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,22
+385,23
@@
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);
# Show all $query in Debuglevel LXDebug::QUERY
my @values = (@glvalues, @arvalues, @apvalues);
# Show all $query in Debuglevel LXDebug::QUERY
- $callingdetails = (caller (0))[3];
- dump_query(LXDebug
::QUERY
, "$callingdetails", $query, @values);
+
my
$callingdetails = (caller (0))[3];
+ dump_query(LXDebug
->QUERY()
, "$callingdetails", $query, @values);
$sth = prepare_execute_query($form, $dbh, $query, @values);
my $trans_id = "";
my $trans_id2 = "";
$sth = prepare_execute_query($form, $dbh, $query, @values);
my $trans_id = "";
my $trans_id2 = "";
+ my $balance;
my ($i, $j, $k, $l, $ref, $ref2);
$form->{GL} = [];
my ($i, $j, $k, $l, $ref, $ref2);
$form->{GL} = [];
- while (my $ref0 = $sth->fetchrow_hashref(
NAME_lc
)) {
+ while (my $ref0 = $sth->fetchrow_hashref(
"NAME_lc"
)) {
$trans_id = $ref0->{id};
$trans_id = $ref0->{id};
@@
-489,7
+492,7
@@
sub all_transactions {
} else { # following lines of a booking, line increasing
$ref2 = $ref0;
} else { # following lines of a booking, line increasing
$ref2 = $ref0;
- $trans_old = $trans_id2;
+# $trans_old = $trans_id2; # doesn't seem to be used anymore
$trans_id2 = $ref2->{id};
$balance =
$trans_id2 = $ref2->{id};
$balance =
@@
-596,7
+599,7
@@
sub transaction {
if ($form->{id}) {
$query =
qq|SELECT g.reference, g.description, g.notes, g.transdate, g.storno, g.storno_id,
if ($form->{id}) {
$query =
qq|SELECT g.reference, g.description, g.notes, g.transdate, g.storno, g.storno_id,
- d.description AS department, e.name AS employee, g.taxincluded, g.gldate,
+ d.description AS department, e.name AS employee, g.taxincluded, g.gldate,
g.ob_transaction, g.cb_transaction
FROM gl g
LEFT JOIN department d ON (d.id = g.department_id)
g.ob_transaction, g.cb_transaction
FROM gl g
LEFT JOIN department d ON (d.id = g.department_id)
@@
-635,7
+638,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 {
@@
-701,7
+704,7
@@
sub storno {
# now copy acc_trans entries
$query = qq|SELECT * FROM acc_trans WHERE trans_id = ?|;
# now copy acc_trans entries
$query = qq|SELECT * FROM acc_trans WHERE trans_id = ?|;
- my $rowref = selectall_hashref_query($form, $dbh, $query, $id);
+ my $rowref = selectall_hashref_query($form, $dbh, $query, $id);
for my $row (@$rowref) {
delete @$row{qw(itime mtime)};
for my $row (@$rowref) {
delete @$row{qw(itime mtime)};