From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Tue, 27 May 2014 18:56:31 +0000 (+0200)
Subject: Customer Credit Note: fixed payments allocation after crediting sales invoice.
X-Git-Tag: 2.3-final~132
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=7b9a7d52c4e0c693603db1631fa861c27c4efa03;p=fa-stable.git

Customer Credit Note: fixed payments allocation after crediting sales invoice.
---

diff --git a/sales/includes/db/custalloc_db.inc b/sales/includes/db/custalloc_db.inc
index 1e58c2b1..a3abb44b 100644
--- a/sales/includes/db/custalloc_db.inc
+++ b/sales/includes/db/custalloc_db.inc
@@ -286,16 +286,14 @@ function credit_sales_invoice_allocate($invoice_no, $credit_no, $amount, $date)
 
 		while(($free < $amount) && ($alloc = db_fetch($result))) {
 			$unalloc = min($alloc['amt'], $amount-$free);
-			update_debtor_trans_allocation($alloc['trans_type_to'], $alloc['trans_no_to'], 
-				-$unalloc);
-			update_debtor_trans_allocation($alloc['trans_type_from'], $alloc['trans_no_from'], 
-				-$unalloc);
 
 			delete_cust_allocation($alloc['id']);
 			if ($unalloc < $alloc['amt'])
 				add_cust_allocation($alloc['amt']-$unalloc, $alloc['trans_type_from'],
 					$alloc['trans_no_from'], ST_SALESINVOICE, $invoice_no);
 
+			update_debtor_trans_allocation($alloc['trans_type_to'], $alloc['trans_no_to']);
+			update_debtor_trans_allocation($alloc['trans_type_from'], $alloc['trans_no_from']);
 			$free += $unalloc;
 		}
 	}
@@ -306,9 +304,9 @@ function credit_sales_invoice_allocate($invoice_no, $credit_no, $amount, $date)
  Check all credit notes allocated to this invoice for summarized freight charges."));
 		return false;
 	}
-	update_debtor_trans_allocation(ST_SALESINVOICE, $invoice_no, $amount);
-	update_debtor_trans_allocation(ST_CUSTCREDIT, $credit_no, $amount);
 	add_cust_allocation($amount, ST_CUSTCREDIT, $credit_no, ST_SALESINVOICE, $invoice_no);
+	update_debtor_trans_allocation(ST_SALESINVOICE, $invoice_no);
+	update_debtor_trans_allocation(ST_CUSTCREDIT, $credit_no);
 
 	exchange_variation(ST_CUSTCREDIT, $credit_no, ST_SALESINVOICE, $invoice_no, $date,
 		$amount, PT_CUSTOMER);