X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Finvoice_db.inc;h=c4e4c1c918d9b1d6d52fcb25d4f3aa0494d3a8d3;hp=503ed275e3b165f338d1a32683f9ac1eddc5c868;hb=9ff22040ec9e77b56c71df9bd95f9b2c2d50bd7e;hpb=3713324329f0ec2effe45febe79cb659ae13d5f6

diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc
index 503ed275..c4e4c1c9 100644
--- a/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@ -16,7 +16,7 @@ include_once($path_to_root . "/admin/db/attachments_db.inc");
 
 function read_supplier_details_to_trans(&$supp_trans, $supplier_id)
 {
-	$sql = "SELECT supp.supp_name, terms.terms, terms.days_before_due,
+	$sql = "SELECT supp.supp_name, terms.terms, terms.days_before_due, supp.dimension_id, supp.dimension2_id,
 		terms.day_in_following_month, supp.tax_included,
 		supp.tax_group_id, tax_group.name AS tax_group_name,
 		supp.credit_limit - Sum(IFNULL(IF(trans.type=".ST_SUPPCREDIT.", -1, 1) 
@@ -55,7 +55,9 @@ function read_supplier_details_to_trans(&$supp_trans, $supplier_id)
 
 	$supp_trans->tax_description = $myrow['tax_group_name'];
 	$supp_trans->tax_group_id = $myrow['tax_group_id'];
-
+	$supp_trans->dimension = $myrow['dimension_id'];
+	$supp_trans->dimension2 = $myrow['dimension2_id'];
+ 
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -447,7 +449,7 @@ function get_tax_overrides($trans_type, $trans_no)
 
 function read_supp_invoice($trans_no, $trans_type, &$supp_trans)
 {
-	$sql = "SELECT trans.*, supp_name 
+	$sql = "SELECT trans.*, supp_name, dimension_id, dimension2_id
 		FROM ".TB_PREF."supp_trans trans,"
 			.TB_PREF."suppliers sup
 		WHERE trans_no = ".db_escape($trans_no)." AND type = ".db_escape($trans_type)."
@@ -470,6 +472,8 @@ function read_supp_invoice($trans_no, $trans_type, &$supp_trans)
 		$supp_trans->ov_discount = $trans_row["ov_discount"];
 		$supp_trans->ov_gst = $trans_row["ov_gst"];
 		$supp_trans->tax_included = $trans_row["tax_included"];
+		$supp_trans->dimension = $trans_row["dimension_id"];
+		$supp_trans->dimension2 = $trans_row["dimension2_id"];
 
 		$id = $trans_row["trans_no"];