Supplier info not shown on gl inquiry for bank account.

[fa-stable.git] / sales / inquiry / sales_orders_view.php

diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index 39b26f2a8f8a271ee6c16eef607b7d614cc8fb63..522cfd80c993fedcccbcf3a24db17bc600d4c8c8 100644 (file)
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -24,15 +24,7 @@ set_page_security( @$_POST['order_view_mode'],
        array(  'OutstandingOnly' => 'SA_SALESDELIVERY',
                        'InvoiceTemplates' => 'SA_SALESINVOICE')
 );
-if (!@$_GET['popup'])\r
-{\r
-       $js = "";
-       if ($use_popup_windows)
-               $js .= get_js_open_window(900, 600);
-       if ($use_date_picker)
-               $js .= get_js_date_picker();
-       page($_SESSION['page_title'], false, false, "", $js);\r
-}
+
 if (get_post('type'))
        $trans_type = $_POST['type'];
 elseif (isset($_GET['type']) && $_GET['type'] == ST_SALESQUOTE)
@@ -69,6 +61,16 @@ else
        $_SESSION['page_title'] = _($help_context = "Search All Sales Quotations");
 }
 
+if (!@$_GET['popup'])
+{
+       $js = "";
+       if ($use_popup_windows)
+               $js .= get_js_open_window(900, 600);
+       if ($use_date_picker)
+               $js .= get_js_date_picker();
+       page($_SESSION['page_title'], false, false, "", $js);
+}
+
 if (isset($_GET['selected_customer']))
 {
        $selected_customer = $_GET['selected_customer'];
@@ -101,7 +103,7 @@ function check_overdue($row)
                return (date1_greater_date2(Today(), sql2date($row['delivery_date'])));
        else
                return ($row['type'] == 0
-                       && date1_greater_date2(Today(), sql2date($row['ord_date']))
+                       && date1_greater_date2(Today(), sql2date($row['delivery_date']))
                        && ($row['TotDelivered'] < $row['TotQuantity']));
 }
 
@@ -119,8 +121,8 @@ function prt_link($row)
 
 function edit_link($row) 
 {
-       if (@$_GET['popup'])\r
-               return '';\r
+       if (@$_GET['popup'])
+               return '';
        global $trans_type;
        $modify = ($trans_type == ST_SALESORDER ? "ModifyOrderNumber" : "ModifyQuotationNumber");
   return pager_link( _("Edit"),
@@ -165,8 +167,8 @@ function tmpl_checkbox($row)
        global $trans_type;
        if ($trans_type == ST_SALESQUOTE)
                return '';
-       if (@$_GET['popup'])\r
-               return '';\r
+       if (@$_GET['popup'])
+               return '';
        $name = "chgtpl" .$row['order_no'];
        $value = $row['type'] ? 1:0;
 
@@ -215,7 +217,7 @@ if (get_post('_OrderNumber_changed') || get_post('_OrderReference_changed')) //
        $Ajax->activate('orders_tbl');
 }
 
-if (!@$_GET['popup'])\r
+if (!@$_GET['popup'])
        start_form();
 
 start_table(TABLESTYLE_NOBORDER);
@@ -227,7 +229,7 @@ if ($show_dates)
        date_cells(_("from:"), 'OrdersAfterDate', '', null, -30);
        date_cells(_("to:"), 'OrdersToDate', '', null, 1);
 }
-locations_list_cells(_("Location:"), 'StockLocation', null, true);
+locations_list_cells(_("Location:"), 'StockLocation', null, true, true);
 
 if($show_dates) {
        end_row();
@@ -236,9 +238,9 @@ if($show_dates) {
        start_table(TABLESTYLE_NOBORDER);
        start_row();
 }
-stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
-if (!@$_GET['popup'])\r
-       customer_list_cells(_("Select a customer: "), 'customer_id', null, true);\r
+stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true, true);
+if (!@$_GET['popup'])
+       customer_list_cells(_("Select a customer: "), 'customer_id', null, true, true);
 if ($trans_type == ST_SALESQUOTE)
        check_cells(_("Show All:"), 'show_all');
 
@@ -253,16 +255,16 @@ end_table(1);
 //     Orders inquiry table
 //
 $sql = get_sql_for_sales_orders_view($selected_customer, $trans_type, $_POST['OrderNumber'], $_POST['order_view_mode'],
-       @$selected_stock_item, @$_POST['OrdersAfterDate'], @$_POST['OrdersToDate'], @$_POST['OrderReference'], $_POST['StockLocation'], $_POST['customer_id']);\r
+       @$selected_stock_item, @$_POST['OrdersAfterDate'], @$_POST['OrdersToDate'], @$_POST['OrderReference'], $_POST['StockLocation'], $_POST['customer_id']);
 
 if ($trans_type == ST_SALESORDER)
        $cols = array(
                _("Order #") => array('fun'=>'view_link'),
-               _("Ref"),
-               _("Customer"),
+               _("Ref") => array('type' => 'sorder.reference', 'ord' => '') ,
+               _("Customer") => array('type' => 'debtor.name' , 'ord' => '') ,
                _("Branch"), 
                _("Cust Order Ref"),
-               _("Order Date") => 'date',
+               _("Order Date") => array('type' =>  'date', 'ord' => ''),
                _("Required By") =>array('type'=>'date', 'ord'=>''),
                _("Delivery To"), 
                _("Order Total") => array('type'=>'amount', 'ord'=>''),
@@ -283,18 +285,18 @@ else
                'Type' => 'skip',
                _("Currency") => array('align'=>'center')
        );
-if ($_POST['order_view_mode'] == 'OutstandingOnly') {\r
-       //array_substitute($cols, 3, 1, _("Cust Order Ref"));\r
-       array_append($cols, array(\r
-               array('insert'=>true, 'fun'=>'dispatch_link'),\r
-               array('insert'=>true, 'fun'=>'edit_link')));\r
+if ($_POST['order_view_mode'] == 'OutstandingOnly') {
+       //array_substitute($cols, 4, 1, _("Cust Order Ref"));
+       array_append($cols, array(
+               array('insert'=>true, 'fun'=>'dispatch_link'),
+               array('insert'=>true, 'fun'=>'edit_link')));
 
 } elseif ($_POST['order_view_mode'] == 'InvoiceTemplates') {
-       array_substitute($cols, 3, 1, _("Description"));
+       array_substitute($cols, 4, 1, _("Description"));
        array_append($cols, array( array('insert'=>true, 'fun'=>'invoice_link')));
 
 } else if ($_POST['order_view_mode'] == 'DeliveryTemplates') {
-       array_substitute($cols, 3, 1, _("Description"));
+       array_substitute($cols, 4, 1, _("Description"));
        array_append($cols, array(
                        array('insert'=>true, 'fun'=>'delivery_link'))
        );
@@ -320,9 +322,9 @@ $table->width = "80%";
 display_db_pager($table);
 submit_center('Update', _("Update"), true, '', null);
 
-if (!@$_GET['popup'])\r
+if (!@$_GET['popup'])
 {
        end_form();
        end_page();
-}\r
-?>
\ No newline at end of file
+}
+?>