Restored customer payment display in cutomer transactions inquire.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 00171693cf822d1d90ca8946bc95effc2e1761b5..08368e4a7170acf6f637a5e9914c21240c2ecde9 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,11 +19,15 @@ Legend:
 ! -> Note
 $ -> Affected files
 
-24-Jun-2010 Janusz Dobrowolski
+23-Jun-2010 Janusz Dobrowolski
+# Restored customer payments display
+$ /sales/includes/db/cust_trans_db.inc
+
+22-Jun-2010 Janusz Dobrowolski
 # Fixed pos parameters retrieval in direct invoice
 $ /sales/includes/cart_class.inc
 
-24-Jun-2010 Janusz Dobrowolski
+21-Jun-2010 Janusz Dobrowolski
 + Support for current credit display
 $ /includes/ui/ui_input.inc
   /purchasing/po_entry_items.php

diff --git a/sales/includes/db/cust_trans_db.inc b/sales/includes/db/cust_trans_db.inc
index 4b10acc6e9f0bfa2f751924b25ae3d10ff29683f..ef693a6ca6dd956322cac633f4c989338b06f58c 100644 (file)
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -405,15 +405,15 @@ function get_sql_for_customer_inquiry()
 //                     (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount))) , ";
                $sql .= "trans.alloc AS Allocated,
                ((trans.type = ".ST_SALESINVOICE.")
-                       AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue,
+                       AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue ,
                Sum(line.quantity-line.qty_done) AS Outstanding
                FROM "
-                       .TB_PREF."debtor_trans as trans, "
+                       .TB_PREF."debtor_trans as trans
+                       LEFT JOIN ".TB_PREF."debtor_trans_details as line
+                               ON trans.trans_no=line.debtor_trans_no AND trans.type=line.debtor_trans_type,"
                        .TB_PREF."debtors_master as debtor, "
-                       .TB_PREF."cust_branch as branch, "
-                       .TB_PREF."debtor_trans_details as line
+                       .TB_PREF."cust_branch as branch
                WHERE debtor.debtor_no = trans.debtor_no
-                       AND trans.trans_no=line.debtor_trans_no AND trans.type=line.debtor_trans_type
                        AND trans.tran_date >= '$date_after'
                        AND trans.tran_date <= '$date_to'
                        AND trans.branch_code = branch.branch_code";
@@ -454,6 +454,7 @@ function get_sql_for_customer_inquiry()
        }
        }
        $sql .= " GROUP BY trans.trans_no, trans.type";
+
        return $sql;
 }