X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fallocations%2Fcustomer_allocation_main.php;h=ef40147e2a8490753961653b0d1d4e1ab9e15b3b;hb=c356acfd88575bc518efdb9fb77e0a6b6c645eec;hp=5f5482f9fe6565b749c0650a972bdd9e11253c7c;hpb=c4424cf66138c50851e9f73ee2f30b6b32e6d182;p=fa-stable.git

diff --git a/sales/allocations/customer_allocation_main.php b/sales/allocations/customer_allocation_main.php
index 5f5482f9..ef40147e 100644
--- a/sales/allocations/customer_allocation_main.php
+++ b/sales/allocations/customer_allocation_main.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>.
 ***********************************************************************/
-$path_to_root="../..";
-$page_security = 3;
+$page_security = 'SA_SALESALLOC';
+$path_to_root = "../..";
 include($path_to_root . "/includes/db_pager.inc");
 include_once($path_to_root . "/includes/session.inc");
 
@@ -19,37 +19,25 @@ include_once($path_to_root . "/sales/includes/sales_db.inc");
 $js = "";
 if ($use_popup_windows)
 	$js .= get_js_open_window(900, 500);
-page(_("Customer Allocations"), false, false, "", $js);
+page(_($help_context = "Customer Allocations"), false, false, "", $js);
 
 //--------------------------------------------------------------------------------
-if ($ret = context_restore()) {
-	if(isset($ret['customer_id']))
-		$_POST['customer_id'] = $ret['customer_id'];
-}
-if (isset($_POST['_customer_id_editor'])) {
-	context_call($path_to_root.'/sales/manage/customers.php?debtor_no='.$_POST['customer_id'] );
-}
 
 start_form();
 	/* show all outstanding receipts and credits to be allocated */
-	/*Clear any previous allocation records */
-	if (isset($_SESSION['alloc']))
-	{
-		unset($_SESSION['alloc']->allocs);
-		unset($_SESSION['alloc']);
-	}
-    if (!isset($_POST['customer_id']))
+
+	if (!isset($_POST['customer_id']))
     	$_POST['customer_id'] = get_global_customer();
 
     echo "<center>" . _("Select a customer: ") . "&nbsp;&nbsp;";
-	customer_list('customer_id', $_POST['customer_id'], true, true);
+	echo customer_list('customer_id', $_POST['customer_id'], true, true);
     echo "<br>";
     check(_("Show Settled Items:"), 'ShowSettled', null, true);
 	echo "</center><br><br>";
 
 	set_global_customer($_POST['customer_id']);
 
-	if (isset($_POST['customer_id']) && ($_POST['customer_id'] == reserved_words::get_all()))
+	if (isset($_POST['customer_id']) && ($_POST['customer_id'] == ALL_TEXT))
 	{
 		unset($_POST['customer_id']);
 	}
@@ -71,7 +59,9 @@ start_form();
 //--------------------------------------------------------------------------------
 function systype_name($dummy, $type)
 {
-	return systypes::name($type);
+	global $systypes_array;
+
+	return $systypes_array[$type];
 }
 
 function trans_view($trans)
@@ -103,7 +93,7 @@ $cols = array(
 	_("Transaction Type") => array('fun'=>'systype_name'),
 	_("#") => array('fun'=>'trans_view'),
 	_("Reference"), 
-	_("Date") => array('type'=>'date', 'ord'=>'asc'),
+	_("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'),
 	_("Customer") => array('ord'=>''),
 	_("Currency") => array('align'=>'center'),
 	_("Total") => 'amount', 
@@ -119,10 +109,7 @@ if (isset($_POST['customer_id'])) {
 $table =& new_db_pager('alloc_tbl', $sql, $cols);
 $table->set_marker('check_settled', _("Marked items are settled."), 'settledbg', 'settledfg');
 
-if (get_post('_ShowSettled_update') || get_post('_customer_id_update')) {
-	$table->set_sql($sql);
-	$table->set_columns($cols);
-}
+$table->width = "75%";
 
 display_db_pager($table);
 end_form();