From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Tue, 26 Jan 2010 17:40:21 +0000 (+0000)
Subject: Additional fixes for editable item descriptions.
X-Git-Tag: v2.4.2~19^2~975
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=3cdbda7dc86b8d6858cd7c79ac8d77fc78158fc7;p=fa-stable.git

Additional fixes for editable item descriptions.
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a1e05899..b8983ae5 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -27,6 +27,7 @@ $ /includes/ui/ui_lists.inc
   /inventory/includes/db/items_db.inc
   /inventory/manage/items.php
   /js/inserts.js
+  /sales/customer_delivery.php
   /sales/sales_order_entry.php
   /sales/includes/cart_class.inc
   /sales/includes/ui/sales_order_ui.inc
diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index cd7299a8..15f851fb 100644
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -428,7 +428,12 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
 	}
 	view_stock_status_cell($ln_itm->stock_id);
 
-	text_cells(null, 'Line'.$line.'Desc', $ln_itm->item_description, 30, 50);
+	if ($ln_itm->descr_editable)
+		text_cells(null, 'Line'.$line.'Desc', $ln_itm->item_description, 30, 50);
+	else
+		label_cell($ln_itm->item_description);
+	
+	label_cell($ln_itm->units);
 	$dec = get_qty_dec($ln_itm->stock_id);
 	qty_cell($ln_itm->quantity, false, $dec);
 	label_cell($ln_itm->units);