X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fallocation_cart.inc;h=b45110b35ade07d366eb4a8622f81e7d9b93ee0f;hb=19ddc3939071044c8e94b628f1d6a039f50cc493;hp=37c436a0ac3a96b2daa447f0f64985c4d7b014d9;hpb=fa43a9c974d05b77517a0d8e3e510ef4a088632e;p=fa-stable.git

diff --git a/includes/ui/allocation_cart.inc b/includes/ui/allocation_cart.inc
index 37c436a0..b45110b3 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();
 		
@@ -130,7 +130,7 @@ class allocation
 				$this->date_ = sql2date($trans["tran_date"]);
 				$this->person_curr = $trans['curr_code'];
 				$this->currency = isset($trans['bank_curr_code']) ? $trans['bank_curr_code'] : $trans['curr_code'];
-				$this->bank_amount = @$trans["bank_amount"];
+				$this->bank_amount = isset($trans["bank_amount"]) ? $trans["bank_amount"] : $trans["Total"]; // not set for journal entry
 				$this->amount = $trans["Total"];
 			}
 		}
@@ -171,7 +171,6 @@ class allocation
 
 		while ($myrow = db_fetch($trans_items))
 		{
-//_vd($myrow);
 			$this->add_or_update_item ($myrow["type"], $myrow["trans_no"],
 				sql2date($myrow["tran_date"]),
 				sql2date($myrow["due_date"]),
@@ -184,12 +183,14 @@ class allocation
 	//
 	function write()
 	{
+		global 	$no_exchange_variations;
+
 		begin_transaction();
 
 		if ($this->person_type == PT_SUPPLIER)
-			clear_supp_alloctions($this->type, $this->trans_no, $this->date_);
+			clear_supp_alloctions($this->type, $this->trans_no, $this->person_id, $this->date_);
 		else
-		 	clear_cust_alloctions($this->type, $this->trans_no);
+		 	clear_cust_alloctions($this->type, $this->trans_no, $this->person_id, $this->date_);
 
 		// now add the new allocations
 		$total_allocated = 0;
@@ -203,21 +204,22 @@ class allocation
 				if ($this->person_type == PT_SUPPLIER) {
 					add_supp_allocation($amount,
 						$this->type, $this->trans_no,
-			    	 	$alloc_item->type, $alloc_item->type_no, $this->date_);
+			    	 	$alloc_item->type, $alloc_item->type_no, $this->person_id, $this->date_);
 
-					update_supp_trans_allocation($alloc_item->type, $alloc_item->type_no);
+					update_supp_trans_allocation($alloc_item->type, $alloc_item->type_no, $this->person_id);
 				} else {
 	 				add_cust_allocation($amount,
 						$this->type, $this->trans_no,
- 			     		$alloc_item->type, $alloc_item->type_no, $this->date_);
+ 			     		$alloc_item->type, $alloc_item->type_no, $this->person_id, $this->date_);
 
-	 				update_debtor_trans_allocation($alloc_item->type, $alloc_item->type_no);
+	 				update_debtor_trans_allocation($alloc_item->type, $alloc_item->type_no, $this->person_id);
 				}
 				// Exchange Variations Joe Hunt 2008-09-20 ////////////////////
-				if (!in_array($alloc_item->type, array(ST_SALESQUOTE, ST_SALESORDER, ST_PURCHORDER)))
-				 exchange_variation($this->type, $this->trans_no,
-					$alloc_item->type, $alloc_item->type_no, $this->date_,
-					$amount, $this->person_type);
+				if ($alloc_item->type != ST_SALESORDER && !@$no_exchange_variations
+					&& $alloc_item->type != ST_PURCHORDER && $alloc_item->type != ST_JOURNAL && $this->type != ST_JOURNAL)
+					exchange_variation($this->type, $this->trans_no,
+						$alloc_item->type, $alloc_item->type_no, $this->date_,
+						$amount, $this->person_type);
 
 				//////////////////////////////////////////////////////////////
 				$total_allocated += $alloc_item->current_allocated;
@@ -225,9 +227,9 @@ class allocation
 
 		}  /*end of the loop through the array of allocations made */
 		if ($this->person_type == PT_SUPPLIER)
-			update_supp_trans_allocation($this->type, $this->trans_no);
+			update_supp_trans_allocation($this->type, $this->trans_no, $this->person_id);
 		else
-		 	update_debtor_trans_allocation($this->type,	$this->trans_no);
+		 	update_debtor_trans_allocation($this->type,	$this->trans_no, $this->person_id);
 
 		commit_transaction();
 
@@ -252,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)
 	{
 
@@ -276,16 +278,15 @@ 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));
-		start_table(TABLESTYLE, "width=60%");
+		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"),'','');
 
@@ -297,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");
@@ -322,14 +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)
-				$amount = -$amount;
-*/
 			$amount = abs($cart->amount);
 
 			if (floatcmp($amount, $total_allocated) < 0)
@@ -359,7 +353,6 @@ function check_allocations()
 	for ($counter = 0; $counter < get_post("TotalNumberOfAllocs"); $counter++)
 	{
 		if (!isset($_POST['amount'.$counter])) continue;
-
 		if (!check_num('amount' . $counter, 0))
 		{
 			display_error(_("The entry for one or more amounts is invalid or negative."));
@@ -382,12 +375,7 @@ function check_allocations()
 
 		 $total_allocated += input_num('amount' . $counter);
 	}
-/*
-	$amount = $_SESSION['alloc']->amount;
 
-	if (in_array($_SESSION['alloc']->type, array(ST_BANKPAYMENT, ST_SUPPCREDIT, ST_SUPPAYMENT)))
-		$amount = -$amount;
-*/
 	$amount = abs($_SESSION['alloc']->amount);
 
 	if ($total_allocated - ($amount + input_num('discount'))  > $SysPrefs->allocation_settled_allowance())
@@ -398,3 +386,22 @@ function check_allocations()
 
 	return true;
 }
+
+//----------------------------------------------------------------------------------------
+//
+//	Returns sales or purchase invoice allocations to be reallocated after invoice edition.
+//
+function get_inv_allocations($trans_no, $trans_type, $person_id)
+{
+	$allocs = array();
+	if ($trans_type == ST_SUPPINVOICE || $trans_type == ST_SUPPCREDIT)
+		$result = get_allocatable_from_supp_transactions($person_id, $trans_no, $trans_type);
+	else
+		$result = get_allocatable_from_cust_transactions($person_id, $trans_no, $trans_type);
+
+	while($dat = db_fetch($result))
+	{
+		$allocs[] = array('type'=> $dat['type'], 'trans_no'=> $dat['trans_no'], 'amount'=>$dat['alloc']);
+	}
+	return $allocs;
+}