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

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index d2e766ad..d44e8eac 100644
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -11,7 +11,7 @@ function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension
 	$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_);
@@ -27,7 +27,7 @@ function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension
 			$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";
 
@@ -37,10 +37,10 @@ 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, ".db_escape($memo_).", $amount_in_home_currency";
 
 	if ($person_type_id != null)
-		$sql .= ", $person_type_id, '$person_id'";
+		$sql .= ", $person_type_id, ". db_escape($person_id);
 
 	$sql .= ") ";
 
@@ -56,7 +56,7 @@ function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension
 // $date_ is display date (non-sql)
 // $amount is in HOME currency
 
-function add_gl_trans_std_cost($type, $trans_id, $date_, $account, $dimension, $dimension2, 
+function add_gl_trans_std_cost($type, $trans_id, $date_, $account, $dimension, $dimension2,
 	$memo_,	$amount, $person_type_id=null, $person_id=null, $err_msg="")
 {
 	if ($amount != 0)
@@ -160,17 +160,17 @@ function get_gl_trans_from_to($from_date, $to_date, $account, $dimension=0, $dim
 
 //--------------------------------------------------------------------------------
 
-function get_budget_trans_from_to($from_date, $to_date, $account, $dimension=0, $dimension2=0) 
+function get_budget_trans_from_to($from_date, $to_date, $account, $dimension=0, $dimension2=0)
 {
 
 	$from = date2sql($from_date);
 	$to = date2sql($to_date);
-	
+
 	$sql = "SELECT SUM(amount) FROM ".TB_PREF."budget_trans
-		WHERE account=$account ";
-	if ($from_date != "")	
+		WHERE account='$account' ";
+	if ($from_date != "")
 		$sql .= " AND tran_date >= '$from' ";
-	if ($to_date != "")	
+	if ($to_date != "")
 		$sql .= " AND tran_date <= '$to' ";
 	if ($dimension > 0)
 		$sql .= " AND dimension_id = $dimension";
@@ -191,48 +191,50 @@ function add_journal_entries($items, $date_, $ref, $reverse, $memo_=null)
 	$trans_type = systypes::journal_entry();
 	$trans_id = get_next_trans_no($trans_type);
 
-	foreach ($items as $journal_item) 
+	foreach ($items as $journal_item)
 	{
+		// post to first found bank account using given gl acount code.
 		$is_bank_to = is_bank_account($journal_item->code_id);
 
-		add_gl_trans($trans_type, $trans_id, $date_, $journal_item->code_id, 
-			$journal_item->dimension_id, $journal_item->dimension2_id, 
+		add_gl_trans($trans_type, $trans_id, $date_, $journal_item->code_id,
+			$journal_item->dimension_id, $journal_item->dimension2_id,
 			$journal_item->reference, $journal_item->amount);
-    	if ($is_bank_to) 
+    	if ($is_bank_to)
     	{
-    		add_bank_trans($trans_type, $trans_id, $journal_item->code_id, $ref, 
-    			$date_, 3, $journal_item->amount,
-    			0, "", get_company_currency(), 
-    			"Cannot insert a destination bank transaction");								
-    	}		
+    		add_bank_trans($trans_type, $trans_id, $is_bank_to, $ref,
+    			$date_, $journal_item->amount,
+    			0, "", get_company_currency(),
+    			"Cannot insert a destination bank transaction");
+    	}
 	}
 
 	add_comments($trans_type, $trans_id, $date_, $memo_);
 
 	references::save($trans_type, $trans_id, $ref);
 
-	if ($reverse) 
+	if ($reverse)
 	{
 
-    	$reversingDate = date(user_date_display(),
-    		Mktime(0,0,0,get_month($date_)+1,1,get_year($date_)));
+    	//$reversingDate = date(user_date_display(),
+    	//	Mktime(0,0,0,get_month($date_)+1,1,get_year($date_)));
+    	$reversingDate = begin_month(add_months($date_, 1));
 
     	$trans_id_reverse = get_next_trans_no($trans_type);
 
-    	foreach ($items as $journal_item) 
+    	foreach ($items as $journal_item)
     	{
 			$is_bank_to = is_bank_account($journal_item->code_id);
 
     		add_gl_trans($trans_type, $trans_id_reverse, $reversingDate,
-    			$journal_item->code_id, $journal_item->dimension_id, $journal_item->dimension2_id, 
+    			$journal_item->code_id, $journal_item->dimension_id, $journal_item->dimension2_id,
     			$journal_item->reference, -$journal_item->amount);
-    		if ($is_bank_to) 
+    		if ($is_bank_to)
     		{
-    			add_bank_trans($trans_type, $trans_id_reverse, $journal_item->code_id, $ref, 
-    				$reversingDate, 3, $journal_item->amount,
-    				0, "", get_company_currency(), 
-    				"Cannot insert a destination bank transaction");								
-    		}		
+    			add_bank_trans($trans_type, $trans_id_reverse, $is_bank_to, $ref,
+    				$reversingDate, $journal_item->amount,
+    				0, "", get_company_currency(),
+    				"Cannot insert a destination bank transaction");
+    		}
     	}
 
     	add_comments($trans_type, $trans_id_reverse, $reversingDate, $memo_);