X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Finquiry%2Fsales_deliveries_view.php;h=2069703bdccad07e76d9f11bd4dda3f58966f26d;hb=963bc21ea092322d5750d4c0914b5e532e7d2467;hp=4ea1a8241aa8d770f7ef9e9d3a8b8aa123399da2;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/sales/inquiry/sales_deliveries_view.php b/sales/inquiry/sales_deliveries_view.php
index 4ea1a824..2069703b 100644
--- a/sales/inquiry/sales_deliveries_view.php
+++ b/sales/inquiry/sales_deliveries_view.php
@@ -9,8 +9,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 2;
-$path_to_root="../..";
+$page_security = 'SA_SALESINVOICE';
+$path_to_root = "../..";
 include($path_to_root . "/includes/db_pager.inc");
 include($path_to_root . "/includes/session.inc");
 
@@ -26,12 +26,12 @@ if ($use_date_picker)
 if (isset($_GET['OutstandingOnly']) && ($_GET['OutstandingOnly'] == true))
 {
 	$_POST['OutstandingOnly'] = true;
-	page(_("Search Not Invoiced Deliveries"), false, false, "", $js);
+	page(_($help_context = "Search Not Invoiced Deliveries"), false, false, "", $js);
 }
 else
 {
 	$_POST['OutstandingOnly'] = false;
-	page(_("Search All Deliveries"), false, false, "", $js);
+	page(_($help_context = "Search All Deliveries"), false, false, "", $js);
 }
 
 if (isset($_GET['selected_customer']))
@@ -96,7 +96,7 @@ if (get_post('_DeliveryNumber_changed'))
 
 //-----------------------------------------------------------------------------------
 
-start_form(false, false, $_SERVER['PHP_SELF'] ."?OutstandingOnly=" . $_POST['OutstandingOnly'] .SID);
+start_form(false, false, $_SERVER['PHP_SELF'] ."?OutstandingOnly=".$_POST['OutstandingOnly']);
 
 start_table("class='tablestyle_noborder'");
 start_row();
@@ -108,18 +108,17 @@ locations_list_cells(_("Location:"), 'StockLocation', null, true);
 
 stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
 
-submit_cells('SearchOrders', _("Search"),'',_('Select documents'), true);
+submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 
 hidden('OutstandingOnly', $_POST['OutstandingOnly']);
 
 end_row();
 
 end_table();
-end_form();
 //---------------------------------------------------------------------------------------------
 
 if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") &&
-	($_POST['SelectStockFromList'] != reserved_words::get_all()))
+	($_POST['SelectStockFromList'] != ALL_TEXT))
 {
  	$selected_stock_item = $_POST['SelectStockFromList'];
 }
@@ -131,7 +130,7 @@ else
 //---------------------------------------------------------------------------------------------
 function trans_view($trans, $trans_no)
 {
-	return get_customer_trans_view_str(13, $trans['trans_no']);
+	return get_customer_trans_view_str(ST_CUSTDELIVERY, $trans['trans_no']);
 }
 
 function batch_checkbox($row)
@@ -153,7 +152,7 @@ function edit_link($row)
 
 function prt_link($row)
 {
-	return print_document_link($row['trans_no'], _("Print"), true, 13, ICON_PRINT);
+	return print_document_link($row['trans_no'], _("Print"), true, ST_CUSTDELIVERY, ICON_PRINT);
 }
 
 function invoice_link($row)
@@ -169,61 +168,7 @@ function check_overdue($row)
 			$row["Outstanding"]!=0;
 }
 //------------------------------------------------------------------------------------------------
-$sql = "SELECT trans.trans_no,
-		debtor.name,
-		branch.branch_code,
-		branch.br_name,
-		sorder.deliver_to,
-		trans.reference,
-		sorder.customer_ref,
-		trans.tran_date,
-		trans.due_date,
-		(ov_amount+ov_gst+ov_freight+ov_freight_tax) AS DeliveryValue,
-		debtor.curr_code,
-		Sum(line.quantity-line.qty_done) AS Outstanding,
-		Sum(line.qty_done) AS Done
-	FROM "
-	 .TB_PREF."sales_orders as sorder, "
-	 .TB_PREF."debtor_trans as trans, "
-	 .TB_PREF."debtor_trans_details as line, "
-	 .TB_PREF."debtors_master as debtor, "
-	 .TB_PREF."cust_branch as branch
-		WHERE
-		sorder.order_no = trans.order_ AND
-		trans.debtor_no = debtor.debtor_no
-			AND trans.type = 13
-			AND line.debtor_trans_no = trans.trans_no
-			AND line.debtor_trans_type = trans.type
-			AND trans.branch_code = branch.branch_code
-			AND trans.debtor_no = branch.debtor_no ";
-
-if ($_POST['OutstandingOnly'] == true) {
-	 $sql .= " AND line.qty_done < line.quantity ";
-}
-
-//figure out the sql required from the inputs available
-if (isset($_POST['DeliveryNumber']) && $_POST['DeliveryNumber'] != "")
-{
-	$sql .= " AND trans.trans_no LIKE '%". $_POST['DeliveryNumber'] ."'";
- 	$sql .= " GROUP BY trans.trans_no";
-}
-else
-{
-	$sql .= " AND trans.tran_date >= '".date2sql($_POST['DeliveryAfterDate'])."'";
-	$sql .= " AND trans.tran_date <= '".date2sql($_POST['DeliveryToDate'])."'";
-
-	if ($selected_customer != -1)
-		$sql .= " AND trans.debtor_no='" . $selected_customer . "' ";
-
-	if (isset($selected_stock_item))
-		$sql .= " AND line.stock_id='". $selected_stock_item ."' ";
-
-	if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != reserved_words::get_all())
-		$sql .= " AND sorder.from_stk_loc = '". $_POST['StockLocation'] . "' ";
-
-	$sql .= " GROUP BY trans.trans_no ";
-
-} //end no delivery number selected
+$sql = get_sql_for_sales_deliveries_view($selected_customer, $selected_stock_id);
 
 $cols = array(
 		_("Delivery #") => array('fun'=>'trans_view'), 
@@ -255,14 +200,8 @@ if (isset($_SESSION['Batch']))
 $table =& new_db_pager('deliveries_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 = "92%";
 
-start_form();
-
 display_db_pager($table);
 
 end_form();