X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsupp_trans_db.inc;h=d5112d5322debbd2b598ad295cd71b88cdaf02b5;hb=64d4d934eeecbc56ce59b60ec12183878f69b6f6;hp=30294e69f93acfdcd4e6471257569adfdc87e283;hpb=49d2702ed98abe7a564a4abb4c8c5fa225f362e8;p=fa-stable.git

diff --git a/purchasing/includes/db/supp_trans_db.inc b/purchasing/includes/db/supp_trans_db.inc
index 30294e69..d5112d53 100644
--- a/purchasing/includes/db/supp_trans_db.inc
+++ b/purchasing/includes/db/supp_trans_db.inc
@@ -46,6 +46,41 @@ 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,
@@ -126,6 +161,15 @@ function void_supp_trans($type, $type_no)
 
 //----------------------------------------------------------------------------------------
 
+function clear_supp_trans($type, $type_no)
+{
+	$sql = "DELETE FROM ".TB_PREF."supp_trans 
+			WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no);
+
+	db_query($sql, "could not clear supp transactions for type=$type and trans_no=$type_no");
+}
+//----------------------------------------------------------------------------------------
+
 function post_void_supp_trans($type, $type_no)
 {
 	if ($type == ST_SUPPAYMENT)
@@ -172,8 +216,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'))