}
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} . '%');
'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) ],
);
my $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);
$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;
}
}
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;
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 {
$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;