X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsupp_trans_db.inc;h=081e8580e62c2359a10ba69cc745998940a6ddd5;hb=91bede4226ba8b45151f0501ac88eb946ed5f2a1;hp=468020530aa04b5c60c3b58a0414e0afe9bb8d18;hpb=f840050289f0dd5f6c8ffc4fc6c4b8199bb86e01;p=fa-stable.git

diff --git a/purchasing/includes/db/supp_trans_db.inc b/purchasing/includes/db/supp_trans_db.inc
index 46802053..081e8580 100644
--- a/purchasing/includes/db/supp_trans_db.inc
+++ b/purchasing/includes/db/supp_trans_db.inc
@@ -14,7 +14,7 @@
 //	FIXME - this should be revised for transaction update case.
 //
 function write_supp_trans($type, $trans_no, $supplier_id, $date_, $due_date, $reference, $supp_reference,
-	$amount, $amount_tax, $discount, $err_msg="", $rate=0, $included=0)
+	$amount, $amount_tax, $discount, $err_msg="", $rate=0, $included=0, $tax_algorithm = null)
 {
 	$new = $trans_no==0;
 	$date = date2sql($date_);
@@ -33,11 +33,12 @@ function write_supp_trans($type, $trans_no, $supplier_id, $date_, $due_date, $re
 
 
 	$sql = "INSERT INTO ".TB_PREF."supp_trans (trans_no, type, supplier_id, tran_date, due_date,
-		reference, supp_reference, ov_amount, ov_gst, rate, ov_discount, tax_included) ";
+		reference, supp_reference, ov_amount, ov_gst, rate, ov_discount, tax_included, tax_algorithm) ";
 	$sql .= "VALUES (".db_escape($trans_no).", ".db_escape($type)
 	.", ".db_escape($supplier_id).", '$date', '$due_date',
 		".db_escape($reference).", ".db_escape($supp_reference).", ".db_escape($amount)
-		.", ".db_escape($amount_tax).", ".db_escape($rate).", ".db_escape($discount).", ".db_escape($included).")";
+		.", ".db_escape($amount_tax).", ".db_escape($rate).", ".db_escape($discount).", ".db_escape($included).
+		", ".db_escape($tax_algorithm, true).")";
 
 	if ($err_msg == "")
 		$err_msg = "Cannot insert a supplier transaction record";
@@ -190,7 +191,7 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
 		trans.id as trans_no,
 		trans.reference, 
 		supplier.supp_name, 
-		'' as supp_reference,
+		po.requisition_no AS supp_reference,
     	delivery_date as tran_date, 
 		'' as due_date,
 		supplier.curr_code, 
@@ -198,8 +199,9 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
 		'' AS Allocated,
 		0 as OverDue,
     	1 as Settled
-    	FROM ".TB_PREF."grn_batch as trans, ".TB_PREF."suppliers as supplier
+    	FROM ".TB_PREF."grn_batch as trans, ".TB_PREF."suppliers as supplier, ".TB_PREF."purch_orders as po
     	WHERE supplier.supplier_id = trans.supplier_id
+    	AND trans.purch_order_no = po.order_no
      	AND trans.delivery_date >= '$date_after'
     	AND trans.delivery_date <= '$date_to'";
 
@@ -212,7 +214,7 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
 			$sql = $sql2;
 	} 
 	elseif (!isset($filter) || $filter == ALL_TEXT || $filter == '6') {
-		$sql = "SELECT * FROM (($sql) UNION ($sql2)) as tr";
+		$sql = "SELECT * FROM (($sql) UNION ($sql2)) as tr WHERE 1";
    	}
 
    	if (isset($filter) && $filter != ALL_TEXT)