Merged changes from main trunk up to 2.2.3

[fa-stable.git] / sales / allocations / customer_allocate.php

diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php
index 411ee7bd7cffecad91b89eb5b0745e2fe8255d83..97ece6a3c4997f6293334fe63e121eac9c447aad 100644 (file)
--- a/sales/allocations/customer_allocate.php
+++ b/sales/allocations/customer_allocate.php
@@ -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');
 }