X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fsales_orders_view.php;h=2241e1f9dc05a7fe9c157f64d8e738280ec16a9c;hb=443214a800fa66cd1473b48f6fadd1b09144a5d4;hp=ec0091232d96aba87076f866f672dfec6c59d88c;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index ec009123..2241e1f9 100644
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -11,26 +11,24 @@
 ***********************************************************************/
 $path_to_root = "../..";
 
-include($path_to_root . "/includes/db_pager.inc");
-include($path_to_root . "/includes/session.inc");
-include($path_to_root . "/sales/includes/sales_ui.inc");
+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");
 
 $page_security = 'SA_SALESTRANSVIEW';
 
 set_page_security( @$_POST['order_view_mode'],
 	array(	'OutstandingOnly' => 'SA_SALESDELIVERY',
-			'InvoiceTemplates' => 'SA_SALESINVOICE'),
+			'InvoiceTemplates' => 'SA_SALESINVOICE',
+			'DeliveryTemplates' => 'SA_SALESDELIVERY',
+			'PrepaidOrders' => 'SA_SALESINVOICE'),
 	array(	'OutstandingOnly' => 'SA_SALESDELIVERY',
-			'InvoiceTemplates' => 'SA_SALESINVOICE')
+			'InvoiceTemplates' => 'SA_SALESINVOICE',
+			'DeliveryTemplates' => 'SA_SALESDELIVERY',
+			'PrepaidOrders' => 'SA_SALESINVOICE')
 );
 
-$js = "";
-if ($use_popup_windows)
-	$js .= get_js_open_window(900, 600);
-if ($use_date_picker)
-	$js .= get_js_date_picker();
-
 if (get_post('type'))
 	$trans_type = $_POST['type'];
 elseif (isset($_GET['type']) && $_GET['type'] == ST_SALESQUOTE)
@@ -55,6 +53,11 @@ if ($trans_type == ST_SALESORDER)
 		$_POST['order_view_mode'] = 'DeliveryTemplates';
 		$_SESSION['page_title'] = _($help_context = "Select Template for Delivery");
 	}
+	elseif (isset($_GET['PrepaidOrders']) && ($_GET['PrepaidOrders'] == true))
+	{
+		$_POST['order_view_mode'] = 'PrepaidOrders';
+		$_SESSION['page_title'] = _($help_context = "Invoicing Prepayment Orders");
+	}
 	elseif (!isset($_POST['order_view_mode']))
 	{
 		$_POST['order_view_mode'] = false;
@@ -66,30 +69,13 @@ else
 	$_POST['order_view_mode'] = "Quotations";
 	$_SESSION['page_title'] = _($help_context = "Search All Sales Quotations");
 }
-page($_SESSION['page_title'], false, false, "", $js);
-
-if (isset($_GET['selected_customer']))
-{
-	$selected_customer = $_GET['selected_customer'];
-}
-elseif (isset($_POST['selected_customer']))
-{
-	$selected_customer = $_POST['selected_customer'];
-}
-else
-	$selected_customer = -1;
-
-//---------------------------------------------------------------------------------------------
 
-if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") &&
-	($_POST['SelectStockFromList'] != ALL_TEXT))
-{
- 	$selected_stock_item = $_POST['SelectStockFromList'];
-}
-else
-{
-	unset($selected_stock_item);
-}
+$js = "";
+if ($SysPrefs->use_popup_windows)
+	$js .= get_js_open_window(900, 600);
+if (user_use_date_picker())
+	$js .= get_js_date_picker();
+page($_SESSION['page_title'], false, false, "", $js);
 //---------------------------------------------------------------------------------------------
 //	Query format functions
 //
@@ -100,7 +86,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']));
 }
 
