X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsuppalloc_db.inc;h=b67708cd471267ecf1cd07f3617774bf09aa11f3;hb=4e6c60dfc8ab630d72010941b00f65b9659fe0b3;hp=57e76b35fd23ca2ea23e132d842e93fd56ee5f4a;hpb=3b431d909abc53e4a4d712cbafa39ca556409d0e;p=fa-stable.git

diff --git a/purchasing/includes/db/suppalloc_db.inc b/purchasing/includes/db/suppalloc_db.inc
index 57e76b35..b67708cd 100644
--- a/purchasing/includes/db/suppalloc_db.inc
+++ b/purchasing/includes/db/suppalloc_db.inc
@@ -44,7 +44,7 @@ function get_supp_trans_allocation_balance($trans_type, $trans_no)
 	$result = db_query($sql,"calculate the allocation");
 	$myrow = db_fetch_row($result);
 
-	return $myrow[0];
+	return $myrow ? $myrow[0] : 0;
 }
 
 //----------------------------------------------------------------------------------------
@@ -52,12 +52,13 @@ function get_supp_trans_allocation_balance($trans_type, $trans_no)
 //
 function update_supp_trans_allocation($trans_type, $trans_no, $person_id)
 {
+	$dec = user_price_dec();
 	$sql = "UPDATE `".TB_PREF.($trans_type==ST_PURCHORDER ? 'purch_orders' : 'supp_trans')."` trans,
 			(SELECT person_id, sum(amt) amt from ".TB_PREF."supp_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.supplier_id=person_id AND "	. ($trans_type==ST_PURCHORDER ? 
 			  "trans.order_no=".db_escape($trans_no)
 			: "trans.type=".db_escape($trans_type)." AND trans.trans_no=".db_escape($trans_no));
@@ -97,14 +98,10 @@ function clear_supp_alloctions($type, $type_no, $person_id=null, $date="")
 		$sql .= " AND person_id=".db_escape($person_id);
 
 	db_query($sql, "could not void supp transactions for type=$type and trans_no=$type_no");
-// is this necessary?
-//	if ($date != "")
-//		exchange_variation($type, $type_no, $row['trans_type_to'], $row['trans_no_to'], $date,
-//			$row['amt'], PT_SUPPLIER, true);
 }
 //-------------------------------------------------------------------------------------------------------------
 
-function get_allocatable_from_supp_sql($supplier_id=null, $settled)
+function get_allocatable_from_supp_sql($supplier_id, $settled)
 {
 	$sql = "SELECT
 		trans.type,
@@ -168,8 +165,6 @@ function get_allocatable_purch_orders($supplier_id = null, $trans_no=null, $type
 	}
 	else
 	{
-// 	FIXME: change to form below when prepayments terms finally can be selected in PO entry form:
-//		$sql .= " AND round(prep_amount) > 0 AND ISNULL(grn.purch_order_no)"; // only sales orders with prepayment level set and no yet received
 		$sql .= " AND ISNULL(grn.purch_order_no)"; // only sales orders no yet received
 	}
 	if ($supplier_id)
@@ -261,7 +256,6 @@ function get_allocatable_from_supp_transactions($supplier_id, $trans_no=null, $t
 			AND trans.type NOT IN (".implode(',',array(ST_SUPPAYMENT,ST_BANKPAYMENT)).")";
 		$sql .= " GROUP BY type, trans_no";
 	}
-//_vd($sql);
 	return db_query($sql." ORDER BY due_date", "Cannot retreive alloc to transactions");
 }
 
@@ -309,6 +303,10 @@ function get_sql_for_supplier_allocation_inquiry()
    		{
 			$sql .= " AND trans.type = ".ST_SUPPCREDIT." ";
    		}
+   		elseif ($_POST['filterType'] == '6')	// Journal
+   		{
+			$sql .= " AND trans.type = ".ST_JOURNAL." ";
+   		}
 
    		if (($_POST['filterType'] == '2') || ($_POST['filterType'] == '5')) // overdude 
    		{