X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fpo_db.inc;h=06ce31ffcf59d4d463f79cc33d0c90df16fa0734;hp=23f19a09f582b81b56c8b63ca2df6244ac19a60c;hb=91d3ebdef0c693e44d4e313e44e662c54f2d734d;hpb=9116377b75b35aed960ce77a4dc033a0c72bec97

diff --git a/purchasing/includes/db/po_db.inc b/purchasing/includes/db/po_db.inc
index 23f19a09..06ce31ff 100644
--- a/purchasing/includes/db/po_db.inc
+++ b/purchasing/includes/db/po_db.inc
@@ -91,6 +91,12 @@ function add_po(&$po_obj)
      /*Insert the purchase order detail records */
      foreach ($po_obj->line_items as $line_no => $po_line)
      {
+     	if (!$po_line->descr_editable)
+     	{
+			$data = get_purchase_data($po_obj->supplier_id, $po_line->stock_id);
+			if ($data !== false && $data['supplier_description'] != "")
+				$po_line->item_description = $data['supplier_description'];
+      	}
 		$sql = "INSERT INTO ".TB_PREF."purch_order_details (order_no, item_code, description, delivery_date,	unit_price,	quantity_ordered) VALUES (";
 		$sql .= $po_obj->order_no . ", " . db_escape($po_line->stock_id). "," .
 		db_escape($po_line->item_description). ",'" .
@@ -136,6 +142,12 @@ function update_po(&$po_obj)
     /*Now Update the purchase order detail records */
     foreach ($po_obj->line_items as $po_line)
     {
+    	if (!$po_line->descr_editable)
+     	{
+			$data = get_purchase_data($po_obj->supplier_id, $po_line->stock_id);
+			if ($data !== false && $data['supplier_description'] != "")
+				$po_line->item_description = $data['supplier_description'];
+      	}
     	$sql = "INSERT INTO ".TB_PREF."purch_order_details (po_detail_item, order_no, item_code, 
     		description, delivery_date, unit_price, quantity_ordered, quantity_received) VALUES ("
 			.db_escape($po_line->po_detail_rec ? $po_line->po_detail_rec : 0). ","
@@ -217,7 +229,7 @@ function read_po_items($order_no, &$order, $open_items_only=false)
 {
 	/*now populate the line po array with the purchase order details records */
 
-	$sql = "SELECT poline.*, units
+	$sql = "SELECT poline.*, units, editable
 		FROM ".TB_PREF."purch_order_details poline
 			LEFT JOIN ".TB_PREF."stock_master item	ON poline.item_code=item.stock_id
 		WHERE order_no =".db_escape($order_no);
@@ -233,13 +245,11 @@ function read_po_items($order_no, &$order, $open_items_only=false)
     {
 		while ($myrow = db_fetch($result))
         {
-        	$data = get_purchase_data($order->supplier_id, $myrow['item_code']);
-        	if ($data !== false)
-        	{
-        		if ($data['supplier_description'] != "")
-        			$myrow['description'] = $data['supplier_description'];
-        	}		
-            if (is_null($myrow["units"]))
+			$data = get_purchase_data($order->supplier_id, $myrow['item_code']);
+			if ($data !== false && !$myrow['editable'] && $data['supplier_description'] != "" && 
+				$myrow['description'] != $data['supplier_description']) // backward compatibility
+				$myrow['description'] = $data['supplier_description'];
+			if (is_null($myrow["units"]))
             {
 		       	$units = "";
             }