X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_order_db.inc;h=55a165851515ab392fbf349f2a833295ca7b6a8c;hb=5088ee92669272ebac6f1bd1acebc05fe382829f;hp=cf7b668239a203d784d52a1032bb0c4cc15fc4f9;hpb=5f06887dedd4d14701864fb72994d7e20352086d;p=fa-stable.git

diff --git a/sales/includes/db/sales_order_db.inc b/sales/includes/db/sales_order_db.inc
index cf7b6682..55a16585 100644
--- a/sales/includes/db/sales_order_db.inc
+++ b/sales/includes/db/sales_order_db.inc
@@ -223,10 +223,11 @@ function update_sales_order($order)
 			}
 		}
 		$sql = "INSERT INTO ".TB_PREF."sales_order_details
-		 (order_no, trans_type, stk_code,  description, unit_price, quantity,
+		 (id, order_no, trans_type, stk_code,  description, unit_price, quantity,
 		  discount_percent, qty_sent)
 		 VALUES (";
-		$sql .= $order_no . ",".$order->trans_type.","
+		$sql .= db_escape($line->id ? $line->id : 0) . ","
+		  .$order_no . ",".$order->trans_type.","
 		  .db_escape($line->stock_id) . ","
 		  .db_escape($line->item_description) . ", "
 		  .db_escape($line->price) . ", "
@@ -268,33 +269,33 @@ function update_sales_order($order)
 
 function get_sales_order_header($order_no, $trans_type)
 {
-	$sql = "SELECT ".TB_PREF."sales_orders.*, "
-	  .TB_PREF."debtors_master.name, "
-	  .TB_PREF."debtors_master.curr_code, "
-	  .TB_PREF."debtors_master.email AS master_email, "
-	  .TB_PREF."locations.location_name, "
-	  .TB_PREF."debtors_master.discount, "
-	  .TB_PREF."sales_types.sales_type, "
-	  .TB_PREF."sales_types.id AS sales_type_id, "
-	  .TB_PREF."sales_types.tax_included, "
-	  .TB_PREF."shippers.shipper_name, "
-	  .TB_PREF."tax_groups.name AS tax_group_name , "
-	  .TB_PREF."tax_groups.id AS tax_group_id
-	FROM ".TB_PREF."sales_orders, "
-	  .TB_PREF."debtors_master, "
-	  .TB_PREF."sales_types, "
-	  .TB_PREF."tax_groups, "
-	  .TB_PREF."cust_branch, "
-	  .TB_PREF."locations, "
-	  .TB_PREF."shippers
-	WHERE ".TB_PREF."sales_orders.order_type=".TB_PREF."sales_types.id
-		AND ".TB_PREF."cust_branch.branch_code = ".TB_PREF."sales_orders.branch_code
-		AND ".TB_PREF."cust_branch.tax_group_id = ".TB_PREF."tax_groups.id
-		AND ".TB_PREF."sales_orders.debtor_no = ".TB_PREF."debtors_master.debtor_no
-		AND ".TB_PREF."locations.loc_code = ".TB_PREF."sales_orders.from_stk_loc
-		AND ".TB_PREF."shippers.shipper_id = ".TB_PREF."sales_orders.ship_via
-		AND ".TB_PREF."sales_orders.trans_type = " . db_escape($trans_type) ."
-		AND ".TB_PREF."sales_orders.order_no = " . db_escape($order_no );
+	$sql = "SELECT sorder.*, "
+	  ."cust.name, "
+	  ."cust.curr_code, "
+	  ."cust.email AS master_email, "
+	  ."loc.location_name, "
+	  ."cust.discount, "
+	  ."stype.sales_type, "
+	  ."stype.id AS sales_type_id, "
+	  ."stype.tax_included, "
+	  ."ship.shipper_name, "
+	  ."tax_group.name AS tax_group_name , "
+	  ."tax_group.id AS tax_group_id "
+	."FROM ".TB_PREF."sales_orders sorder, "
+	  .TB_PREF."debtors_master cust,"
+	  .TB_PREF."sales_types stype, "
+	  .TB_PREF."tax_groups tax_group, "
+	  .TB_PREF."cust_branch branch,"
+	  .TB_PREF."locations loc, "
+	  .TB_PREF."shippers ship
+	WHERE sorder.order_type=stype.id
+		AND branch.branch_code = sorder.branch_code
+		AND branch.tax_group_id = tax_group.id
+		AND sorder.debtor_no = cust.debtor_no
+		AND loc.loc_code = sorder.from_stk_loc
+		AND ship.shipper_id = sorder.ship_via
+		AND sorder.trans_type = " . db_escape($trans_type) ."
+		AND sorder.order_no = " . db_escape($order_no );
 
 	$result = db_query($sql, "order Retreival");
 
@@ -460,9 +461,7 @@ function get_branch_to_order($customer_id, $branch_id) {
 	 	$sql = "SELECT ".TB_PREF."cust_branch.br_name, "
 			.TB_PREF."cust_branch.br_address, "
 			.TB_PREF."cust_branch.br_post_address, "
-			.TB_PREF."cust_branch.phone, "
-			.TB_PREF."cust_branch.email,
-			  default_location, location_name, default_ship_via, "
+			." default_location, location_name, default_ship_via, "
 			.TB_PREF."tax_groups.name AS tax_group_name, "
 			.TB_PREF."tax_groups.id AS tax_group_id
 			FROM ".TB_PREF."cust_branch, "