@@ -118,19 +104,25 @@ function prt_link($row)
 
 function edit_link($row) 
 {
-	global $trans_type;
-	$modify = ($trans_type == ST_SALESORDER ? "ModifyOrderNumber" : "ModifyQuotationNumber");
-  return pager_link( _("Edit"),
-    "/sales/sales_order_entry.php?$modify=" . $row['order_no'], ICON_EDIT);
+	global $page_nested;
+
+	if (is_prepaid_order_open($row['order_no']))
+		return '';
+
+	return $page_nested ? '' : trans_editor_link($row['trans_type'], $row['order_no']);
 }
 
 function dispatch_link($row)
 {
 	global $trans_type;
+
+	if ($row['ord_payments'] + $row['inv_payments'] < $row['prep_amount'])
+ 		return '';
+
 	if ($trans_type == ST_SALESORDER)
   		return pager_link( _("Dispatch"),
 			"/sales/customer_delivery.php?OrderNumber=" .$row['order_no'], ICON_DOC);
-	else		
+	else
   		return pager_link( _("Sales Order"),
 			"/sales/sales_order_entry.php?OrderNumber=" .$row['order_no'], ICON_DOC);
 }
@@ -159,8 +151,12 @@ function order_link($row)
 
 function tmpl_checkbox($row)
 {
-	global $trans_type;
-	if ($trans_type == ST_SALESQUOTE)
+	global $trans_type, $page_nested;
+
+	if ($trans_type == ST_SALESQUOTE || !check_sales_order_type($row['order_no']))
+		return '';
+
+	if ($page_nested)
 		return '';
 	$name = "chgtpl" .$row['order_no'];
 	$value = $row['type'] ? 1:0;
@@ -171,71 +167,73 @@ function tmpl_checkbox($row)
  	_('Set this order as a template for direct deliveries/invoices'))
 	. hidden('last['.$row['order_no'].']', $value, false);
 }
