Additional fixes for editable item descriptions.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a1e058999e602415ece45ea9b3e2b390e4052317..b8983ae584139f4c302f54fde873142a992b41ce 100644 (file)
--- 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 cd7299a8d18d96c807129f913ce453edc8161f82..15f851fbf1e36f5c1743b2a34dffd0b6b90dd658 100644 (file)
--- 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);