CItem Cost Update will also regulate the stock moves standard cost to mirror correct GL.

[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 4ac964ad17004c6ace04b497c1e2b69ce083315b..522cfd80c993fedcccbcf3a24db17bc600d4c8c8 100644 (file)
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -103,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']));
 }
 
@@ -229,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();
@@ -238,9 +238,9 @@ if($show_dates) {
        start_table(TABLESTYLE_NOBORDER);
        start_row();
 }
-stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
+stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true, true);
 if (!@$_GET['popup'])
-       customer_list_cells(_("Select a customer: "), 'customer_id', null, true);
+       customer_list_cells(_("Select a customer: "), 'customer_id', null, true, true);
 if ($trans_type == ST_SALESQUOTE)
        check_cells(_("Show All:"), 'show_all');
 
@@ -260,11 +260,11 @@ $sql = get_sql_for_sales_orders_view($selected_customer, $trans_type, $_POST['Or
 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'=>''),
@@ -327,4 +327,4 @@ if (!@$_GET['popup'])
        end_form();
        end_page();
 }
-?>
\ No newline at end of file
+?>