From d3a900b97ce93c6df7d2f2065d07ff7b6a7a3ab8 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Sat, 26 Jun 2010 07:54:29 +0000 Subject: [PATCH] Fixed sql for child transaction lines retrieval --- CHANGELOG.txt | 7 +++++++ sales/includes/sales_db.inc | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index b915a054..c5a2f00e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,13 @@ Legend: ! -> Note $ -> Affected files +26-Jun-2010 Janusz Dobrowolski +# Fixed sql for child transaction retrieval +$ /sales/includes/sales_db.inc +! Added debtor_trans_details.src_id +$ /sql/en_US-demo.sql + /sql/en_US-new.sql + 25-Jun-2010 Janusz Dobrowolski ! Allow reuse of references previously used on voided transactions $ /includes/references.inc diff --git a/sales/includes/sales_db.inc b/sales/includes/sales_db.inc index f66b2093..f091a353 100644 --- a/sales/includes/sales_db.inc +++ b/sales/includes/sales_db.inc @@ -312,7 +312,7 @@ function read_sales_trans($doc_type, $trans_no, &$cart) function get_sales_child_lines($trans_type, $trans_no, $lines=true) { - if (!get_child_type($trans_type)) + if (!($ctype = get_child_type($trans_type))) return false; if (!is_array($trans_no)) { $trans_no = array($trans_no); @@ -322,7 +322,7 @@ function get_sales_child_lines($trans_type, $trans_no, $lines=true) $rel = $trans_type == ST_SALESORDER ? "trans.trans_type=$trans_type" . " AND trans.order_no IN(". implode(',', array_values($trans_no)).")" - : "trans.debtor_trans_type=$trans_type" + : "child.debtor_trans_type=$ctype" . " AND trans.debtor_trans_no IN(". implode(',', array_values($trans_no)).")"; $sql = "SELECT child.* @@ -336,7 +336,7 @@ function get_sales_child_lines($trans_type, $trans_no, $lines=true) $sql .= " GROUP BY child.debtor_trans_no"; $sql .= " ORDER BY child.debtor_trans_no"; - + return db_query($sql, "can't retrieve child trans"); } -- 2.30.2