X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Finquiry%2Fsales_deliveries_view.php;h=e65602bf557f6a2fba83423691878fe92ad2f21d;hb=d2cc0860eccf02eaefcd90731ac3af141a841529;hp=7362010feb63790ffe008f450410ae063160c7c3;hpb=348062667e6a96e9849bf25de0f2a426b4f0b9c6;p=fa-stable.git

diff --git a/sales/inquiry/sales_deliveries_view.php b/sales/inquiry/sales_deliveries_view.php
index 7362010f..e65602bf 100644
--- a/sales/inquiry/sales_deliveries_view.php
+++ b/sales/inquiry/sales_deliveries_view.php
@@ -1,7 +1,16 @@
 <?php
-
-$page_security = 2;
-$path_to_root="../..";
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+$page_security = 'SA_SALESINVOICE';
+$path_to_root = "../..";
 include($path_to_root . "/includes/db_pager.inc");
 include($path_to_root . "/includes/session.inc");
 
@@ -17,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']))
@@ -87,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();
@@ -99,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();
-
 //---------------------------------------------------------------------------------------------
 
 if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") &&
-	($_POST['SelectStockFromList'] != reserved_words::get_all()))
+	($_POST['SelectStockFromList'] != ALL_TEXT))
 {
  	$selected_stock_item = $_POST['SelectStockFromList'];
 }
@@ -122,14 +130,14 @@ 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)
 {
 	$name = "Sel_" .$row['trans_no'];
 	return $row['Done'] ? '' :
-		"<center><input type='checkbox' name='$name' value='1' ></center>"
+		"<input type='checkbox' name='$name' value='1' >"
 // add also trans_no => branch code for checking after 'Batch' submit
 	 ."<input name='Sel_[".$row['trans_no']."]' type='hidden' value='"
 	 .$row['branch_code']."'>\n";
@@ -139,19 +147,19 @@ function edit_link($row)
 {
 	return $row["Outstanding"]==0 ? '' :
 		pager_link(_('Edit'), "/sales/customer_delivery.php?ModifyDelivery="
-			.$row['trans_no']);
+			.$row['trans_no'], ICON_EDIT);
 }
 
 function prt_link($row)
 {
-	return print_document_link($row['trans_no'], _("Print"), true, 13);
+	return print_document_link($row['trans_no'], _("Print"), true, ST_CUSTDELIVERY, ICON_PRINT);
 }
 
 function invoice_link($row)
 {
 	return $row["Outstanding"]==0 ? '' :
 		pager_link(_('Invoice'), "/sales/customer_invoice.php?DeliveryNumber=" 
-			.$row['trans_no']);
+			.$row['trans_no'], ICON_DOC);
 }
 
 function check_overdue($row)
@@ -182,7 +190,7 @@ $sql = "SELECT trans.trans_no,
 		WHERE
 		sorder.order_no = trans.order_ AND
 		trans.debtor_no = debtor.debtor_no
-			AND trans.type = 13
+			AND trans.type = ".ST_CUSTDELIVERY."
 			AND line.debtor_trans_no = trans.trans_no
 			AND line.debtor_trans_type = trans.type
 			AND trans.branch_code = branch.branch_code
@@ -195,7 +203,8 @@ if ($_POST['OutstandingOnly'] == true) {
 //figure out the sql required from the inputs available
 if (isset($_POST['DeliveryNumber']) && $_POST['DeliveryNumber'] != "")
 {
-	$sql .= " AND trans.trans_no LIKE '%". $_POST['DeliveryNumber'] ."'";
+	$delivery = "%".$_POST['DeliveryNumber'];
+	$sql .= " AND trans.trans_no LIKE ".db_escape($delivery);
  	$sql .= " GROUP BY trans.trans_no";
 }
 else
@@ -204,35 +213,35 @@ else
 	$sql .= " AND trans.tran_date <= '".date2sql($_POST['DeliveryToDate'])."'";
 
 	if ($selected_customer != -1)
-		$sql .= " AND trans.debtor_no='" . $selected_customer . "' ";
+		$sql .= " AND trans.debtor_no=".db_escape($selected_customer)." ";
 
 	if (isset($selected_stock_item))
-		$sql .= " AND line.stock_id='". $selected_stock_item ."' ";
+		$sql .= " AND line.stock_id=".db_escape($selected_stock_item)." ";
 
-	if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != reserved_words::get_all())
-		$sql .= " AND sorder.from_stk_loc = '". $_POST['StockLocation'] . "' ";
+	if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != ALL_TEXT)
+		$sql .= " AND sorder.from_stk_loc = ".db_escape($_POST['StockLocation'])." ";
 
 	$sql .= " GROUP BY trans.trans_no ";
 
 } //end no delivery number selected
 
 $cols = array(
-		_("Delivery #") => array('type'=>'spec', 'fun'=>'trans_view'), 
+		_("Delivery #") => array('fun'=>'trans_view'), 
 		_("Customer"), 
 		'branch_code' => 'skip',
-		_("Branch"), 
+		_("Branch") => array('ord'=>''), 
 		_("Contact"),
 		_("Reference"), 
 		_("Cust Ref"), 
-		_("Delivery Date") => 'date',
+		_("Delivery Date") => array('type'=>'date', 'ord'=>''),
 		_("Due By") => 'date', 
-		_("Delivery Total") => 'amount', 
-		_("Currency"),
-		submit('BatchInvoice','Batch Inv', false) 
-			=> array('type'=>'insert', 'fun'=>'batch_checkbox'),
-		array('type'=>'insert', 'fun'=>'edit_link'),
-		array('type'=>'insert', 'fun'=>'invoice_link'),
-		array('type'=>'insert', 'fun'=>'prt_link')
+		_("Delivery Total") => array('type'=>'amount', 'ord'=>''),
+		_("Currency") => array('align'=>'center'),
+		submit('BatchInvoice',_("Batch"), false, _("Batch Invoicing")) 
+			=> array('insert'=>true, 'fun'=>'batch_checkbox', 'align'=>'center'),
+		array('insert'=>true, 'fun'=>'edit_link'),
+		array('insert'=>true, 'fun'=>'invoice_link'),
+		array('insert'=>true, 'fun'=>'prt_link')
 );
 
 //-----------------------------------------------------------------------------------
@@ -243,25 +252,14 @@ if (isset($_SESSION['Batch']))
     unset($_SESSION['Batch']);
 }
 
-/*
-dla ka¿dego rz±dku
- $_SESSION['Batch'][] = array('trans'=>$myrow["trans_no"],
-    'cust'=>$myrow["name"],'branch'=>$myrow["br_name"] );
-*/
-
 $table =& new_db_pager('deliveries_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked items are overdue."));
 
+//$table->width = "92%";
 
-if(get_post('SearchOrders')) 
-{
-	$table->set_sql($sql);
-	$Ajax->activate('doc_tbl');
-}
+display_db_pager($table);
 
-	start_form();
-	display_db_pager($table);
-	end_form();
+end_form();
 end_page();
 
 ?>