X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsupp_trans_db.inc;h=5ed21c3a3f407416491a1fec3535ef169061ec86;hb=9af96a2e461b905dbb20f2b87ffb5c28f9b3461c;hp=a2265bb91d01672426961cd7c9d751eeba01eb72;hpb=702a71dbe463765b5fd1892a982ede3e5f264dee;p=fa-stable.git

diff --git a/purchasing/includes/db/supp_trans_db.inc b/purchasing/includes/db/supp_trans_db.inc
index a2265bb9..5ed21c3a 100644
--- a/purchasing/includes/db/supp_trans_db.inc
+++ b/purchasing/includes/db/supp_trans_db.inc
@@ -10,17 +10,21 @@
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 //-------------------------------------------------------------------------------------------------------------
-
-function add_supp_trans($type, $supplier_id, $date_, $due_date, $reference, $supp_reference,
-	$amount, $amount_tax, $discount, $err_msg="", $rate=0)
+//
+//	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)
 {
+	$new = $trans_no==0;
 	$date = date2sql($date_);
 	if ($due_date == "")
 		$due_date = "0000-00-00";
 	else
 		$due_date = date2sql($due_date);
 
-	$trans_no = get_next_trans_no($type);
+	if ($new)
+		$trans_no = get_next_trans_no($type);
 
 	$curr = get_supplier_currency($supplier_id);
 	
@@ -29,11 +33,11 @@ function add_supp_trans($type, $supplier_id, $date_, $due_date, $reference, $sup
 
 
 	$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) ";
+		reference, supp_reference, ov_amount, ov_gst, rate, ov_discount, tax_included) ";
 	$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($amount_tax).", ".db_escape($rate).", ".db_escape($discount).", ".db_escape($included).")";
 
 	if ($err_msg == "")
 		$err_msg = "Cannot insert a supplier transaction record";
@@ -46,41 +50,6 @@ function add_supp_trans($type, $supplier_id, $date_, $due_date, $reference, $sup
 
 //-------------------------------------------------------------------------------------------------------------
 
-function reinsert_supp_trans($type, $trans_no, $supplier_id, $date_, $due_date, $reference, $supp_reference,
-	$amount, $amount_tax, $discount, $err_msg="", $rate=0)
-{
-	if ($trans_no == '')
-		display_db_error('Invalid call to function reinsert_supp_trans');
-		
-	$date = date2sql($date_);
-	if ($due_date == "")
-		$due_date = "0000-00-00";
-	else
-		$due_date = date2sql($due_date);
-
-	$curr = get_supplier_currency($supplier_id);
-	
-	if ($rate == 0)
-		$rate = get_exchange_rate_from_home_currency($curr, $date_);
-
-
-	$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) ";
-	$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).")";
-
-	if ($err_msg == "")
-		$err_msg = "Cannot insert a supplier transaction record";
-
-	db_query($sql, $err_msg);
-	add_audit_trail($type, $trans_no, $date_);
-
-	return $trans_no;
-}
-//-------------------------------------------------------------------------------------------------------------
-
 function get_supp_trans($trans_no, $trans_type=-1)
 {
 	$sql = "SELECT ".TB_PREF."supp_trans.*, (".TB_PREF."supp_trans.ov_amount+".TB_PREF."supp_trans.ov_gst+".TB_PREF."supp_trans.ov_discount) AS Total,
@@ -216,8 +185,36 @@ function get_sql_for_supplier_inquiry()
      	AND trans.tran_date >= '$date_after'
     	AND trans.tran_date <= '$date_to'
 		AND trans.ov_amount != 0";	// exclude voided transactions
-   	if ($_POST['supplier_id'] != ALL_TEXT)
+
+	$sql2 = "SELECT ".ST_SUPPRECEIVE." as type, 
+		trans.id as trans_no,
+		trans.reference, 
+		supplier.supp_name, 
+		'' as supp_reference,
+    	delivery_date as tran_date, 
+		'' as due_date,
+		supplier.curr_code, 
+    	'' AS TotalAmount,
+		'' AS Allocated,
+		0 as OverDue,
+    	1 as Settled
+    	FROM ".TB_PREF."grn_batch as trans, ".TB_PREF."suppliers as supplier
+    	WHERE supplier.supplier_id = trans.supplier_id
+     	AND trans.delivery_date >= '$date_after'
+    	AND trans.delivery_date <= '$date_to'";
+
+   	if ($_POST['supplier_id'] != ALL_TEXT) {
    		$sql .= " AND trans.supplier_id = ".db_escape($_POST['supplier_id']);
+   		$sql2 .= " AND trans.supplier_id = ".db_escape($_POST['supplier_id']);
+	}
+	if (($_POST['filterType'] == '6')) 
+	{
+			$sql = $sql2;
+	} 
+	elseif (!isset($_POST['filterType']) || $_POST['filterType'] == ALL_TEXT || $_POST['filterType'] == '6') {
+		$sql = "SELECT * FROM (($sql) UNION ($sql2)) as tr";
+   	}
+
    	if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT)
    	{
    		if (($_POST['filterType'] == '1'))