$apwhere .= " AND c.gifi_accno = '$form->{gifi_accno}'";
}
if ($form->{category} ne 'X') {
- $glwhere .= " AND c.category = '$form->{category}'";
- $arwhere .= " AND c.category = '$form->{category}'";
- $apwhere .= " AND c.category = '$form->{category}'";
+ $glwhere .= " AND gl.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = '$form->{category}'))";
+ $arwhere .= " AND ar.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = '$form->{category}'))";
+ $apwhere .= " AND ap.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = '$form->{category}'))";
}
if ($form->{accno}) {
($form->{ml}) = $sth->fetchrow_array;
$sth->finish;
- #if ($form->{datefrom}) {
+ if ($form->{datefrom}) {
$query = qq|SELECT SUM(ac.amount)
FROM acc_trans ac, chart c
WHERE ac.chart_id = c.id
- AND c.accno = '$form->{accno}'|;
- $query .= qq|AND ac.transdate > date '$form->{datefrom}'
- | if ($form->{datefrom});;
- $query .= qq|AND ac.transdate < date '$form->{dateto}'
- | if ($form->{dateto});
-
+ AND c.accno = '$form->{accno}'
+ AND ac.transdate < date '$form->{datefrom}'
+ |;
$sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
($form->{balance}) = $sth->fetchrow_array;
$sth->finish;
- #}
+ }
}
if ($form->{gifi_accno}) {
my $query =
qq|SELECT g.id, 'gl' AS type, $false AS invoice, g.reference, ac.taxkey, t.taxkey AS sorttax,
g.description, ac.transdate, ac.source, ac.trans_id,
- ac.amount*100 AS amount, c.accno, c.gifi_accno, g.notes, t.chart_id, ac.oid
+ ac.amount, c.accno, c.gifi_accno, g.notes, t.chart_id, ac.oid
FROM gl g, acc_trans ac, chart c LEFT JOIN tax t ON
(t.chart_id=c.id)
WHERE $glwhere
UNION
SELECT a.id, 'ar' AS type, a.invoice, a.invnumber, ac.taxkey, t.taxkey AS sorttax,
ct.name, ac.transdate, ac.source, ac.trans_id,
- ac.amount*100 AS amount, c.accno, c.gifi_accno, a.notes, t.chart_id, ac.oid
+ ac.amount, c.accno, c.gifi_accno, a.notes, t.chart_id, ac.oid
FROM ar a, acc_trans ac, customer ct, chart c LEFT JOIN tax t ON
(t.chart_id=c.id)
WHERE $arwhere
UNION
SELECT a.id, 'ap' AS type, a.invoice, a.invnumber, ac.taxkey, t.taxkey AS sorttax,
ct.name, ac.transdate, ac.source, ac.trans_id,
- ac.amount*100 AS amount, c.accno, c.gifi_accno, a.notes, t.chart_id, ac.oid
+ ac.amount, c.accno, c.gifi_accno, a.notes, t.chart_id, ac.oid
FROM ap a, acc_trans ac, vendor ct, chart c LEFT JOIN tax t ON
(t.chart_id=c.id)
WHERE $apwhere
ORDER BY transdate, trans_id, taxkey DESC, sorttax DESC, oid|;
my $sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
-
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
- print(STDERR $ref->{id}, " Transaction\n");
-
- # gl
- if ($ref->{type} eq "gl") {
- $ref->{module} = "gl";
- }
-
- # ap
- if ($ref->{type} eq "ap") {
- if ($ref->{invoice}) {
- $ref->{module} = "ir";
- } else {
- $ref->{module} = "ap";
+ my $trans_id = "";
+ my $trans_id2 = "";
+ while (my $ref0 = $sth->fetchrow_hashref(NAME_lc)) {
+ $trans_id = $ref0->{id};
+ if ($trans_id != $trans_id2) {
+ if ($trans_id2) {
+ push @{ $form->{GL} }, $ref;
+ $balance = 0;
}
- }
-
- # ar
- if ($ref->{type} eq "ar") {
- if ($ref->{invoice}) {
- $ref->{module} = "is";
- } else {
- $ref->{module} = "ar";
+ $ref = $ref0;
+ $trans_id2 = $ref->{id};
+
+ # gl
+ if ($ref->{type} eq "gl") {
+ $ref->{module} = "gl";
}
- }
- $balance = $ref->{amount};
- $ref->{amount} = $ref->{amount} * 1.0;
- $i = 0;
- $j = 0;
- $k = 0;
- $l = 0;
- if ($ref->{amount} < 0) {
- if ($ref->{chart_id} > 0) {
- $ref->{debit_tax}{$i} = ($ref->{amount} / 100.0) * -1;
- $ref->{debit_tax_accno}{$i} = $ref->{accno};
- } else {
- $ref->{debit}{$k} = ($ref->{amount} / 100.0) * -1;
- $ref->{debit_accno}{$k} = $ref->{accno};
- $ref->{debit_taxkey}{$k} = $ref->{taxkey};
+ # ap
+ if ($ref->{type} eq "ap") {
+ if ($ref->{invoice}) {
+ $ref->{module} = "ir";
+ } else {
+ $ref->{module} = "ap";
+ }
}
- } else {
- if ($ref->{chart_id} > 0) {
- $ref->{credit_tax}{$j} = $ref->{amount} / 100.0;
- $ref->{credit_tax_accno}{$j} = $ref->{accno};
+
+ # ar
+ if ($ref->{type} eq "ar") {
+ if ($ref->{invoice}) {
+ $ref->{module} = "is";
+ } else {
+ $ref->{module} = "ar";
+ }
+ }
+ $balance = $ref->{amount};
+ $i = 0;
+ $j = 0;
+ $k = 0;
+ $l = 0;
+ if ($ref->{amount} < 0) {
+ if ($ref->{chart_id} > 0) {
+ $ref->{debit_tax}{$i} = $ref->{amount} * -1;
+ $ref->{debit_tax_accno}{$i} = $ref->{accno};
+ } else {
+ $ref->{debit}{$k} = $ref->{amount} * -1;
+ $ref->{debit_accno}{$k} = $ref->{accno};
+ $ref->{debit_taxkey}{$k} = $ref->{taxkey};
+ }
} else {
- $ref->{credit}{$l} = $ref->{amount} / 100.0;
- $ref->{credit_accno}{$l} = $ref->{accno};
- $ref->{credit_taxkey}{$l} = $ref->{taxkey};
+ if ($ref->{chart_id} > 0) {
+ $ref->{credit_tax}{$j} = $ref->{amount};
+ $ref->{credit_tax_accno}{$j} = $ref->{accno};
+ } else {
+ $ref->{credit}{$l} = $ref->{amount};
+ $ref->{credit_accno}{$l} = $ref->{accno};
+ $ref->{credit_taxkey}{$l} = $ref->{taxkey};
+ }
}
+ } else {
+ $ref2 = $ref0;
+ $trans_id2 = $ref2->{id};
+# if ($form->{accno} eq ''){ # flo & udo: if general report,
+ # then check balance
+# while (abs($balance) >= 0.015) {
+# my $ref2 = $sth->fetchrow_hashref(NAME_lc)
+# || $form->error("Unbalanced ledger!");
+#
+ $balance =
+ (int($balance * 100000) + int(100000 * $ref2->{amount})) / 100000;
+ if ($ref2->{amount} < 0) {
+ if ($ref2->{chart_id} > 0) {
+ if ($ref->{debit_tax_accno}{$i} ne "") {
+ $i++;
+ }
+ $ref->{debit_tax}{$i} = $ref2->{amount} * -1;
+ $ref->{debit_tax_accno}{$i} = $ref2->{accno};
+ } else {
+ if ($ref->{debit_accno}{$k} ne "") {
+ $k++;
+ }
+ $ref->{debit}{$k} = $ref2->{amount} * -1;
+ $ref->{debit_accno}{$k} = $ref2->{accno};
+ $ref->{debit_taxkey}{$k} = $ref2->{taxkey};
+ }
+ } else {
+ if ($ref2->{chart_id} > 0) {
+ if ($ref->{credit_tax_accno}{$j} ne "") {
+ $j++;
+ }
+ $ref->{credit_tax}{$j} = $ref2->{amount};
+ $ref->{credit_tax_accno}{$j} = $ref2->{accno};
+ } else {
+ if ($ref->{credit_accno}{$l} ne "") {
+ $l++;
+ }
+ $ref->{credit}{$l} = $ref2->{amount};
+ $ref->{credit_accno}{$l} = $ref2->{accno};
+ $ref->{credit_taxkey}{$l} = $ref2->{taxkey};
+ }
+ }
+# }
+# } else {
+# # if account-report, then calculate the Balance?!
+# # ToDo: Calculate the Balance
+# 1;
+# }
}
-# if ($form->{accno} eq ''){ # flo & udo: if general report,
- # then check balance
-
-# while ($balance != 0) {
-# my $ref2 = $sth->fetchrow_hashref(NAME_lc)
-# || $form->error(sprintf("Unbalanced ledger! trans-id: %i", $ref->{trans_id}));
-#
-# $balance =
-# (int($balance * 100000) + int(100000 * $ref2->{amount})) / 100000;
-# $balance += $ref2->{amount};
-
- #print(STDERR $balance, " BAlance\n");
- #print(STDERR $ref2->{amount}, " Ref2->amount\n");
-# if ($ref2->{amount} < 0) {
-# if ($ref2->{chart_id} > 0) {
-# if ($ref->{debit_tax_accno}{$i} ne "") {
-# $i++;
-# }
-# $ref->{debit_tax}{$i} = ($ref2->{amount} / 100.0) * -1;
-# $ref->{debit_tax_accno}{$i} = $ref2->{accno};
-# } else {
-# if ($ref->{debit_accno}{$k} ne "") {
-# $k++;
-# }
-# $ref->{debit}{$k} = ($ref2->{amount} / 100.0) * -1;
-# $ref->{debit_accno}{$k} = $ref2->{accno};
-# $ref->{debit_taxkey}{$k} = $ref2->{taxkey};
-# }
-# } else {
-# if ($ref2->{chart_id} > 0) {
-# if ($ref->{credit_tax_accno}{$j} ne "") {
-# $j++;
-# }
-# $ref->{credit_tax}{$j} = $ref2->{amount} / 100.0;
-# $ref->{credit_tax_accno}{$j} = $ref2->{accno};
-# } else {
-# if ($ref->{credit_accno}{$l} ne "") {
-# $l++;
-# }
-# $ref->{credit}{$l} = $ref2->{amount} / 100.0;
-# $ref->{credit_accno}{$l} = $ref2->{accno};
-# $ref->{credit_taxkey}{$l} = $ref2->{taxkey};
-# }
-# }
-# }
-# } else {
-# 1;
-# }
+
# print(STDERR Dumper($ref));
- push @{ $form->{GL} }, $ref;
- $balance = 0;
+
}
+ push @{ $form->{GL} }, $ref;
$sth->finish;
if ($form->{accno}) {
}
# get tax description
- $query = qq| SELECT * FROM tax t|;
+ $query = qq| SELECT * FROM tax t order by t.taxkey|;
$sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
$form->{TAX} = ();
projects / kivitendo-erp.git / blobdiff