X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fcustalloc_db.inc;h=eadcbdad54c02a64857a104ba5f0e459d34f6428;hb=0b44975d1b3c8f3e3fb28d24d8b45b1a6f71d12c;hp=a202d313980beb2d4bb21574b6e2756cdd77dcbc;hpb=3951d648b98dbd5fdf9e95b858b765b7d52fe8c0;p=fa-stable.git

diff --git a/sales/includes/db/custalloc_db.inc b/sales/includes/db/custalloc_db.inc
index a202d313..eadcbdad 100644
--- a/sales/includes/db/custalloc_db.inc
+++ b/sales/includes/db/custalloc_db.inc
@@ -46,13 +46,14 @@ function get_cust_allocation($trans_id)
 //
 function update_debtor_trans_allocation($trans_type, $trans_no, $person_id)
 {
+	$dec = user_price_dec();
 	$sql = 
 		"UPDATE `".TB_PREF.($trans_type==ST_SALESORDER ? 'sales_orders' : 'debtor_trans')."` trans,
 			(SELECT sum(amt) amt FROM ".TB_PREF."cust_allocations
 				WHERE person_id=".db_escape($person_id)." AND ((trans_type_to=".db_escape($trans_type)." AND trans_no_to=".db_escape($trans_no).")
 				OR (trans_type_from=".db_escape($trans_type)." AND trans_no_from=".db_escape($trans_no)."))) allocated
 		SET 
-			trans.alloc=IFNULL(allocated.amt,0)
+			trans.alloc=IFNULL(ROUND(allocated.amt, $dec),0)
 		WHERE trans.debtor_no=".db_escape($person_id)." AND ".($trans_type==ST_SALESORDER ?
 			   "trans.trans_type=".db_escape($trans_type)." AND order_no=".db_escape($trans_no)
 			:  "trans.type=".db_escape($trans_type)." AND trans_no=".db_escape($trans_no));
@@ -322,6 +323,10 @@ function get_sql_for_customer_allocation_inquiry($from, $to, $customer, $filterT
    		{
 			$sql .= " AND trans.type = ".ST_CUSTCREDIT." ";
    		}
+   		elseif ($filterType == '6')
+   		{
+			$sql .= " AND trans.type = ".ST_JOURNAL." ";
+   		}
 
     	if ($filterType == '2')
     	{