From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Thu, 7 May 2009 21:28:31 +0000 (+0000)
Subject: Layout bug in sales_order_view. Column Comments renamed to Cust Order Ref
X-Git-Tag: 2.3-final~1266
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=9cd35ba19ec08ef17f0880c32c9823c87b5c9b72;hp=1756b92379a503b689f9f9a0929a3353edbb1e73;p=fa-stable.git

Layout bug in sales_order_view. Column Comments renamed to Cust Order Ref
Layout bug in sales_order_ui. Bad presentation of customer if not editable
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ac6f530b..027d3543 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -22,6 +22,10 @@ $ -> Affected files
 07-May-2009 Joe Hunt
 # Layout bug in exchange rate display
 $ /includes/ui/ui_view.inc
+# Layout bug in sales_order_view. Column Comments renamed to Cust Order Ref
+$ /sales/inquiry/sales_orders_view.php
+# Layout bug in sales_order_ui. Bad presentation of customer if not editable
+$ /sales/includessales_order_ui.inc
 
 05-May-2009 Janusz Dobrowolski
 # Fixed check if code for new sales kit is not used.
diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index af71bed1..2508c11b 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -246,7 +246,8 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 	if (isset($order) && !$editable)
 	{
 		// can't change the customer/branch if items already received on this order
-		echo $order->customer_name . " - " . $order->deliver_to;
+		//echo $order->customer_name . " - " . $order->deliver_to;
+		label_row(null, $order->customer_name . " - " . $order->deliver_to);
 		hidden('customer_id', $order->customer_id);
 		hidden('branch_id', $order->Branch);
 		hidden('sales_type', $order->sales_type);
diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index 125cae8c..a9741fa2 100644
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -261,7 +261,7 @@ $cols = array(
 	_("Order #") => array('fun'=>'view_link'),
 	_("Customer"),
 	_("Branch"), 
-	_("Comments"),
+	_("Cust Order Ref"),
 	_("Order Date") => 'date',
 	_("Required By") =>array('type'=>'date', 'ord'=>''),
 	_("Delivery To"), 
@@ -271,7 +271,7 @@ $cols = array(
 );
 
 if ($_POST['order_view_mode'] == 'OutstandingOnly') {
-	array_replace($cols, 3, 1, _("Cust Order Ref"));
+	//array_replace($cols, 3, 1, _("Cust Order Ref"));
 	array_append($cols, array(array('insert'=>true, 'fun'=>'dispatch_link')));
 
 } elseif ($_POST['order_view_mode'] == 'InvoiceTemplates') {