X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fallocation_cart.inc;h=968bae42a7131e848976f011359ea7d9883527cc;hb=75564761d1429129282bd04ab00575c5e80fe4c2;hp=617c41af6207d5ee068b8d34511c097722392ef3;hpb=702ac617ce181b2510ed67f3d202e9f8844ac840;p=fa-stable.git

diff --git a/includes/ui/allocation_cart.inc b/includes/ui/allocation_cart.inc
index 617c41af..968bae42 100644
--- a/includes/ui/allocation_cart.inc
+++ b/includes/ui/allocation_cart.inc
@@ -134,7 +134,7 @@ class allocation
 				$this->amount = $trans["Total"];
 			}
 		}
-	/* Now populate the array of possible (and previous actual) allocations 
+		/* Now populate the array of possible (and previous actual) allocations 
 		for this customer/supplier. First get the transactions that have 
 		outstanding balances ie Total-alloc >0 */
 
@@ -158,9 +158,9 @@ class allocation
 		}
 		if ($this->trans_no == 0) return; // this is new payment
 
-	/* Now get trans that might have previously been allocated to by this trans
-	NB existing entries where still some of the trans outstanding entered from
-	above logic will be overwritten with the prev alloc detail below */
+		/* Now get trans that might have previously been allocated to by this trans
+		NB existing entries where still some of the trans outstanding entered from
+		above logic will be overwritten with the prev alloc detail below */
 
 		if ($this->person_type==PT_SUPPLIER)
 			$trans_items = get_allocatable_to_supp_transactions($this->person_id, 
@@ -169,14 +169,35 @@ class allocation
 		 	$trans_items = get_allocatable_to_cust_transactions($this->person_id, 
 				$this->trans_no, $this->type);
 
+		$amount = $this->amount;
 		while ($myrow = db_fetch($trans_items))
 		{
+			$amount -= $myrow["Total"];
 			$this->add_or_update_item ($myrow["type"], $myrow["trans_no"],
 				sql2date($myrow["tran_date"]),
 				sql2date($myrow["due_date"]),
 				$myrow["Total"],
 				$myrow["alloc"] - $myrow["amt"], $myrow["amt"], $myrow["reference"]);
 		}
+
+		/* Finally, if there any unallocated money remaining, assign the unallocated portion to
+		the earliest transactions. This makes the javascript All/None keys consistent
+		with the transaction amount. */
+
+		if ($amount > 0) {
+			foreach ($this->allocs as $alloc_item) {
+				$allocatable = $alloc_item->amount - $alloc_item->amount_allocated;
+				if ($allocatable > 0) {
+					if ($amount >= $allocatable) {
+						$alloc_item->current_allocated = $allocatable;
+						$amount -= $allocatable;
+					} else {
+						$alloc_item->current_allocated += $amount;
+						break;
+					}
+				}
+			}
+		}
 	}
 	//
 	//	Update allocations in database.
@@ -371,9 +392,29 @@ 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 = abs($_SESSION['alloc']->amount);