From: Maxime Bourget <bmx007@gmail.com>
Date: Sun, 16 Jun 2013 12:22:08 +0000 (+0100)
Subject: Split: add original detail_id in reference.
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=7f3e03da5c438676b9819b56785a09d904a2305d;p=order_line_extra.git

Split: add original detail_id in reference.

Allow splits to be grouped back.
---

diff --git a/includes/db_order_lines.inc b/includes/db_order_lines.inc
index 944a3f2..ebf4014 100644
--- a/includes/db_order_lines.inc
+++ b/includes/db_order_lines.inc
@@ -148,6 +148,13 @@ function update_order_detail_defaults($use_order_date=false) {
 					WHERE expiry_date is null";
 	$ok &= db_query($sql, $sql);
 
+	// Set ref to ref order. Usefull to track detail history (if move from orders)
+	$sql  = "UPDATE ".TB_PREF."sales_order_details
+						NATURAL JOIN  ".TB_PREF."sales_orders 
+					SET ref = reference
+					WHERE ref is null";
+	$ok &= db_query($sql);
+
 	return $ok;
 }
 
diff --git a/includes/order_lines.inc b/includes/order_lines.inc
index d961b89..1759c88 100644
--- a/includes/order_lines.inc
+++ b/includes/order_lines.inc
@@ -253,7 +253,8 @@ function get_order_details_extra($customer_id, $location, $item_like, $order_id)
 	, hold_until_date
 	, required_date
 	, expiry_date
-	,comment";
+	,comment
+	,ref";
 	$from =  TB_PREF."sales_order_details sod
 	JOIN ".TB_PREF."sales_orders so ON (so.order_no = sod.order_no
 		AND so.trans_type = sod.trans_type
diff --git a/includes/splitter.inc b/includes/splitter.inc
index f8090ac..782e77d 100644
--- a/includes/splitter.inc
+++ b/includes/splitter.inc
@@ -152,7 +152,9 @@ class Splitter extends OrderAction {
 				->add($detail['stk_code'], 'stk_code')
 				->add($detail['description'], 'description')
 				->add($detail['unit_price'], 'unit_price', false)
-				->add($detail['discount_percent'], 'discount_percent', false);
+				->add($detail['discount_percent'], 'discount_percent', false)
+				->add($detail['ref'].":split:".$detail['id'], 'ref')
+			;
 
 		foreach($splits as $split) {
 			$set = new SqlSet($common_set);
diff --git a/order_lines_view.php b/order_lines_view.php
index 1dc1297..ea8b128 100644
--- a/order_lines_view.php
+++ b/order_lines_view.php
@@ -132,6 +132,7 @@ if($customer_id) {
 		,_("Require By") => array('fun' => 'input_required_date_details', 'ord' => '')
 		,_("Expiry Date") => array('fun' => 'input_expiry_date_details', 'ord' => '')
 		,_("Comment") => array('fun' => 'input_comment_details', 'ord' => '')
+		,_("Reference") => array( 'ord' => '')
 		,'<input id="checkAll" type="checkbox">' => array('fun' => 'input_check_details')
 	);
 }