Search options (Page 206 of 245)

--- sales/includes/db/cust_trans_db.inc    Mon Mar 10 16:17:12 2014
+++ sales/includes/db/cust_trans_db.inc    Wed Dec 25 19:00:22 2013
@@ -377,19 +377,19 @@
             Sum(line.quantity-line.qty_done) AS Outstanding,
             Sum(line.qty_done) AS Done
         FROM "
-         .TB_PREF."sales_orders as sorder, "
-         .TB_PREF."debtor_trans as trans, "
-         .TB_PREF."debtor_trans_details as line, "
-         .TB_PREF."debtors_master as debtor, "
-         .TB_PREF."cust_branch as branch
-            WHERE
-            sorder.order_no = trans.order_ AND
-            trans.debtor_no = debtor.debtor_no
-                AND trans.type = ".ST_CUSTDELIVERY."
-                AND line.debtor_trans_no = trans.trans_no
-                AND line.debtor_trans_type = trans.type
-                AND trans.branch_code = branch.branch_code
-                AND trans.debtor_no = branch.debtor_no ";
+            .TB_PREF."sales_orders as sorder LEFT JOIN "
+            .TB_PREF."debtor_trans as trans 
+                ON (sorder.order_no = trans.order_) LEFT JOIN "
+            .TB_PREF."debtor_trans_details as line 
+                ON (line.debtor_trans_no = trans.trans_no
+                    AND line.debtor_trans_type = trans.type) LEFT JOIN "
+            .TB_PREF."debtors_master as debtor
+                ON (trans.debtor_no = debtor.debtor_no) LEFT JOIN "
+            .TB_PREF."cust_branch as branch 
+                ON (trans.branch_code = branch.branch_code
+                    AND trans.debtor_no = branch.debtor_no)
+        WHERE
+            trans.type = ".ST_CUSTDELIVERY;
 
     if ($_POST['OutstandingOnly'] == true) {
          $sql .= " AND line.qty_done < line.quantity ";

--- gl/includes/db/gl_db_bank_trans.inc    Mon Mar 10 16:17:11 2014
+++ gl/includes/db/gl_db_bank_trans.inc    Sat Jan 04 02:23:22 2014
@@ -66,17 +66,17 @@
 function get_bank_trans($type, $trans_no=null, $person_type_id=null, $person_id=null)
 {
     $sql = "SELECT bt.*, act.*,
-        IFNULL(abs(dt.ov_amount), IFNULL(ABS(st.ov_amount), bt.amount)) settled_amount,
-        IFNULL(abs(dt.ov_amount/bt.amount), IFNULL(ABS(st.ov_amount/bt.amount), 1)) settle_rate,
-        IFNULL(debtor.curr_code, IFNULL(supplier.curr_code, act.bank_curr_code)) settle_curr
+        IFNULL(ABS(dt.ov_amount), IFNULL(ABS(st.ov_amount), bt.amount)) AS settled_amount,
+        IFNULL(ABS(dt.ov_amount/bt.amount), IFNULL(ABS(st.ov_amount/bt.amount), 1)) AS settle_rate,
+        IFNULL(debtor.curr_code, IFNULL(supplier.curr_code, act.bank_curr_code)) AS settle_curr
 
         FROM ".TB_PREF."bank_trans bt
-                 LEFT JOIN ".TB_PREF."debtor_trans dt ON dt.type=bt.type AND dt.trans_no=bt.trans_no
-                 LEFT JOIN ".TB_PREF."debtors_master debtor ON debtor.debtor_no = dt.debtor_no
-                 LEFT JOIN ".TB_PREF."supp_trans st ON st.type=bt.type AND st.trans_no=bt.trans_no
-                 LEFT JOIN ".TB_PREF."suppliers supplier ON supplier.supplier_id = st.supplier_id,
-             ".TB_PREF."bank_accounts act
-        WHERE act.id=bt.bank_act ";
+                LEFT JOIN ".TB_PREF."debtor_trans dt ON dt.type=bt.type AND dt.trans_no=bt.trans_no
+                LEFT JOIN ".TB_PREF."debtors_master debtor ON debtor.debtor_no = dt.debtor_no
+                LEFT JOIN ".TB_PREF."supp_trans st ON st.type=bt.type AND st.trans_no=bt.trans_no
+                LEFT JOIN ".TB_PREF."suppliers supplier ON supplier.supplier_id = st.supplier_id
+                LEFT JOIN ".TB_PREF."bank_accounts act ON act.id = bt.bank_act
+        WHERE  1 ";
     if ($type != null)
         $sql .= " AND bt.type=".db_escape($type);
     if ($trans_no != null)
@@ -85,7 +85,7 @@
         $sql .= " AND bt.person_type_id = ".db_escape($person_type_id);
     if ($person_id != null)
         $sql .= " AND bt.person_id = ".db_escape($person_id);
-    $sql .= " ORDER BY trans_date, bt.id";
+    $sql .= " ORDER BY bt.trans_date, bt.id";
 
     return db_query($sql, "query for bank transaction");
 }