From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Tue, 5 Oct 2010 19:09:46 +0000 (+0000)
Subject: [0000258] Broken src_id fields after sales document edition.
X-Git-Tag: v2.4.2~19^2~593
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=c51342d597064d69232b240af8e658333b24bad9;p=fa-stable.git

[0000258] Broken src_id fields after sales document edition.
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e4b31a26..6581fb03 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+05-Oct-2010 Jusz Dobrowolski
+# [0000258] Broken src_id fields after sales document edition.
+$ /sales/includes/cart_class.inc
+  /sales/includes/sales_db.inc
+
 05-Oct-2010 Joe Hunt
 # [00000257] Bad Layout in sales order inquiry etc. (long item descriptions)
 $ /sales/inquiry/sales_orders_view.php
diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index 00b31168..7a3b765b 100644
--- a/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.inc
@@ -157,7 +157,8 @@ class cart
 				if ($this->trans_type == ST_SALESINVOICE)
 					$line->src_no = $srcline['debtor_trans_no'];
 				$line->qty_old = $line->qty_dispatched = $line->quantity;
-				$line->quantity += $srcline['quantity'] - $srcline['qty_done']; // add free qty on src doc
+				$line->quantity += $srcline['quantity'] - 
+					($src_type==ST_SALESORDER ? $srcline['qty_sent'] : $srcline['qty_done']); // add free qty on src doc
 				$line_no++;
 				break;
 			}
@@ -348,10 +349,11 @@ class cart
 			$this->freight_cost = $freight_cost;
 	}
 
-	function add_to_cart($line_no, $stock_id, $qty, $price, $disc, $qty_done=0, $standard_cost=0, $description=null, $id=0, $src_no=0)
+	function add_to_cart($line_no, $stock_id, $qty, $price, $disc, $qty_done=0, $standard_cost=0, $description=null, $id=0, $src_no=0,
+		$src_id=0)
 	{
 		$line = new line_details($stock_id, $qty, $price, $disc,
-			$qty_done,  $standard_cost, $description, $id, $src_no);
+			$qty_done,  $standard_cost, $description, $id, $src_no, $src_id);
 
 		if ($line->valid) {
 			$this->line_items[$line_no] = $line;
@@ -574,12 +576,13 @@ class line_details
 
 
 	function line_details ($stock_id, $qty, $prc, $disc_percent,
-		$qty_done, $standard_cost, $description, $id=0, $src_no=0 )
+		$qty_done, $standard_cost, $description, $id=0, $src_no=0, $src_id=0)
 	{
 	/* Constructor function to add a new LineDetail object with passed params */
 
 		$this->id = $id;
 		$this->src_no = $src_no;
+		$this->src_id = $src_id;
 		$item_row = get_item($stock_id);
 
 		if (!$item_row) 
diff --git a/sales/includes/sales_db.inc b/sales/includes/sales_db.inc
index 4dff712f..a09311c6 100644
--- a/sales/includes/sales_db.inc
+++ b/sales/includes/sales_db.inc
@@ -300,7 +300,8 @@ function read_sales_trans($doc_type, $trans_no, &$cart)
 					$myrow["stock_id"],$myrow["quantity"],
 					$myrow["unit_price"], $myrow["discount_percent"],
 					$myrow["qty_done"], $myrow["standard_cost"],
-					$myrow["StockDescription"],$myrow["id"], $myrow["debtor_trans_no"]);
+					$myrow["StockDescription"],$myrow["id"], $myrow["debtor_trans_no"],
+					@$myrow["src_id"]);
 			}
 		}
 	} // !newdoc