X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gl%2Fincludes%2Fdb%2Fgl_db_trans.inc;h=d2e766ad8dc4c59ca0826e36d9897466f87a0e33;hb=97023f8706bb7149c62ca49eaec123cca3c51fa0;hp=f6a8ef1eab9a6d82fea76c9b10792e00955ade5e;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index f6a8ef1e..d2e766ad 100644
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -10,6 +10,8 @@
 function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension2, $memo_,
 	$amount, $currency=null, $person_type_id=null, $person_id=null,	$err_msg="")
 {
+	global $use_audit_trail;
+	
 	$date = date2sql($date_);
 	if ($currency != null)
 		$amount_in_home_currency = to_home_currency($amount, $currency, $date_);
@@ -19,6 +21,13 @@ function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension
 		$dimension = 0;
 	if ($dimension2 == null || $dimension2 < 0)
 		$dimension2 = 0;
+	if (isset($use_audit_trail) && $use_audit_trail)
+	{
+		if ($memo_ == "" || $memo_ == null)
+			$memo_ = $_SESSION["wa_current_user"]->username;
+		else
+			$memo_ = $_SESSION["wa_current_user"]->username . " - " . $memo_;
+	}		
 	$sql = "INSERT INTO ".TB_PREF."gl_trans ( type, type_no, tran_date,
 		account, dimension_id, dimension2_id, memo_, amount";
 
@@ -28,7 +37,7 @@ function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension
 	$sql .= ") ";
 
 	$sql .= "VALUES ($type, $trans_id, '$date',
-		$account, $dimension, $dimension2, '$memo_', $amount_in_home_currency";
+		'$account', $dimension, $dimension2, '$memo_', $amount_in_home_currency";
 
 	if ($person_type_id != null)
 		$sql .= ", $person_type_id, '$person_id'";
@@ -73,7 +82,7 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
 		$sql .= " AND ".TB_PREF."gl_trans.type_no LIKE '%$trans_no'";
 
 	if ($account != null)
-		$sql .= " AND ".TB_PREF."gl_trans.account = $account";
+		$sql .= " AND ".TB_PREF."gl_trans.account = '$account'";
 
 	if ($dimension > 0)
 		$sql .= " AND ".TB_PREF."gl_trans.dimension_id = $dimension";
@@ -109,7 +118,7 @@ function get_gl_balance_from_to($from_date, $to_date, $account, $dimension=0, $d
 	$to = date2sql($to_date);
 
     $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans
-		WHERE account='" . $account . "'";
+		WHERE account='$account'";
 	if ($from_date != "")
 		$sql .= "  AND tran_date > '$from'";
 	if ($to_date != "")
@@ -133,7 +142,7 @@ function get_gl_trans_from_to($from_date, $to_date, $account, $dimension=0, $dim
 	$to = date2sql($to_date);
 
     $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans
-		WHERE account='" . $account . "'";
+		WHERE account='$account'";
 	if ($from_date != "")
 		$sql .= " AND tran_date >= '$from'";
 	if ($to_date != "")