X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fallocations%2Fcustomer_allocate.php;h=97ece6a3c4997f6293334fe63e121eac9c447aad;hb=1d8bbcbf6bf6c663d83283be329758a936f863fa;hp=6b0357e0db267db9454cce0c4695a974cb072f01;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php index 6b0357e0..97ece6a3 100644 --- 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,28 +36,9 @@ 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) @@ -96,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'); }