X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fallocations%2Fcustomer_allocate.php;h=a37847201cd270783c4b7b50f67789ab306577a5;hb=72c9e5b8a03797af04324f115658ef24d52fac67;hp=a95887f51c448117894edae0714fac741721f52e;hpb=492d633dd684e8308c7aafd5922ec52cbfc60498;p=fa-stable.git

diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php
index a95887f5..a3784720 100644
--- a/sales/allocations/customer_allocate.php
+++ b/sales/allocations/customer_allocate.php
@@ -168,6 +168,7 @@ function get_allocations_for_transaction($type, $trans_no)
 			sql2date($myrow["tran_date"]), sql2date($myrow["due_date"]),
 			$myrow["Total"], $myrow["alloc"] - $myrow["amt"], $myrow["amt"]);
 	}
+
 }
 
 //--------------------------------------------------------------------------------
@@ -176,8 +177,6 @@ function edit_allocations_for_transaction($type, $trans_no)
 {
 	global $table_style;
 
-	start_form(false, true);
-
     display_heading(sprintf(_("Allocation of %s # %d"), systypes::name($_SESSION['alloc']->type),$_SESSION['alloc']->trans_no));
 
     display_heading($_SESSION['alloc']->person_name);
@@ -187,6 +186,8 @@ function edit_allocations_for_transaction($type, $trans_no)
 
     echo "<br>";
 
+	start_form(false, true);
+
     if (count($_SESSION['alloc']->allocs) > 0)
     {
 		start_table($table_style);
@@ -200,7 +201,7 @@ function edit_allocations_for_transaction($type, $trans_no)
 
         foreach ($_SESSION['alloc']->allocs as $allocn_item)
         {
-    		alt_table_row_color($k);
+			alt_table_row_color($k);
 
     	    label_cell(systypes::name($allocn_item->type));
     		label_cell(get_trans_view_str($allocn_item->type, $allocn_item->type_no));
@@ -214,13 +215,15 @@ function edit_allocations_for_transaction($type, $trans_no)
     	    amount_cells(null, 'amount' . $counter, $_POST['amount' . $counter]);
 
     		$un_allocated = round($allocn_item->amount - $allocn_item->amount_allocated, 6);
-    		hidden("un_allocated" . $counter, $un_allocated);
+    		//hidden("un_allocated" . $counter, $un_allocated);
     		amount_cell($un_allocated);
 
-			label_cell("<a href='#' name=Alloc$counter onclick='allocate_all(this.name.substr(5));return true;'>"
+			label_cell("<a href='#' name='Alloc$counter' onclick='allocate_all(this.name.substr(5));return true;'>"
 					 . _("All") . "</a>");
-			label_cell("<a href='#' name=DeAll$counter onclick='allocate_none(this.name.substr(5));return true;'>"
-					 . _("None") . "</a>");
+			//label_cell("<a href='#' name='DeAll$counter' onclick='allocate_none(this.name.substr(5));return true;'>"
+			//		 . _("None") . "</a>");
+			label_cell("<a href='#' name='DeAll$counter' onclick='allocate_none(this.name.substr(5));return true;'>"
+					 . _("None") . "</a>".hidden("un_allocated" . $counter, $un_allocated, false));
 			end_row();
 
     	    $total_allocated += input_num('amount' . $counter);
@@ -246,14 +249,14 @@ function edit_allocations_for_transaction($type, $trans_no)
 //		hidden('left_to_allocate', $left_to_allocate);
        	submit_center_first('UpdateDisplay', _("Update"));
        	submit('Process', _("Process"));
+   		submit_center_last('Cancel', _("Back to Allocations"));
 	}
 	else
 	{
     	display_note(_("There are no unsettled transactions to allocate."), 0, 1);
+   		submit_center('Cancel', _("Back to Allocations"));
     }
 
-   	submit_center_last('Cancel', _("Back to Allocations"));
-
   	end_form();
 }