Revision f58a783a
Von Moritz Bunkus vor mehr als 18 Jahren hinzugefügt
| SL/GL.pm | ||
|---|---|---|
|
}
|
||
|
|
||
|
my $query =
|
||
|
qq|SELECT g.id, 'gl' AS type, $false AS invoice, g.reference, ac.taxkey, c.link,
|
||
|
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, 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
|
||
| ... | ... | |
|
AND ac.chart_id = c.id
|
||
|
AND g.id = ac.trans_id
|
||
|
UNION
|
||
|
SELECT a.id, 'ar' AS type, a.invoice, a.invnumber, ac.taxkey, c.link,
|
||
|
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, 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
|
||
| ... | ... | |
|
AND a.customer_id = ct.id
|
||
|
AND a.id = ac.trans_id
|
||
|
UNION
|
||
|
SELECT a.id, 'ap' AS type, a.invoice, a.invnumber, ac.taxkey, c.link,
|
||
|
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, 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
|
||
| ... | ... | |
|
AND ac.chart_id = c.id
|
||
|
AND a.vendor_id = ct.id
|
||
|
AND a.id = ac.trans_id
|
||
|
ORDER BY $sortorder transdate, trans_id, taxkey DESC, oid|;
|
||
|
|
||
|
# Show all $query in Debuglevel LXDebug::QUERY
|
||
|
$callingdetails = (caller (0))[3];
|
||
|
$main::lxdebug->message(LXDebug::QUERY, "$callingdetails \$query=\n $query");
|
||
|
|
||
|
ORDER BY $sortorder transdate, trans_id, taxkey DESC, sorttax DESC,oid|;
|
||
|
my $sth = $dbh->prepare($query);
|
||
|
$sth->execute || $form->dberror($query);
|
||
|
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;
|
||
|
}
|
||
|
|
||
|
$ref = $ref0;
|
||
|
$trans_id2 = $ref->{id};
|
||
|
|
||
| ... | ... | |
|
$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_accno}{$k} = $ref->{accno};
|
||
|
$ref->{debit_taxkey}{$k} = $ref->{taxkey};
|
||
|
}
|
||
|
|
||
|
} else {
|
||
|
|
||
|
if ($ref->{chart_id} > 0) {
|
||
|
$ref->{credit_tax}{$j} = $ref->{amount};
|
||
|
$ref->{credit_tax_accno}{$j} = $ref->{accno};
|
||
| ... | ... | |
|
$ref->{credit_accno}{$l} = $ref->{accno};
|
||
|
$ref->{credit_taxkey}{$l} = $ref->{taxkey};
|
||
|
}
|
||
|
|
||
|
}
|
||
|
|
||
|
} else {
|
||
|
|
||
|
$ref2 = $ref0;
|
||
|
$trans_old =$trans_id2;
|
||
|
$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++;
|
||
|
}
|
||
|
|
||
|
if ($ref2->{link} =~ /AR_tax/) {
|
||
|
$ref->{credit_tax}{$j} = $ref2->{amount};
|
||
|
$ref->{credit_tax_accno}{$j} = $ref2->{accno};
|
||
|
}
|
||
|
if ($ref2->{link} =~ /AP_tax/) {
|
||
|
$ref->{debit_tax}{$j} = $ref2->{amount} * -1;
|
||
|
$ref->{debit_tax_accno}{$j} = $ref2->{accno};
|
||
|
}
|
||
|
|
||
|
$ref->{debit_tax}{$i} = $ref2->{amount} * -1;
|
||
|
$ref->{debit_tax_accno}{$i} = $ref2->{accno};
|
||
|
} else {
|
||
|
|
||
|
if ($ref->{debit_accno}{$k} ne "") {
|
||
|
$k++;
|
||
|
}
|
||
| ... | ... | |
|
$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++;
|
||
|
}
|
||
|
|
||
|
if ($ref2->{link} =~ /AR_tax/) {
|
||
|
$ref->{credit_tax}{$j} = $ref2->{amount};
|
||
|
$ref->{credit_tax_accno}{$j} = $ref2->{accno};
|
||
|
}
|
||
|
if ($ref2->{link} =~ /AP_tax/) {
|
||
|
$ref->{debit_tax}{$j} = $ref2->{amount} * -1;
|
||
|
$ref->{debit_tax_accno}{$j} = $ref2->{accno};
|
||
|
}
|
||
|
|
||
|
$ref->{credit_tax}{$j} = $ref2->{amount};
|
||
|
$ref->{credit_tax_accno}{$j} = $ref2->{accno};
|
||
|
} else {
|
||
|
|
||
|
if ($ref->{credit_accno}{$l} ne "") {
|
||
|
$l++;
|
||
|
}
|
||
| ... | ... | |
|
$ref->{credit_taxkey}{$l} = $ref2->{taxkey};
|
||
|
}
|
||
|
}
|
||
|
|
||
|
# }
|
||
|
# } else {
|
||
|
# # if account-report, then calculate the Balance?!
|
||
|
# # ToDo: Calculate the Balance
|
||
|
# 1;
|
||
|
# }
|
||
|
}
|
||
|
|
||
|
}
|
||
|
push @{ $form->{GL} }, $ref;
|
||
|
$sth->finish;
|
||
Auch abrufbar als: Unified diff
Recommit von r1013 von udo_spallek: Reopend Bug 246: Buchungsjournal stellt Stornobuchungen verwirrend dar. Reverse commits 1005, 1007, 1008 back to 1004. Reason, Doesn't work proper.