X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fallocations%2Fcustomer_allocate.php;h=97ece6a3c4997f6293334fe63e121eac9c447aad;hb=6f354d9b19615a82d948e0f6e5ef003cd1859c31;hp=14f87fb8cf6811ec2bb60c3c635d85c294336aa2;hpb=dca46563d3e8b7546e7095b7d96b40d9838c4c75;p=fa-stable.git

diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php
index 14f87fb8..97ece6a3 100644
--- a/sales/allocations/customer_allocate.php
+++ b/sales/allocations/customer_allocate.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>.
 ***********************************************************************/
-$path_to_root="../..";
-$page_security = 3;
+$page_security = 'SA_SALESALLOC';
+$path_to_root = "../..";
 
 include($path_to_root . "/includes/ui/allocation_cart.inc");
 include_once($path_to_root . "/includes/session.inc");
@@ -25,7 +25,7 @@ if ($use_popup_windows)
 
 add_js_file('allocate.js');
 
-page(_("Allocate Customer Payment or Credit Note"), false, false, "", $js);
+page(_($help_context = "Allocate Customer Payment or Credit Note"), false, false, "", $js);
 
 //--------------------------------------------------------------------------------
 
@@ -36,34 +36,17 @@ function clear_allocations()
 		unset($_SESSION['alloc']->allocs);
 		unset($_SESSION['alloc']);
 	}
-	session_register('alloc');
+	//session_register('alloc');
 }
 
-
-//--------------------------------------------------------------------------------
-
-if (isset($_POST['Process']))
-{
-	if (check_allocations())
-	{
-		$_SESSION['alloc']->write();
-		clear_allocations();
-		$_POST['Cancel'] = 1;
-	}
-}
-//--------------------------------------------------------------------------------
-
-if (isset($_POST['Cancel']))
-{
-	clear_allocations();
-	meta_forward($path_to_root . "/sales/allocations/customer_allocation_main.php");
-}
 //--------------------------------------------------------------------------------
 
 function edit_allocations_for_transaction($type, $trans_no)
 {
+	global $systypes_array;
 
-    display_heading(sprintf(_("Allocation of %s # %d"), systypes::name($_SESSION['alloc']->type),$_SESSION['alloc']->trans_no));
+    display_heading(sprintf(_("Allocation of %s # %d"), $systypes_array[$_SESSION['alloc']->type],
+    	$_SESSION['alloc']->trans_no));
 
     display_heading($_SESSION['alloc']->person_name);
 
@@ -94,17 +77,34 @@ function edit_allocations_for_transaction($type, $trans_no)
 
 //--------------------------------------------------------------------------------
 
+if (isset($_POST['Process']))
+{
+	if (check_allocations())
+	{
+		$_SESSION['alloc']->write();
+		clear_allocations();
+		$_POST['Cancel'] = 1;
+	}
+}
+//--------------------------------------------------------------------------------
+
+if (isset($_POST['Cancel']))
+{
+	clear_allocations();
+	meta_forward($path_to_root . "/sales/allocations/customer_allocation_main.php");
+}
+
+//--------------------------------------------------------------------------------
+
 if (isset($_GET['trans_no']) && isset($_GET['trans_type']))
 {
 	clear_allocations();
 	$_SESSION['alloc'] = new allocation($_GET['trans_type'], $_GET['trans_no']);
 }
+
 if(get_post('UpdateDisplay'))
 {
-	$trans_no = $_SESSION['alloc']->trans_no;
-	$type = $_SESSION['alloc']->type;
-	clear_allocations();
-	get_allocations_for_transaction($type, $trans_no);
+	$_SESSION['alloc']->read();
 	$Ajax->activate('alloc_tbl');
 }