From: Maxime Bourget <bmx007@gmail.com>
Date: Sat, 4 May 2013 20:59:44 +0000 (+0100)
Subject: Clean up + start writting query
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=d3002e6bf941e5d738b0abdbe5fab2924a635421;p=order_line_extra.git

Clean up + start writting query
---

diff --git a/includes/order_lines.inc b/includes/order_lines.inc
new file mode 100644
index 0000000..cb8c105
--- /dev/null
+++ b/includes/order_lines.inc
@@ -0,0 +1,13 @@
+<?php
+function get_order_details_extra($customer_id) {
+	$sql = "SELECT so.order_no 
+	FROM ".TB_PREF."sales_order_details sod
+	JOIN ".TB_PREF."sales_orders so ON (so.order_no = sod.order_no
+		AND so.trans_type = sod.trans_type
+		AND so.debtor_no = $customer_id
+	)
+	";
+
+	return $sql;
+}
+?>
diff --git a/order_lines_view.php b/order_lines_view.php
index 7dd1be9..6f07614 100644
--- a/order_lines_view.php
+++ b/order_lines_view.php
@@ -15,85 +15,51 @@ include_once($path_to_root . "/includes/db_pager.inc");
 include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/sales/includes/sales_ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
+
+include_once("includes/order_lines.inc");
+
 $page_security = 'SA_ORDERLINEX_EDIT';
 add_access_extensions();
 
-	$_POST['order_view_mode'] = "Quotations";
-	$_SESSION['page_title'] = _($help_context = "Edit lines extra parameters");
-
-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);
-}
+$_SESSION['page_title'] = _($help_context = "Edit lines extra parameters");
 
-if (isset($_GET['selected_customer']))
-{
-	$selected_customer = $_GET['selected_customer'];
-}
-elseif (isset($_POST['selected_customer']))
-{
-	$selected_customer = $_POST['selected_customer'];
-}
-else
-	$selected_customer = -1;
+$js = "";
+page($_SESSION['page_title'], false, false, "", $js);
 
 //---------------------------------------------------------------------------------------------
 
-if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") &&
-	($_POST['SelectStockFromList'] != ALL_TEXT))
-{
- 	$selected_stock_item = $_POST['SelectStockFromList'];
-}
-else
-{
-	unset($selected_stock_item);
-}
-
-
-if (!@$_GET['popup'])
-	start_form();
+start_form();
 
 start_table(TABLESTYLE_NOBORDER);
 start_row();
-ref_cells(_("#:"), 'OrderNumber', '',null, '', true);
-ref_cells(_("Ref"), 'OrderReference', '',null, '', true);
-locations_list_cells(_("Location:"), 'StockLocation', null, true);
 
-stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
-if (!@$_GET['popup'])
-	customer_list_cells(_("Select a customer: "), 'customer_id', null, true);
+customer_list_cells(_("Select a customer: "), 'customer_id', false, false, true);
 
-submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
-hidden('order_view_mode', $_POST['order_view_mode']);
+
+
+
+
+//submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 
 end_row();
 
 end_table(1);
+
 //---------------------------------------------------------------------------------------------
 //	Orders inquiry table
 //
-$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']);
+$customer_id = $_POST['customer_id'];
+if(isset($customer_id)) {
+label_cell($customer_id);
+	$sql = get_order_details_extra($customer_id);
+
 
 	$cols = array(
-		_("Order #") => array('fun'=>'view_link'),
-		_("Ref"),
-		_("Customer"),
-		_("Branch"), 
-		_("Cust Order Ref"),
-		_("Order Date") => 'date',
-		_("Required By") =>array('type'=>'date', 'ord'=>''),
-		_("Delivery To"), 
-		_("Order Total") => array('type'=>'amount', 'ord'=>''),
-		'Type' => 'skip',
-		_("Currency") => array('align'=>'center')
+		_("Order #")
 	);
+}
+else {
+}
 
 
 $table =& new_db_pager('orders_tbl', $sql, $cols);
@@ -103,9 +69,6 @@ $table->width = "80%";
 display_db_pager($table);
 submit_center('Update', _("Update"), true, '', null);
 
-if (!@$_GET['popup'])
-{
 	end_form();
 	end_page();
-}
 ?>