Fix NATURAL JOIN Bug on branch (using notes)

diff --git a/includes/order_lines.inc b/includes/order_lines.inc
index 4079f7b85c58f416cbcdb2475f44d8cbb465b6bf..5792a6cf4d45b0e5c9a562bbf0f7215ac56cd5f7 100644 (file)
--- a/includes/order_lines.inc
+++ b/includes/order_lines.inc
@@ -306,8 +306,8 @@ function get_order_summary($location) {
                AND so.trans_type = sod.trans_type
                AND so.trans_type = ".ST_SALESORDER."
        )
-       NATURAL JOIN ".TB_PREF."debtors_master
-       NATURAL JOIN ".TB_PREF."cust_branch
+       JOIN ".TB_PREF."debtors_master USING (debtor_no)
+       JOIN ".TB_PREF."cust_branch USING (debtor_no, branch_code)
        LEFT JOIN ($pick) p ON (detail_id = sod.id)
        JOIN ".TB_PREF."denorm_order_details_queue  d ON (d.id = sod.id)
        LEFT JOIN ".TB_PREF."denorm_qoh qoh ON (qoh.stock_id = stk_code AND loc_code = '$location')

diff --git a/sql/create_order_summary_view.sql b/sql/create_order_summary_view.sql
index 96d66d58d424b08cfbf2646974f4f3adc96e7940..5d9009a6c47da7bfcdb728b14cd0462583983999 100644 (file)
--- a/sql/create_order_summary_view.sql
+++ b/sql/create_order_summary_view.sql
@@ -12,8 +12,8 @@ JOIN 0_sales_orders so ON (so.order_no = sod.order_no
        AND so.trans_type = sod.trans_type
        AND so.trans_type = 30
 )
-NATURAL JOIN 0_debtors_master
-NATURAL JOIN 0_cust_branch
+JOIN 0_debtors_master USING(debtor_no)
+JOIN 0_cust_branch USING(debtor_no, branch_code)
 JOIN 0_denorm_order_details_queue  d ON (d.id = sod.id)
 WHERE sod.quantity > qty_sent
 GROUP BY debtor_no, branch_code, stk_code