X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fallocations%2Fcustomer_allocate.php;h=d1401e3ee758ec60a548c0c6d1b95fb05a599015;hb=deb258224a97804610393ef563d45b5af5c5243a;hp=f8b96d5ca14872965092358f82241cd4818e89f1;hpb=0ad7b92c6cf2e4e65ca0fa94ba31f30f7b292ba8;p=fa-stable.git diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php index f8b96d5c..d1401e3e 100644 --- a/sales/allocations/customer_allocate.php +++ b/sales/allocations/customer_allocate.php @@ -5,6 +5,7 @@ $page_security = 3; include($path_to_root . "/includes/ui/allocation_cart.inc"); include_once($path_to_root . "/includes/session.inc"); +include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/sales/includes/sales_ui.inc"); include_once($path_to_root . "/sales/includes/sales_db.inc"); @@ -12,7 +13,7 @@ $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -$js .= get_js_allocate(); +add_js_allocate(); page(_("Allocate Customer Payment or Credit Note"), false, false, "", $js); @@ -40,12 +41,14 @@ function check_data() if (!check_num('amount' . $counter)) { display_error(_("The entry for one or more amounts is invalid.")); + set_focus('amount'.$counter); return false; } if (!check_num('amount' . $counter,0)) { display_error(_("The entry for an amount to allocate was negative. A positive allocation amount is expected.")); + set_focus('amount'.$counter); return false; } @@ -225,7 +228,7 @@ function edit_allocations_for_transaction($type, $trans_no) } label_row(_("Total Allocated"), price_format($total_allocated), - "colspan=6 align=right", "nowrap align=right"); + "colspan=6 align=right", "nowrap align=right id='total_allocated'"); if ($_SESSION['alloc']->amount - $total_allocated < 0) { $font1 = ""; @@ -236,11 +239,11 @@ function edit_allocations_for_transaction($type, $trans_no) $left_to_allocate = $_SESSION['alloc']->amount - $total_allocated; $left_to_allocate = price_format($left_to_allocate); label_row(_("Left to Allocate"), $font1 . $left_to_allocate . $font2, - "colspan=6 align=right ", "nowrap align=right"); + "colspan=6 align=right ", "nowrap align=right id='left_to_allocate'"); end_table(1); hidden('TotalNumberOfAllocs', $counter); - hidden('left_to_allocate', $left_to_allocate); +// hidden('left_to_allocate', $left_to_allocate); submit_center_first('UpdateDisplay', _("Update")); submit('Process', _("Process")); }