X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fallocation_cart.inc;h=22bb1e1caef6596b27251254f52b4bd789c2fdf5;hb=159af00183e3732314b508729b06eae88721954c;hp=954209a6b0ff64dc0eb354ff9ae344045b027e4a;hpb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;p=fa-stable.git

diff --git a/includes/ui/allocation_cart.inc b/includes/ui/allocation_cart.inc
index 954209a6..22bb1e1c 100644
--- a/includes/ui/allocation_cart.inc
+++ b/includes/ui/allocation_cart.inc
@@ -30,7 +30,7 @@ class allocation
 
 	var $allocs; /*array of transactions allocated to */
 
-	function allocation($type, $trans_no, $person_id = null, $person_type_id=null)
+	function __construct($type, $trans_no, $person_id = null, $person_type_id=null)
 	{
 		$this->allocs = array();
 		
@@ -254,7 +254,7 @@ class allocation_item
 	
 	var $current_allocated;
 	
-	function allocation_item ($type, $type_no, $date_, $due_date, $amount, 
+	function __construct($type, $type_no, $date_, $due_date, $amount, 
 		$amount_allocated, $current_allocated, $ref)
 	{
 
@@ -278,15 +278,14 @@ function show_allocatable($show_totals) {
 
 	global $systypes_array;
 	
-    $k = $counter = $total_allocated = 0;
+    $k = $total_allocated = 0;
 
 	$cart = $_SESSION['alloc'];
 	$supp_ref = in_array($cart->type, array(ST_SUPPCREDIT, ST_SUPPAYMENT, ST_BANKPAYMENT));
 
 	if (count($cart->allocs)) 
 	{
-//		if ($cart->currency != $cart->person_curr)
-			display_heading(sprintf(_("Allocated amounts in %s:"), $cart->person_curr));
+		display_heading(sprintf(_("Allocated amounts in %s:"), $cart->person_curr));
 		start_table(TABLESTYLE, "width='60%'");
    		$th = array(_("Transaction Type"), _("#"), $supp_ref ? _("Supplier Ref"): _("Ref"), _("Date"), _("Due Date"), _("Amount"),
    			_("Other Allocations"), _("Left to Allocate"), _("This Allocation"),'','');
@@ -299,7 +298,7 @@ function show_allocatable($show_totals) {
 		    {
 				alt_table_row_color($k);
     			label_cell($systypes_array[$alloc_item->type]);
-	   			label_cell(get_trans_view_str($alloc_item->type, $alloc_item->type_no));
+	   			label_cell(get_trans_view_str($alloc_item->type, $alloc_item->type_no), "nowrap align='right'");
 		   		label_cell($alloc_item->ref);
     			label_cell($alloc_item->date_, "align=right");
     			label_cell($alloc_item->due_date, "align=right");
@@ -311,9 +310,9 @@ function show_allocatable($show_totals) {
 	    		$un_allocated = round((abs($alloc_item->amount) - $alloc_item->amount_allocated), 6);
 	    		amount_cell($un_allocated, false,'', 'maxval'.$id);
     			amount_cells(null, "amount" . $id);//, input_num('amount' . $id));
-				label_cell("<a href='#' name=Alloc$id onclick='allocate_all(this.name.substr(5));return true;'>"
+				label_cell("<a href='javascript:void(0)' name=Alloc$id onclick='allocate_all(this.name.substr(5));return true;'>"
 					 . _("All") . "</a>");
-				label_cell("<a href='#' name=DeAll$id onclick='allocate_none(this.name.substr(5));return true;'>"
+				label_cell("<a href='javascript:void(0)' name=DeAll$id onclick='allocate_none(this.name.substr(5));return true;'>"
 					 . _("None") . "</a>".hidden("un_allocated" . $id, 
 					 price_format($un_allocated), false));
 				end_row();
@@ -324,15 +323,7 @@ function show_allocatable($show_totals) {
 		if ($show_totals) {
     	   	label_row(_("Total Allocated"), price_format($total_allocated),
 	    		"colspan=8 align=right", "align=right id='total_allocated'", 3);
-/*
-			$amount = $_SESSION['alloc']->amount;
 
-			if ($_SESSION['alloc']->type == ST_SUPPCREDIT
-				|| $_SESSION['alloc']->type == ST_SUPPAYMENT
-				||  $_SESSION['alloc']->type == ST_BANKPAYMENT || 
-				($_SESSION['alloc']->type == ST_JOURNAL && $_SESSION['alloc']->person_type == PT_SUPPLIER))
-				$amount = -$amount;
-*/
 			$amount = abs($cart->amount);
 
 			if (floatcmp($amount, $total_allocated) < 0)
@@ -380,17 +371,31 @@ function check_allocations()
 			return false;
 		 }
 
-		 $_SESSION['alloc']->allocs[$counter]->current_allocated = input_num('amount' . $counter);
+		if ($_SESSION['alloc']->person_type == PT_CUSTOMER) {
+			if ($_SESSION['alloc']->allocs[$counter]->type == ST_SALESORDER)
+				$trans = get_sales_order_header($_SESSION['alloc']->allocs[$counter]->type_no, $_SESSION['alloc']->allocs[$counter]->type);
+			else
+				$trans = get_customer_trans($_SESSION['alloc']->allocs[$counter]->type_no, $_SESSION['alloc']->allocs[$counter]->type);
+
+			if ($trans['debtor_no'] != $_SESSION['alloc']->person_id) {
+				display_error(_("Allocated transaction allocated is not related to company selected."));
+				set_focus('amount'.$counter);
+				return false;
+			}
+		} elseif ($_SESSION['alloc']->person_type == PT_SUPPLIER) {
+			$trans = get_supp_trans($_SESSION['alloc']->allocs[$counter]->type_no, $_SESSION['alloc']->allocs[$counter]->type);
+			if ($trans['supplier_id'] != $_SESSION['alloc']->person_id) {
+				display_error(_("Allocated transaction allocated is not related to company selected."));
+				set_focus('amount'.$counter);
+				return false;
+			}
+		}
+
+		$_SESSION['alloc']->allocs[$counter]->current_allocated = input_num('amount' . $counter);
 
-		 $total_allocated += input_num('amount' . $counter);
+		$total_allocated += input_num('amount' . $counter);
 	}
-/*
-	$amount = $_SESSION['alloc']->amount;
 
-	if (in_array($_SESSION['alloc']->type, array(ST_BANKPAYMENT, ST_SUPPCREDIT, ST_SUPPAYMENT)) || 
-		($_SESSION['alloc']->type==ST_JOURNAL && $_SESSION['alloc']->person_type == PT_SUPPLIER))
-		$amount = -$amount;
-*/
 	$amount = abs($_SESSION['alloc']->amount);
 
 	if ($total_allocated - ($amount + input_num('discount'))  > $SysPrefs->allocation_settled_allowance())