projects
/
fa-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
af03975
)
Bug 5709: Opening Bal. is calculated incorrectly in supplier balance. Fixed.
author
Joe
<joe.hunt.consulting@gmail.com>
Mon, 3 Jul 2023 08:20:31 +0000
(10:20 +0200)
committer
Joe
<joe.hunt.consulting@gmail.com>
Mon, 3 Jul 2023 08:20:31 +0000
(10:20 +0200)
reporting/rep201.php
patch
|
blob
|
history
diff --git
a/reporting/rep201.php
b/reporting/rep201.php
index 00c48d5b00d70aad6945e40de5cdf256d6e537af..21fea412edd0d34d69d058cca11752e8cfcffc3b 100644
(file)
--- a/
reporting/rep201.php
+++ b/
reporting/rep201.php
@@
-38,10
+38,10
@@
function get_open_balance($supplier_id, $to)
$sql .= "SUM(IF(t.type != ".ST_SUPPINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKDEPOSIT.") AND t.ov_amount>0),
abs(t.ov_amount + t.ov_gst + t.ov_discount) * -1, 0)) AS credits,";
$sql .= "SUM(IF(t.type != ".ST_SUPPINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKDEPOSIT.") AND t.ov_amount>0),
abs(t.ov_amount + t.ov_gst + t.ov_discount) * -1, 0)) AS credits,";
- $sql .= "SUM(IF(t.type != ".ST_SUPPINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKDEPOSIT.")), t.alloc * -1, t.alloc))
+ $sql .= "SUM(IF(t.type != ".ST_SUPPINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKDEPOSIT.")
AND t.ov_amount>0
), t.alloc * -1, t.alloc))
AS Allocated,";
AS Allocated,";
- $sql .= "SUM(IF(t.type = ".ST_SUPPINVOICE.", 1, -1) *
+ $sql .= "SUM(IF(t.type = ".ST_SUPPINVOICE."
OR (t.type IN (".ST_JOURNAL." , ".ST_BANKDEPOSIT.") AND t.ov_amount>0)
, 1, -1) *
(abs(t.ov_amount + t.ov_gst + t.ov_discount) - abs(t.alloc))) AS OutStanding
FROM ".TB_PREF."supp_trans t
WHERE t.supplier_id = ".db_escape($supplier_id);
(abs(t.ov_amount + t.ov_gst + t.ov_discount) - abs(t.alloc))) AS OutStanding
FROM ".TB_PREF."supp_trans t
WHERE t.supplier_id = ".db_escape($supplier_id);