X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsupp_trans_db.inc;h=eb6a3a1f16ebf3a85319a63034ec22afd6592e6d;hb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;hp=4ba8d7bac65d57517c4f6f1eb41f595c418e17a5;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/purchasing/includes/db/supp_trans_db.inc b/purchasing/includes/db/supp_trans_db.inc
index 4ba8d7ba..eb6a3a1f 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, $tax_algorithm = null)
 {
+	$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,12 @@ 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, 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($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";
@@ -104,7 +109,7 @@ function get_supp_trans($trans_no, $trans_type=-1)
 
 function exists_supp_trans($type, $type_no)
 {
-	if ($type == 25)
+	if ($type == ST_SUPPRECEIVE)
 		return exists_grn($type_no);
 
 	$sql = "SELECT trans_no FROM ".TB_PREF."supp_trans WHERE type=".db_escape($type)."
@@ -126,6 +131,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)
@@ -140,7 +154,7 @@ function post_void_supp_trans($type, $type_no)
 		return true;
 	}
 
-	if ($type == SUPPRECEIVE)
+	if ($type == ST_SUPPRECEIVE)
 	{
 	 	return void_grn($type_no);
 	}
@@ -150,4 +164,83 @@ function post_void_supp_trans($type, $type_no)
 
 //----------------------------------------------------------------------------------------
 
+function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_id=ALL_TEXT)
+{
+    $date_after = date2sql($after_date);
+    $date_to = date2sql($to_date);
+
+    $sql = "SELECT trans.type, 
+		trans.trans_no,
+		trans.reference, 
+		supplier.supp_name, 
+		trans.supp_reference,
+    	trans.tran_date, 
+		trans.due_date,
+		supplier.curr_code, 
+    	(trans.ov_amount + trans.ov_gst  + trans.ov_discount) AS TotalAmount, 
+		trans.alloc AS Allocated,
+		((trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_SUPPCREDIT.") AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue,
+    	(ABS(trans.ov_amount + trans.ov_gst  + trans.ov_discount) - trans.alloc <= ".FLOAT_COMP_DELTA.") AS Settled
+    	FROM ".TB_PREF."supp_trans as trans, ".TB_PREF."suppliers as supplier
+    	WHERE supplier.supplier_id = trans.supplier_id
+     	AND trans.tran_date >= '$date_after'
+    	AND trans.tran_date <= '$date_to'
+		AND trans.ov_amount != 0";	// exclude voided transactions
+
+	$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 ($supplier_id != ALL_TEXT) {
+   		$sql .= " AND trans.supplier_id = ".db_escape($supplier_id);
+   		$sql2 .= " AND trans.supplier_id = ".db_escape($supplier_id);
+	}
+	if (($filter == '6')) 
+	{
+			$sql = $sql2;
+	} 
+	elseif (!isset($filter) || $filter == ALL_TEXT || $filter == '6') {
+		$sql = "SELECT * FROM (($sql) UNION ($sql2)) as tr";
+   	}
+
+   	if (isset($filter) && $filter != ALL_TEXT)
+   	{
+   		if (($filter == '1')) 
+   		{
+   			$sql .= " AND (trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_BANKDEPOSIT.")";
+   		} 
+   		elseif (($filter == '2')) 
+   		{
+   			$sql .= " AND trans.type = ".ST_SUPPINVOICE." ";
+   		} 
+   		elseif ($filter == '3') 
+   		{
+			$sql .= " AND (trans.type = ".ST_SUPPAYMENT." OR trans.type = ".ST_BANKPAYMENT.") ";
+   		} 
+   		elseif (($filter == '4') || ($filter == '5')) 
+   		{
+			$sql .= " AND trans.type = ".ST_SUPPCREDIT."  ";
+   		}
+
+   		if (($filter == '2') || ($filter == '5')) 
+   		{
+   			$today =  date2sql(Today());
+			$sql .= " AND trans.due_date < '$today' ";
+   		}
+   	}
+   	return $sql;
+}
 ?>
\ No newline at end of file