X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fsales_orders_view.php;h=c60df3a432893f85f176634cbd71e503fac707a3;hb=963bc21ea092322d5750d4c0914b5e532e7d2467;hp=7ebcb822de408fc2fcf5d108d6f320c98067ab1e;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git

diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index 7ebcb822..c60df3a4 100644
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -9,7 +9,6 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 'SA_STEMPLATE';
 $path_to_root = "../..";
 
 include($path_to_root . "/includes/db_pager.inc");
@@ -17,6 +16,15 @@ include($path_to_root . "/includes/session.inc");
 include($path_to_root . "/sales/includes/sales_ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
+$page_security = 'SA_SALESTRANSVIEW';
+
+set_page_security( @$_POST['order_view_mode'],
+	array(	'OutstandingOnly' => 'SA_SALESDELIVERY',
+			'InvoiceTemplates' => 'SA_SALESINVOICE'),
+	array(	'OutstandingOnly' => 'SA_SALESDELIVERY',
+			'InvoiceTemplates' => 'SA_SALESINVOICE')
+);
+
 $js = "";
 if ($use_popup_windows)
 	$js .= get_js_open_window(900, 600);
@@ -25,37 +33,38 @@ if ($use_date_picker)
 
 if (get_post('type'))
 	$trans_type = $_POST['type'];
-elseif (isset($_GET['type']) && $_GET['type'] == 32)
-	$trans_type = 32;
+elseif (isset($_GET['type']) && $_GET['type'] == ST_SALESQUOTE)
+	$trans_type = ST_SALESQUOTE;
 else
-	$trans_type = 30;
-if ($trans_type == 30)
+	$trans_type = ST_SALESORDER;
+
+if ($trans_type == ST_SALESORDER)
 {
 	if (isset($_GET['OutstandingOnly']) && ($_GET['OutstandingOnly'] == true))
 	{
 		$_POST['order_view_mode'] = 'OutstandingOnly';
-		$_SESSION['page_title'] = _("Search Outstanding Sales Orders");
+		$_SESSION['page_title'] = _($help_context = "Search Outstanding Sales Orders");
 	}
 	elseif (isset($_GET['InvoiceTemplates']) && ($_GET['InvoiceTemplates'] == true))
 	{
 		$_POST['order_view_mode'] = 'InvoiceTemplates';
-		$_SESSION['page_title'] = _("Search Template for Invoicing");
+		$_SESSION['page_title'] = _($help_context = "Search Template for Invoicing");
 	}
 	elseif (isset($_GET['DeliveryTemplates']) && ($_GET['DeliveryTemplates'] == true))
 	{
 		$_POST['order_view_mode'] = 'DeliveryTemplates';
-		$_SESSION['page_title'] = _("Select Template for Delivery");
+		$_SESSION['page_title'] = _($help_context = "Select Template for Delivery");
 	}
 	elseif (!isset($_POST['order_view_mode']))
 	{
 		$_POST['order_view_mode'] = false;
-		$_SESSION['page_title'] = _("Search All Sales Orders");
+		$_SESSION['page_title'] = _($help_context = "Search All Sales Orders");
 	}
 }
 else
 {
 	$_POST['order_view_mode'] = "Quotations";
-	$_SESSION['page_title'] = _("Search All Sales Quotations");
+	$_SESSION['page_title'] = _($help_context = "Search All Sales Quotations");
 }
 page($_SESSION['page_title'], false, false, "", $js);
 
@@ -87,7 +96,7 @@ else
 function check_overdue($row)
 {
 	global $trans_type;
-	if ($trans_type == 32)
+	if ($trans_type == ST_SALESQUOTE)
 		return (date1_greater_date2(Today(), sql2date($row['delivery_date'])));
 	else
 		return ($row['type'] == 0
@@ -110,7 +119,7 @@ function prt_link($row)
 function edit_link($row) 
 {
 	global $trans_type;
-	$modify = ($trans_type == 30 ? "ModifyOrderNumber" : "ModifyQuotationNumber");
+	$modify = ($trans_type == ST_SALESORDER ? "ModifyOrderNumber" : "ModifyQuotationNumber");
   return pager_link( _("Edit"),
     "/sales/sales_order_entry.php?$modify=" . $row['order_no'], ICON_EDIT);
 }
@@ -118,7 +127,7 @@ function edit_link($row)
 function dispatch_link($row)
 {
 	global $trans_type;
-	if ($trans_type == 30)
+	if ($trans_type == ST_SALESORDER)
   		return pager_link( _("Dispatch"),
 			"/sales/customer_delivery.php?OrderNumber=" .$row['order_no'], ICON_DOC);
 	else		
@@ -129,7 +138,7 @@ function dispatch_link($row)
 function invoice_link($row)
 {
 	global $trans_type;
-	if ($trans_type == 30)
+	if ($trans_type == ST_SALESORDER)
   		return pager_link( _("Invoice"),
 			"/sales/sales_order_entry.php?NewInvoice=" .$row["order_no"], ICON_DOC);
 	else
@@ -151,7 +160,7 @@ function order_link($row)
 function tmpl_checkbox($row)
 {
 	global $trans_type;
-	if ($trans_type == 32)
+	if ($trans_type == ST_SALESQUOTE)
 		return '';
 	$name = "chgtpl" .$row['order_no'];
 	$value = $row['type'] ? 1:0;
@@ -223,7 +232,7 @@ locations_list_cells(_("Location:"), 'StockLocation', null, true);
 
 stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
 
-if ($trans_type == 32)
+if ($trans_type == ST_SALESQUOTE)
 	check_cells(_("Show All:"), 'show_all');
 submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 
@@ -233,78 +242,12 @@ hidden('type', $trans_type);
 end_row();
 
 end_table(1);
-end_form();
 //---------------------------------------------------------------------------------------------
 //	Orders inquiry table
 //
-$sql = "SELECT 
-		sorder.order_no,
-		sorder.reference,
-		debtor.name,
-		branch.br_name,"
-		.($_POST['order_view_mode']=='InvoiceTemplates' 
-		   	|| $_POST['order_view_mode']=='DeliveryTemplates' ?
-		 "sorder.comments, " : "sorder.customer_ref, ")
-		."sorder.ord_date,
-		sorder.delivery_date,
-		sorder.deliver_to,
-		Sum(line.unit_price*line.quantity*(1-line.discount_percent)) AS OrderValue,
-		sorder.type,
-		debtor.curr_code,
-		Sum(line.qty_sent) AS TotDelivered,
-		Sum(line.quantity) AS TotQuantity
-	FROM ".TB_PREF."sales_orders as sorder, "
-		.TB_PREF."sales_order_details as line, "
-		.TB_PREF."debtors_master as debtor, "
-		.TB_PREF."cust_branch as branch
-		WHERE sorder.order_no = line.order_no
-		AND sorder.trans_type = line.trans_type
-		AND sorder.trans_type = $trans_type
-		AND sorder.debtor_no = debtor.debtor_no
-		AND sorder.branch_code = branch.branch_code
-		AND debtor.debtor_no = branch.debtor_no";
-
-if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "")
-{
-	// search orders with number like ...
-	$sql .= " AND sorder.order_no LIKE '%". $_POST['OrderNumber'] ."'"
- 			." GROUP BY sorder.order_no";
-}
-else	// ... or select inquiry constraints
-{
-  	if ($_POST['order_view_mode']!='DeliveryTemplates' && $_POST['order_view_mode']!='InvoiceTemplates')
-  	{
-		$date_after = date2sql($_POST['OrdersAfterDate']);
-		$date_before = date2sql($_POST['OrdersToDate']);
-
-		$sql .=  " AND sorder.ord_date >= '$date_after'"
-				." AND sorder.ord_date <= '$date_before'";
-  	}
-  	if ($trans_type == 32 && !check_value('show_all'))
-  		$sql .= " AND sorder.delivery_date >= '".date2sql(Today())."'";
-	if ($selected_customer != -1)
-		$sql .= " AND sorder.debtor_no='" . $selected_customer . "'";
-
-	if (isset($selected_stock_item))
-		$sql .= " AND line.stk_code='". $selected_stock_item ."'";
-
-	if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != ALL_TEXT)
-		$sql .= " AND sorder.from_stk_loc = '". $_POST['StockLocation'] . "' ";
-
-	if ($_POST['order_view_mode']=='OutstandingOnly')
-		$sql .= " AND line.qty_sent < line.quantity";
-	elseif ($_POST['order_view_mode']=='InvoiceTemplates' || $_POST['order_view_mode']=='DeliveryTemplates')
-		$sql .= " AND sorder.type=1";
-
-	$sql .= " GROUP BY sorder.order_no,
-				sorder.debtor_no,
-				sorder.branch_code,
-				sorder.customer_ref,
-				sorder.ord_date,
-				sorder.deliver_to";
-}
+$sql = get_sql_for_sales_orders_view($selected_customer, $trans_type);
 
-if ($trans_type == 30)
+if ($trans_type == ST_SALESORDER)
 	$cols = array(
 		_("Order #") => array('fun'=>'view_link'),
 		_("Ref"),
@@ -333,25 +276,25 @@ else
 		_("Currency") => array('align'=>'center')
 	);
 if ($_POST['order_view_mode'] == 'OutstandingOnly') {
-	//array_replace($cols, 3, 1, _("Cust Order Ref"));
+	//array_substitute($cols, 3, 1, _("Cust Order Ref"));
 	array_append($cols, array(array('insert'=>true, 'fun'=>'dispatch_link')));
 
 } elseif ($_POST['order_view_mode'] == 'InvoiceTemplates') {
-	array_replace($cols, 3, 1, _("Description"));
+	array_substitute($cols, 3, 1, _("Description"));
 	array_append($cols, array( array('insert'=>true, 'fun'=>'invoice_link')));
 
 } else if ($_POST['order_view_mode'] == 'DeliveryTemplates') {
-	array_replace($cols, 3, 1, _("Description"));
+	array_substitute($cols, 3, 1, _("Description"));
 	array_append($cols, array(
 			array('insert'=>true, 'fun'=>'delivery_link'))
 	);
 
-} elseif ($trans_type == 32) {
+} 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 == 30) {
+} elseif ($trans_type == ST_SALESORDER) {
 	 array_append($cols,array(
 			_("Tmpl") => array('insert'=>true, 'fun'=>'tmpl_checkbox'),
 					array('insert'=>true, 'fun'=>'edit_link'),
@@ -362,12 +305,7 @@ if ($_POST['order_view_mode'] == 'OutstandingOnly') {
 $table =& new_db_pager('orders_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked items are overdue."));
 
-if (get_post('SearchOrders')) {
-	$table->set_sql($sql);
-	$table->set_columns($cols);
-}
 $table->width = "80%";
-start_form();
 
 display_db_pager($table);
 submit_center('Update', _("Update"), true, '', null);