X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsupp_trans_db.inc;h=52071cc601cd55d32d716803e16c73cd39d2e8d2;hb=80dd97a37f674cc3691fa04af4c29607067566b2;hp=0ddabcec3d27f4cb36cb8dc431ac437a17b4969a;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git

diff --git a/purchasing/includes/db/supp_trans_db.inc b/purchasing/includes/db/supp_trans_db.inc
index 0ddabcec..52071cc6 100644
--- a/purchasing/includes/db/supp_trans_db.inc
+++ b/purchasing/includes/db/supp_trans_db.inc
@@ -1,9 +1,18 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    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="")
+	$amount, $amount_tax, $discount, $err_msg="", $rate=0)
 {
 	$date = date2sql($date_);
 	if ($due_date == "")
@@ -14,7 +23,9 @@ function add_supp_trans($type, $supplier_id, $date_, $due_date, $reference, $sup
 	$trans_no = get_next_trans_no($type);
 
 	$curr = get_supplier_currency($supplier_id);
-	$rate = get_exchange_rate_from_home_currency($curr, $date_);
+	
+	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,
@@ -26,6 +37,7 @@ function add_supp_trans($type, $supplier_id, $date_, $due_date, $reference, $sup
 		$err_msg = "Cannot insert a supplier transaction record";
 
 	db_query($sql, $err_msg);
+	add_audit_trail($type, $trans_no, $date_);
 
 	return $trans_no;
 }
@@ -41,7 +53,7 @@ function get_supp_trans($trans_no, $trans_type=-1)
 	{
 		// 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_trans_types.name AS BankTransType, ".TB_PREF."bank_trans.amount AS BankAmount,
+			".TB_PREF."bank_accounts.account_type AS BankTransType, ".TB_PREF."bank_trans.amount AS BankAmount,
 			".TB_PREF."bank_trans.ref ";
 	}
 
@@ -50,7 +62,7 @@ function get_supp_trans($trans_no, $trans_type=-1)
 	if ($trans_type == 22)
 	{
 		// it's a payment so also get the bank account
-		$sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts, ".TB_PREF."bank_trans_types ";
+		$sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts";
 	}
 
 	$sql .= " WHERE ".TB_PREF."supp_trans.trans_no=$trans_no
@@ -64,8 +76,7 @@ function get_supp_trans($trans_no, $trans_type=-1)
 		// it's a payment so also get the bank account
 		$sql .= " AND ".TB_PREF."bank_trans.trans_no =$trans_no
 			AND ".TB_PREF."bank_trans.type=$trans_type
-			AND ".TB_PREF."bank_trans_types.id = ".TB_PREF."bank_trans.bank_trans_type_id
-			AND ".TB_PREF."bank_accounts.account_code=".TB_PREF."bank_trans.bank_act ";
+			AND ".TB_PREF."bank_accounts.id=".TB_PREF."bank_trans.bank_act ";
 	}
 
 	$result = db_query($sql, "Cannot retreive a supplier transaction");
@@ -89,32 +100,6 @@ function get_supp_trans($trans_no, $trans_type=-1)
 
 //----------------------------------------------------------------------------------------
 
-function get_supplier_transactions($extra_fields=null, $extra_conditions=null, $extra_tables=null)
-{
-	$sql = "SELECT ".TB_PREF."supp_trans.*,
-		ov_amount+ov_gst+ov_discount AS Total,
-		".TB_PREF."suppliers.supp_name, ".TB_PREF."suppliers.address,
-		".TB_PREF."suppliers.curr_code ";
-
-	if ($extra_fields)
-		$sql .= ", $extra_fields ";
-
-	$sql .= " FROM ".TB_PREF."supp_trans, ".TB_PREF."suppliers ";
-	if ($extra_tables)
-		$sql .= " ,$extra_tables ";
-
-	$sql .= " WHERE ".TB_PREF."supp_trans.supplier_id=".TB_PREF."suppliers.supplier_id";
-
-	if ($extra_conditions)
-		$sql .= " AND $extra_conditions ";
-
-	$sql .= " ORDER BY trans_no";
-
-	return db_query($sql, "Cannot retreive supplier transactions");
-}
-
-//----------------------------------------------------------------------------------------
-
 function exists_supp_trans($type, $type_no)
 {
 	if ($type == 25)