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 ac6f530bdf6c37befd01002791f5b698b8cf9fe9..027d3543e05857d2171b0497be57d45994d915c0 100644 (file)
--- 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 af71bed18d8ca30b52411f5f6d8fc28a24423205..2508c11b5429067896ffdeddaa50f2874e05cf11 100644 (file)
--- 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 125cae8c51bfb44334f6362b547b35295a2cf359..a9741fa2bd3e86b1311573fef06913ed030f5c18 100644 (file)
--- 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') {