projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allocate Customer Payments or Credit Notes: fully allocated payments with discount...
[fa-stable.git]
/
sales
/
includes
/
db
/
custalloc_db.inc
diff --git
a/sales/includes/db/custalloc_db.inc
b/sales/includes/db/custalloc_db.inc
index ec7c3afbea4a45d4de7be743f8a8a2f9dcc7329e..a1f6a61c5e6ac2af3694a4563bd7f25404c7f8b3 100644
(file)
--- a/
sales/includes/db/custalloc_db.inc
+++ b/
sales/includes/db/custalloc_db.inc
@@
-124,7
+124,7
@@
function get_allocatable_from_cust_sql($customer_id=null, $settled)
OR (type=".ST_JOURNAL. " AND (trans.ov_amount < 0)))";
if (!$settled)
OR (type=".ST_JOURNAL. " AND (trans.ov_amount < 0)))";
if (!$settled)
- $sql .= " AND (round(abs(ov_amount+ov_gst+ov_freight+ov_freight_tax
-
ov_discount-alloc),6) > 0)";
+ $sql .= " AND (round(abs(ov_amount+ov_gst+ov_freight+ov_freight_tax
+
ov_discount-alloc),6) > 0)";
if ($customer_id != null)
$sql .= " AND trans.debtor_no = ".db_escape($customer_id);
if ($customer_id != null)
$sql .= " AND trans.debtor_no = ".db_escape($customer_id);