-//---------------------------------------------------------------------------------------------
-// Update db record if respective checkbox value has changed.
-//
-function change_tpl_flag($id)
-{
-	global	$Ajax;
-	
-  	$sql = "UPDATE ".TB_PREF."sales_orders SET type = !type WHERE order_no=$id";
 
-  	db_query($sql, "Can't change sales order type");
-	$Ajax->activate('orders_tbl');
+function invoice_prep_link($row)
+{
+	// invoicing should be available only for partially allocated orders
+	return 
+		$row['inv_payments'] < $row['total'] ?
+		pager_link($row['ord_payments']  ? _("Prepayment Invoice") : _("Final Invoice"),
+		"/sales/customer_invoice.php?InvoicePrepayments=" .$row['order_no'], ICON_DOC) : '';
 }
 
 $id = find_submit('_chgtpl');
 if ($id != -1)
-	change_tpl_flag($id);
+{
+	sales_order_set_template($id, check_value('chgtpl'.$id));
+	$Ajax->activate('orders_tbl');
+}
 
 if (isset($_POST['Update']) && isset($_POST['last'])) {
 	foreach($_POST['last'] as $id => $value)
 		if ($value != check_value('chgtpl'.$id))
-			change_tpl_flag($id);
+			sales_order_set_template($id, !check_value('chgtpl'.$id));
 }
 
+$show_dates = !in_array($_POST['order_view_mode'], array('OutstandingOnly', 'InvoiceTemplates', 'DeliveryTemplates'));
 //---------------------------------------------------------------------------------------------
 //	Order range form
 //
-if (get_post('_OrderNumber_changed')) // enable/disable selection controls
+if (get_post('_OrderNumber_changed') || get_post('_OrderReference_changed')) // enable/disable selection controls
 {
-	$disable = get_post('OrderNumber') !== '';
+	$disable = get_post('OrderNumber') !== '' || get_post('OrderReference') !== '';
 
-  	if ($_POST['order_view_mode']!='DeliveryTemplates' 
-		&& $_POST['order_view_mode']!='InvoiceTemplates') {
-			$Ajax->addDisable(true, 'OrdersAfterDate', $disable);
-			$Ajax->addDisable(true, 'OrdersToDate', $disable);
+  	if ($show_dates) {
+		$Ajax->addDisable(true, 'OrdersAfterDate', $disable);
+		$Ajax->addDisable(true, 'OrdersToDate', $disable);
 	}
-	$Ajax->addDisable(true, 'StockLocation', $disable);
-	$Ajax->addDisable(true, '_SelectStockFromList_edit', $disable);
-	$Ajax->addDisable(true, 'SelectStockFromList', $disable);
-
-	if ($disable) {
-		$Ajax->addFocus(true, 'OrderNumber');
-	} else
-		$Ajax->addFocus(true, 'OrdersAfterDate');
 
 	$Ajax->activate('orders_tbl');
 }
 
 start_form();
 
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
 start_row();
 ref_cells(_("#:"), 'OrderNumber', '',null, '', true);
-if ($_POST['order_view_mode'] != 'DeliveryTemplates' && $_POST['order_view_mode'] != 'InvoiceTemplates')
+ref_cells(_("Ref"), 'OrderReference', '',null, '', true);
+if ($show_dates)
 {
-  	date_cells(_("from:"), 'OrdersAfterDate', '', null, -30);
+  	date_cells(_("from:"), 'OrdersAfterDate', '', null, -user_transaction_days());
   	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();
+	end_table();
 
-stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
+	start_table(TABLESTYLE_NOBORDER);
+	start_row();
+}
+stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true, true);
 
+if (!$page_nested)
+	customer_list_cells(_("Select a customer: "), 'customer_id', null, true, true);
 if ($trans_type == ST_SALESQUOTE)
 	check_cells(_("Show All:"), 'show_all');
-submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 
+submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 hidden('order_view_mode', $_POST['order_view_mode']);
 hidden('type', $trans_type);
 
@@ -245,82 +243,18 @@ end_table(1);
 //---------------------------------------------------------------------------------------------
 //	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))+freight_cost 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 
-	$number_like = "%".$_POST['OrderNumber'];
-	$sql .= " AND sorder.order_no LIKE ".db_escape($number_like)
- 			." 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=".db_escape($selected_customer);
-
-	if (isset($selected_stock_item))
-		$sql .= " AND line.stk_code=".db_escape($selected_stock_item);
-
-	if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != ALL_TEXT)
-		$sql .= " AND sorder.from_stk_loc = ".db_escape($_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($trans_type, get_post('OrderNumber'), get_post('order_view_mode'),
+	get_post('SelectStockFromList'), get_post('OrdersAfterDate'), get_post('OrdersToDate'), get_post('OrderReference'), get_post('StockLocation'),
+	get_post('customer_id'));
 
 if ($trans_type == ST_SALESORDER)
 	$cols = array(
-		_("Order #") => array('fun'=>'view_link'),
-		_("Ref"),
-		_("Customer"),
+		_("Order #") => array('fun'=>'view_link', 'align'=>'right'),
+		_("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'=>''),
@@ -329,7 +263,7 @@ if ($trans_type == ST_SALESORDER)
 	);
 else
 	$cols = array(
-		_("Quote #") => array('fun'=>'view_link'),
+		_("Quote #") => array('fun'=>'view_link', 'align'=>'right'),
 		_("Ref"),
 		_("Customer"),
 		_("Branch"), 
@@ -342,18 +276,23 @@ else
 		_("Currency") => array('align'=>'center')
 	);
 if ($_POST['order_view_mode'] == 'OutstandingOnly') {
-	//array_substitute($cols, 3, 1, _("Cust Order Ref"));
-	array_append($cols, array(array('insert'=>true, 'fun'=>'dispatch_link')));
+	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, 3, 1, _("Description"));
+	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, 3, 1, _("Description"));
+	array_substitute($cols, 4, 1, _("Description"));
 	array_append($cols, array(
 			array('insert'=>true, 'fun'=>'delivery_link'))
 	);
+} else if ($_POST['order_view_mode'] == 'PrepaidOrders') {
+	array_append($cols, array(
+			array('insert'=>true, 'fun'=>'invoice_prep_link'))
+	);
 
 } elseif ($trans_type == ST_SALESQUOTE) {
 	 array_append($cols,array(
@@ -378,4 +317,3 @@ submit_center('Update', _("Update"), true, '', null);
 
 end_form();
 end_page();
-?>
\ No newline at end of file