From 34324e6c0dd76bb0af352cb6def4f0a49b68e0a3 Mon Sep 17 00:00:00 2001
From: Maxime Bourget <bmx007@gmail.com>
Date: Sat, 4 May 2013 16:31:22 +0100
Subject: [PATCH] Load and display orders

---
 order_lines_view.php | 67 ++------------------------------------------
 1 file changed, 2 insertions(+), 65 deletions(-)

diff --git a/order_lines_view.php b/order_lines_view.php
index 7f57e4f..7dd1be9 100644
--- a/order_lines_view.php
+++ b/order_lines_view.php
@@ -29,11 +29,7 @@ if (!@$_GET['popup'])
 	if ($use_date_picker)
 		$js .= get_js_date_picker();
 	page($_SESSION['page_title'], false, false, "", $js);
-/*
-*/
 }
-?>Hello<br><?php
-
 
 if (isset($_GET['selected_customer']))
 {
@@ -59,38 +55,21 @@ else
 }
 
 
-/*
 if (!@$_GET['popup'])
 	start_form();
-*/
 
 start_table(TABLESTYLE_NOBORDER);
 start_row();
 ref_cells(_("#:"), 'OrderNumber', '',null, '', true);
 ref_cells(_("Ref"), 'OrderReference', '',null, '', true);
-if ($show_dates)
-{
-  	date_cells(_("from:"), 'OrdersAfterDate', '', null, -30);
-  	date_cells(_("to:"), 'OrdersToDate', '', null, 1);
-}
 locations_list_cells(_("Location:"), 'StockLocation', null, true);
 
-if($show_dates) {
-	end_row();
-	end_table();
-
-	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);
-if ($trans_type == ST_SALESQUOTE)
-	check_cells(_("Show All:"), 'show_all');
 
 submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 hidden('order_view_mode', $_POST['order_view_mode']);
-hidden('type', $trans_type);
 
 end_row();
 
@@ -98,10 +77,10 @@ end_table(1);
 //---------------------------------------------------------------------------------------------
 //	Orders inquiry table
 //
-$sql = get_sql_for_sales_orders_view($selected_customer, $trans_type, $_POST['OrderNumber'], $_POST['order_view_mode'],
+$trans_type = ST_SALESORDER;
+$sql = get_sql_for_sales_orders_view($selected_customer, $trans_type, $_POST['OrderNumber'], 'OutstandingOnly',
 	@$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"),
@@ -115,51 +94,9 @@ if ($trans_type == ST_SALESORDER)
 		'Type' => 'skip',
 		_("Currency") => array('align'=>'center')
 	);
-else
-	$cols = array(
-		_("Quote #") => array('fun'=>'view_link'),
-		_("Ref"),
-		_("Customer"),
-		_("Branch"), 
-		_("Cust Order Ref"),
-		_("Quote Date") => 'date',
-		_("Valid until") =>array('type'=>'date', 'ord'=>''),
-		_("Delivery To"), 
-		_("Quote Total") => array('type'=>'amount', 'ord'=>''),
-		'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')));
-
-} elseif ($_POST['order_view_mode'] == 'InvoiceTemplates') {
-	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, 4, 1, _("Description"));
-	array_append($cols, array(
-			array('insert'=>true, 'fun'=>'delivery_link'))
-	);
-
-} elseif ($trans_type == ST_SALESQUOTE) {
-	 array_append($cols,array(
-					array('insert'=>true, 'fun'=>'edit_link'),
-					array('insert'=>true, 'fun'=>'order_link'),
-					array('insert'=>true, 'fun'=>'prt_link')));
-} elseif ($trans_type == ST_SALESORDER) {
-	 array_append($cols,array(
-			_("Tmpl") => array('insert'=>true, 'fun'=>'tmpl_checkbox'),
-					array('insert'=>true, 'fun'=>'edit_link'),
-					array('insert'=>true, 'fun'=>'prt_link')));
-};
 
 
 $table =& new_db_pager('orders_tbl', $sql, $cols);
-$table->set_marker('check_overdue', _("Marked items are overdue."));
 
 $table->width = "80%";
 
-- 
2.30.2