X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsuppliers_db.inc;h=d66c89fc7941fb20c3912d1175eb0413b366fb2a;hb=f11c9c79c03710fa081caa53c2c754d8de04c922;hp=e0a1515042ac1f8cf6262cb93715428e953fa137;hpb=6ae3ba12f80c3bc2f55eec4483d5c3d6bf00c558;p=fa-stable.git

diff --git a/purchasing/includes/db/suppliers_db.inc b/purchasing/includes/db/suppliers_db.inc
index e0a15150..d66c89fc 100644
--- a/purchasing/includes/db/suppliers_db.inc
+++ b/purchasing/includes/db/suppliers_db.inc
@@ -92,9 +92,9 @@ function get_supplier_details($supplier_id, $to=null, $all=true)
     	$value = "(trans.ov_amount + trans.ov_gst + trans.ov_discount)";
     else	
     	$value = "IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_BANKDEPOSIT."
-    	OR (trans.type=".ST_JOURNAL." AND (trans.ov_amount + trans.ov_gst + trans.ov_discount)>0),
-    		(trans.ov_amount + trans.ov_gst + trans.ov_discount - trans.alloc),
-    		(trans.ov_amount + trans.ov_gst + trans.ov_discount + trans.alloc))";
+  	OR (trans.type=".ST_JOURNAL." AND (trans.ov_amount + trans.ov_gst + trans.ov_discount)>0), 1, -1)*
+    		ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) - trans.alloc";
+
 	$due = "IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_SUPPCREDIT.",trans.due_date,trans.tran_date)";
     $sql = "SELECT supp.supp_name, supp.curr_code, ".TB_PREF."payment_terms.terms,
 
@@ -149,7 +149,7 @@ function get_supplier_name($supplier_id)
 
 function get_supplier_accounts($supplier_id)
 {
-	$sql = "SELECT payable_account,purchase_account,payment_discount_account FROM ".TB_PREF."suppliers WHERE supplier_id=".db_escape($supplier_id);
+	$sql = "SELECT payable_account,purchase_account,payment_discount_account, dimension_id, dimension2_id FROM ".TB_PREF."suppliers WHERE supplier_id=".db_escape($supplier_id);
 
 	$result = db_query($sql, "could not get supplier");