X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fsales_orders_view.php;h=522cfd80c993fedcccbcf3a24db17bc600d4c8c8;hb=84ebe8b3ebc1fc3e6508d75a4f39ce4a868b0b14;hp=da43c0f518f4e863ad707b84973c0a04d7438015;hpb=30fdef9a9671c9f8e0167f5737557717622a7b7d;p=fa-stable.git

diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index da43c0f5..522cfd80 100644
--- 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']));
 }
 
@@ -121,8 +121,8 @@ function prt_link($row)
 
 function edit_link($row) 
 {
-	if (@$_GET['popup'])
-		return '';
+	if (@$_GET['popup'])
+		return '';
 	global $trans_type;
 	$modify = ($trans_type == ST_SALESORDER ? "ModifyOrderNumber" : "ModifyQuotationNumber");
   return pager_link( _("Edit"),
@@ -167,8 +167,8 @@ function tmpl_checkbox($row)
 	global $trans_type;
 	if ($trans_type == ST_SALESQUOTE)
 		return '';
-	if (@$_GET['popup'])
-		return '';
+	if (@$_GET['popup'])
+		return '';
 	$name = "chgtpl" .$row['order_no'];
 	$value = $row['type'] ? 1:0;
 
@@ -217,7 +217,7 @@ if (get_post('_OrderNumber_changed') || get_post('_OrderReference_changed')) //
 	$Ajax->activate('orders_tbl');
 }
 
-if (!@$_GET['popup'])
+if (!@$_GET['popup'])
 	start_form();
 
 start_table(TABLESTYLE_NOBORDER);
@@ -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);
-if (!@$_GET['popup'])
-	customer_list_cells(_("Select a customer: "), 'customer_id', null, true);
+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');
 
@@ -255,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']);
+	@$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'=>''),
@@ -285,11 +285,11 @@ else
 		'Type' => 'skip',
 		_("Currency") => array('align'=>'center')
 	);
-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')));
+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, 4, 1, _("Description"));
@@ -322,9 +322,9 @@ $table->width = "80%";
 display_db_pager($table);
 submit_center('Update', _("Update"), true, '', null);
 
-if (!@$_GET['popup'])
+if (!@$_GET['popup'])
 {
 	end_form();
 	end_page();
-}
-?>
\ No newline at end of file
+}
+?>