X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsupp_trans_db.inc;h=d5dc75193d5dfe5b23c56d10026fb4efc55ba52f;hb=771285712c6554832851ade47b4808c14aa7eea5;hp=417f97b4c2330194d271a4cef1cf0f576d25281b;hpb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;p=fa-stable.git

diff --git a/purchasing/includes/db/supp_trans_db.inc b/purchasing/includes/db/supp_trans_db.inc
index 417f97b4..d5dc7519 100644
--- a/purchasing/includes/db/supp_trans_db.inc
+++ b/purchasing/includes/db/supp_trans_db.inc
@@ -52,40 +52,43 @@ function write_supp_trans($type, $trans_no, $supplier_id, $date_, $due_date, $re
 
 function get_supp_trans($trans_no, $trans_type=-1, $supplier_id=null)
 {
-	$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,
-		".TB_PREF."suppliers.supp_name AS supplier_name, ".TB_PREF."suppliers.curr_code AS curr_code ";
+	$sql = "SELECT trans.*, (trans.ov_amount+trans.ov_gst+trans.ov_discount) AS Total,
+		supplier.supp_name AS supplier_name, supplier.curr_code AS curr_code ";
 
 	if ($trans_type == ST_SUPPAYMENT || $trans_type == ST_BANKPAYMENT)
 	{
 		// it's a payment so also get the bank account
-		$sql .= ", ".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name, ".TB_PREF."bank_accounts.bank_curr_code,
-			".TB_PREF."bank_accounts.account_type AS BankTransType, ".TB_PREF."bank_trans.amount AS bank_amount,
-			".TB_PREF."bank_trans.ref ";
+		$sql .= ", account.bank_name, account.bank_account_name, account.bank_curr_code,
+			account.account_type AS BankTransType, bank_trans.amount AS bank_amount,
+			bank_trans.ref ";
 	}
 
-	$sql .= " FROM ".TB_PREF."supp_trans, ".TB_PREF."suppliers ";
+	$sql .= " FROM ".TB_PREF."supp_trans trans,"
+			.TB_PREF."suppliers supplier";
 
 	if ($trans_type == ST_SUPPAYMENT || $trans_type == ST_BANKPAYMENT)
 	{
 		// it's a payment so also get the bank account
-		$sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts";
+		$sql .= ", "
+			.TB_PREF."bank_trans bank_trans,"
+			.TB_PREF."bank_accounts account";
 	}
 
-	$sql .= " WHERE ".TB_PREF."supp_trans.trans_no=".db_escape($trans_no)."
-		AND ".TB_PREF."supp_trans.supplier_id=".TB_PREF."suppliers.supplier_id";
+	$sql .= " WHERE trans.trans_no=".db_escape($trans_no)."
+		AND trans.supplier_id=supplier.supplier_id";
 
 	if (isset($supplier_id))
-		$sql .= " AND ".TB_PREF."supp_trans.supplier_id=".db_escape($supplier_id);
+		$sql .= " AND trans.supplier_id=".db_escape($supplier_id);
 
 	if ($trans_type > -1)
-		$sql .= " AND ".TB_PREF."supp_trans.type=".db_escape($trans_type);
+		$sql .= " AND trans.type=".db_escape($trans_type);
 
 	if ($trans_type == ST_SUPPAYMENT || $trans_type == ST_BANKPAYMENT)
 	{
 		// it's a payment so also get the bank account
-		$sql .= " AND ".TB_PREF."bank_trans.trans_no =".db_escape($trans_no)."
-			AND ".TB_PREF."bank_trans.type=".db_escape($trans_type)."
-			AND ".TB_PREF."bank_accounts.id=".TB_PREF."bank_trans.bank_act ";
+		$sql .= " AND bank_trans.trans_no =".db_escape($trans_no)."
+			AND bank_trans.type=".db_escape($trans_type)."
+			AND account.id=bank_trans.bank_act ";
 	}
 
 	$result = db_query($sql, "Cannot retreive a supplier transaction");
@@ -107,6 +110,48 @@ function get_supp_trans($trans_no, $trans_type=-1, $supplier_id=null)
 }
 
 
+//----------------------------------------------------------------------------------------
+
+function get_supp_payment_before($supplier_id, $date)
+{
+	$sql = "SELECT "
+	. TB_PREF . "supp_trans.trans_no,"
+	. TB_PREF . "supp_trans.type,"
+	. TB_PREF . "supp_trans.supplier_id,"
+	. TB_PREF . "supp_trans.tran_date,"
+	. TB_PREF . "supp_trans.ov_amount,"
+	. TB_PREF . "bank_trans.ref AS bank_ref,"
+	. TB_PREF . "bank_trans.amount AS bank_amount,"
+	. TB_PREF . "bank_accounts.id AS bank_id,"
+	. TB_PREF . "bank_accounts.bank_name,"
+	. TB_PREF . "bank_accounts.bank_account_name,"
+	. TB_PREF . "bank_accounts.bank_curr_code "
+	. "FROM "
+	. TB_PREF . "supp_trans,"
+	. TB_PREF . "bank_trans,"
+	. TB_PREF . "bank_accounts "
+	. "WHERE "
+	. TB_PREF . "supp_trans.supplier_id=" . $supplier_id . " "
+	. "AND " . TB_PREF . "supp_trans.tran_date<'" . $date . "' "
+	. "AND " . TB_PREF . "supp_trans.type=" . ST_SUPPAYMENT . " "
+	. "AND " . TB_PREF . "supp_trans.trans_no=" . TB_PREF . "bank_trans.trans_no "
+	. "AND " . TB_PREF . "supp_trans.type=" . TB_PREF . "bank_trans.type "
+	. "AND " . TB_PREF . "bank_accounts.id=" . TB_PREF . "bank_trans.bank_act "
+	. "ORDER BY "
+	. TB_PREF . "supp_trans.tran_date DESC "
+	. "LIMIT 1 "
+	;
+
+	$result = db_query($sql, "Cannot retreive a previous supplier payment");
+
+	if (db_num_rows($result) == 0)
+	{
+		return false;
+	}
+
+	return db_fetch($result);
+}
+
 //----------------------------------------------------------------------------------------
 
 function exists_supp_trans($type, $type_no)