X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Finquiry%2Fsupplier_allocation_inquiry.php;h=98e7e4d1ff9225a6392d730b115a43153277dfe3;hb=ddadb47f2620ce6902ad4694ce6512568862ba05;hp=f03205467b6c99d5807a6d3d02e533e13aa75f5e;hpb=b956923926de6b7eecf57510cf86857354cac1b3;p=fa-stable.git

diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php
index f0320546..98e7e4d1 100644
--- a/purchasing/inquiry/supplier_allocation_inquiry.php
+++ b/purchasing/inquiry/supplier_allocation_inquiry.php
@@ -1,16 +1,16 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	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/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security=2;
-$path_to_root="../..";
+$page_security = 'SA_SUPPLIERALLOC';
+$path_to_root = "../..";
 include($path_to_root . "/includes/db_pager.inc");
 include($path_to_root . "/includes/session.inc");
 
@@ -37,7 +37,7 @@ if (isset($_GET['ToDate']))
 
 //------------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 if (!isset($_POST['supplier_id']))
 	$_POST['supplier_id'] = get_global_supplier();
@@ -54,7 +54,7 @@ supp_allocations_list_cell("filterType", null);
 
 check_cells(_("show settled:"), 'showSettled', null);
 
-submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true);
+submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default');
 
 set_global_supplier($_POST['supplier_id']);
 
@@ -70,7 +70,9 @@ function check_overdue($row)
 
 function systype_name($dummy, $type)
 {
-	return systypes::name($type);
+	global $systypes_array;
+	
+	return $systypes_array[$type];
 }
 
 function view_link($trans)
@@ -80,13 +82,13 @@ function view_link($trans)
 
 function due_date($row)
 {
-	return (($row["type"] == 20) || ($row["type"]== 21))
+	return (($row["type"] == ST_SUPPINVOICE) || ($row["type"]== ST_SUPPCREDIT))
 		? $row["due_date"] : "";
 }
 
 function fmt_balance($row)
 {
-	$value = ($row["type"] == 1 || $row["type"] == 21 || $row["type"] == 22)
+	$value = ($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT)
 		? -$row["TotalAmount"] - $row["Allocated"]
 		: $row["TotalAmount"] - $row["Allocated"];
 	return $value;
@@ -99,7 +101,7 @@ function alloc_link($row)
 		"/purchasing/allocations/supplier_allocate.php?trans_no=" .
 			$row["trans_no"]. "&trans_type=" . $row["type"], ICON_MONEY );
 
-	return (($row["type"] == 1 || $row["type"] == 21 || $row["type"] == 22) 
+	return (($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT) 
 		&& (-$row["TotalAmount"] - $row["Allocated"]) > 0)
 		? $link : '';
 }
@@ -133,28 +135,28 @@ function fmt_credit($row)
 		supplier.curr_code, 
     	(trans.ov_amount + trans.ov_gst  + trans.ov_discount) AS TotalAmount, 
 		trans.alloc AS Allocated,
-		((trans.type = 20 OR trans.type = 21) AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue
+		((trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_SUPPCREDIT.") AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue
     	FROM "
 			.TB_PREF."supp_trans as trans, "
 			.TB_PREF."suppliers as supplier
     	WHERE supplier.supplier_id = trans.supplier_id
      	AND trans.tran_date >= '$date_after'
     	AND trans.tran_date <= '$date_to'";
-   	if ($_POST['supplier_id'] != reserved_words::get_all())
+   	if ($_POST['supplier_id'] != ALL_TEXT)
    		$sql .= " AND trans.supplier_id = '" . $_POST['supplier_id'] . "'";
-   	if (isset($_POST['filterType']) && $_POST['filterType'] != reserved_words::get_all())
+   	if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT)
    	{
    		if (($_POST['filterType'] == '1') || ($_POST['filterType'] == '2'))
    		{
-   			$sql .= " AND trans.type = 20 ";
+   			$sql .= " AND trans.type = ".ST_SUPPINVOICE." ";
    		}
    		elseif ($_POST['filterType'] == '3')
    		{
-			$sql .= " AND trans.type = 22 ";
+			$sql .= " AND trans.type = ".ST_SUPPAYMENT." ";
    		}
    		elseif (($_POST['filterType'] == '4') || ($_POST['filterType'] == '5'))
    		{
-			$sql .= " AND trans.type = 21 ";
+			$sql .= " AND trans.type = ".ST_SUPPCREDIT." ";
    		}
 
    		if (($_POST['filterType'] == '2') || ($_POST['filterType'] == '5'))
@@ -171,11 +173,11 @@ function fmt_credit($row)
 
 $cols = array(
 	_("Type") => array('fun'=>'systype_name'),
-	_("Number") => array('fun'=>'view_link', 'ord'=>''),
+	_("#") => array('fun'=>'view_link', 'ord'=>''),
 	_("Reference"), 
 	_("Supplier") => array('ord'=>''), 
 	_("Supp Reference"),
-	_("Date") => array('type'=>'date', 'ord'=>'asc'),
+	_("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'),
 	_("Due Date") => array('fun'=>'due_date'),
 	_("Currency") => array('align'=>'center'),
 	_("Debit") => array('align'=>'right', 'fun'=>'fmt_debit'), 
@@ -185,7 +187,7 @@ $cols = array(
 	array('insert'=>true, 'fun'=>'alloc_link')
 	);
 
-if ($_POST['supplier_id'] != reserved_words::get_all()) {
+if ($_POST['supplier_id'] != ALL_TEXT) {
 	$cols[_("Supplier")] = 'skip';
 	$cols[_("Currency")] = 'skip';
 }
@@ -198,6 +200,7 @@ if (get_post('RefreshInquiry')) {
 	$table->set_sql($sql);
 	$table->set_columns($cols);
 }
+$table->width = "90%";
 start_form();
 
 display_db_pager($table);