use Data::Dumper;
use SL::DBUtils;
+use strict;
+
sub delete_transaction {
my ($self, $myconfig, $form) = @_;
$main::lxdebug->enter_sub();
$form->{taxincluded} = 0;
}
- my ($query, $sth);
+ my ($query, $sth, @values, $taxkey, $rate, $posted);
if ($form->{id}) {
# 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);
}
if ($form->{source}) {
- $glwhere .= " AND ac.source ILIKE ?";
- $arwhere .= " AND ac.source ILIKE ?";
- $apwhere .= " AND ac.source ILIKE ?";
+ $glwhere .= " AND ac.trans_id IN (SELECT trans_id from acc_trans WHERE source ILIKE ?)";
+ $arwhere .= " AND ac.trans_id IN (SELECT trans_id from acc_trans WHERE source ILIKE ?)";
+ $apwhere .= " AND ac.trans_id IN (SELECT trans_id from acc_trans WHERE source ILIKE ?)";
push(@glvalues, '%' . $form->{source} . '%');
push(@arvalues, '%' . $form->{source} . '%');
push(@apvalues, '%' . $form->{source} . '%');
}
if ($form->{category} ne 'X') {
- $glwhere .=
- qq| AND gl.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN
- (SELECT id FROM chart c2 WHERE c2.category = ?))|;
- $arwhere .=
- qq| AND ar.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN
- (SELECT id FROM chart c2 WHERE c2.category = ?))|;
- $apwhere .=
- qq| AND ap.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN
- (SELECT id FROM chart c2 WHERE c2.category = ?))|;
+ $glwhere .= qq| AND g.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = ?))|;
+ $arwhere .= qq| AND a.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = ?))|;
+ $apwhere .= qq| AND a.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = ?))|;
push(@glvalues, $form->{category});
push(@arvalues, $form->{category});
push(@apvalues, $form->{category});
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)|;
}
}
- my $false = ($myconfig->{dbdriver} eq 'Pg') ? FALSE: q|'0'|;
+ my $false = ($myconfig->{dbdriver} eq 'Pg') ? "FALSE" : q|'0'|;
my %sort_columns = (
'id' => [ qw(id) ],
'transdate' => [ qw(transdate id) ],
'reference' => [ qw(lower_reference id) ],
- 'source' => [ qw(lower_source id) ],
'description' => [ qw(lower_description id) ],
'accno' => [ qw(accno transdate id) ],
);
map { $columns_for_sorting{$_} .= sprintf(', lower(%s) AS lower_%s', $lowered_columns{$column}->{$_}, $column) } qw(gl arap);
}
- my $query =
+ $query =
qq|SELECT
- ac.oid AS acoid, 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,
- 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
UNION
- SELECT ac.oid AS acoid, 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,
- 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
UNION
- SELECT ac.oid AS acoid, 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,
- 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
AND (a.vendor_id = ct.id)
AND (a.id = ac.trans_id)
- ORDER BY $sortorder, acoid $sortdir|;
+ ORDER BY $sortorder, acc_trans_id $sortdir|;
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 = "";
+ my $balance;
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};
+ my $source = $ref0->{source};
+ undef($ref0->{source});
+
if ($trans_id != $trans_id2) { # first line of a booking
if ($trans_id2) {
$i = 0; # Debit Tax # AP_tax # VSt
$j = 0; # Credit Tax # AR_tax # USt
-
if ($ref->{chart_id} > 0) { # all tax accounts first line, no line increasing
if ($ref->{amount} < 0) {
if ($ref->{link} =~ /AR_tax/) {
$ref->{credit_tax}{$j} = $ref->{amount};
$ref->{credit_tax_accno}{$j} = $ref->{accno};
- }
+ }
if ($ref->{link} =~ /AP_tax/) {
$ref->{debit_tax}{$i} = $ref->{amount} * -1;
$ref->{debit_tax_accno}{$i} = $ref->{accno};
}
}
} else { #all other accounts first line
+
if ($ref->{amount} < 0) {
$ref->{debit}{$k} = $ref->{amount} * -1;
$ref->{debit_accno}{$k} = $ref->{accno};
$ref->{debit_taxkey}{$k} = $ref->{taxkey};
$ref->{ac_transdate}{$k} = $ref->{transdate};
-
+ $ref->{source}{$k} = $source;
} else {
$ref->{credit}{$l} = $ref->{amount} * 1;
$ref->{credit_accno}{$l} = $ref->{accno};
$ref->{credit_taxkey}{$l} = $ref->{taxkey};
$ref->{ac_transdate}{$l} = $ref->{transdate};
-
-
+ $ref->{source}{$l} = $source;
}
}
} 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 =
if ($ref->{debit_accno}{$k} ne "") {
$k++;
}
+ if ($ref->{source}{$k} ne "") {
+ $space = " | ";
+ } else {
+ $space = "";
+ }
$ref->{debit}{$k} = $ref2->{amount} * - 1;
$ref->{debit_accno}{$k} = $ref2->{accno};
$ref->{debit_taxkey}{$k} = $ref2->{taxkey};
$ref->{ac_transdate}{$k} = $ref2->{transdate};
+ $ref->{source}{$k} = $source . $space . $ref->{source}{$k};
} else {
if ($ref->{credit_accno}{$l} ne "") {
$l++;
}
+ if ($ref->{source}{$l} ne "") {
+ $space = " | ";
+ } else {
+ $space = "";
+ }
$ref->{credit}{$l} = $ref2->{amount};
$ref->{credit_accno}{$l} = $ref2->{accno};
$ref->{credit_taxkey}{$l} = $ref2->{taxkey};
$ref->{ac_transdate}{$l} = $ref2->{transdate};
+ $ref->{source}{$l} = $ref->{source}{$l} . $space . $source;
}
}
}
}
+
push @{ $form->{GL} }, $ref;
$sth->finish;
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)
ORDER BY startdate DESC LIMIT 1))
WHERE (a.trans_id = ?)
AND (a.fx_transaction = '0')
- ORDER BY a.oid, a.transdate|;
+ ORDER BY a.acc_trans_id, a.transdate|;
$form->{GL} = selectall_hashref_query($form, $dbh, $query, conv_i($form->{id}));
} else {
# 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)};
$main::lxdebug->leave_sub();
}
+sub get_chart_balances {
+ $main::lxdebug->enter_sub();
+
+ my $self = shift;
+ my %params = @_;
+
+ Common::check_params(\%params, qw(charts));
+
+ my $myconfig = \%main::myconfig;
+ my $form = $main::form;
+
+ my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig);
+
+ my @ids = map { $_->{id} } @{ $params{charts} };
+
+ if (!@ids) {
+ $main::lxdebug->leave_sub();
+ return;
+ }
+
+ my $query = qq|SELECT chart_id, SUM(amount) AS sum
+ FROM acc_trans
+ WHERE chart_id IN (| . join(', ', ('?') x scalar(@ids)) . qq|)
+ GROUP BY chart_id|;
+
+ my %balances = selectall_as_map($form, $dbh, $query, 'chart_id', 'sum', @ids);
+
+ foreach my $chart (@{ $params{charts} }) {
+ $chart->{balance} = $balances{ $chart->{id} } || 0;
+ }
+
+ $main::lxdebug->leave_sub();
+}
+
+
1;
projects / kivitendo-erp.git / blobdiff