From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Tue, 23 Dec 2008 23:01:10 +0000 (+0000)
Subject: Fixed an accounting sync in GL when adding bank account transactions (no customer... 
X-Git-Tag: 2.3-final~1348
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=551e2a3af4cda182c9afb21c3e29c2cf37c162e1;p=fa-stable.git

Fixed an accounting sync in GL when adding bank account transactions (no customer/supplier trans)
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 76929899..eaf91575 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+23-Dec-2008 Joe Hunt
+# Fixed an accounting sync in GL when adding bank account transactions (no customer/supplier trans)
+$ /gl/includes/db/bl_db_banking.inc
+
 22-Dec-2008 Janusz Dobrowolski
 # [0000102] Credit note was stored without entered shippment cost and comment.
 $ /sales/credit_note_entry.php
diff --git a/gl/includes/db/gl_db_banking.inc b/gl/includes/db/gl_db_banking.inc
index 4bf4687b..237626a4 100644
--- a/gl/includes/db/gl_db_banking.inc
+++ b/gl/includes/db/gl_db_banking.inc
@@ -1,5 +1,45 @@
 <?php
 
+//----------------------------------------------------------------------------------
+function add_exchange_variation($trans_type, $trans_no, $date_, $account,
+    $currency, $person_type_id=null, $person_id = "")
+{
+	if (is_company_currency($currency))
+		return;
+	if ($date_ == null)
+		$date_ = Today();
+	$rate = get_exchange_rate_from_home_currency($currency, $date_);	
+	$result = db_query("SELECT SUM(amount) FROM ".TB_PREF."bank_trans WHERE 
+		bank_act='$account' AND trans_date<='".date2sql($date_)."'", 
+		"Transactions for account $account could not be calculated");
+	$row = db_fetch_row($result);
+	$foreign_amount = $row[0];
+	$amount = get_gl_trans_from_to("", $date_, $account);
+	$diff = $amount - (round2($foreign_amount * $rate, user_price_dec()));
+	if ($diff != 0)
+	{
+		if ($trans_type == null)
+			$trans_type = systypes::journal_entry();
+		if ($trans_no == null)
+			$trans_no = get_next_trans_no($trans_type);
+		if ($person_type_id == null)
+			$person_type_id = payment_person_types::misc();
+		add_gl_trans($trans_type, $trans_no, $date_, $account, 0, 0, "",
+    		-$diff, null, $person_type_id, $person_id);
+    	add_gl_trans($trans_type, $trans_no, $date_, get_company_pref('exchange_diff_act'), 0, 0, "",
+    		$diff, null, $person_type_id, $person_id);
+	}	
+}
+
+function add_exchange_variation_all()
+{
+	$trans_no = get_next_trans_no(0);
+	$sql = "SELECT * FROM ".TB_PREF."bank_accounts";
+	$result = db_query($sql, "could not retreive bank accounts");
+	while ($myrow = db_fetch($result))
+		add_exchange_variation(0, $trans_no, null, $myrow['account_code'],
+			$myrow['currency_code']);
+}
 //----------------------------------------------------------------------------------
 
 function add_bank_transfer($from_account, $to_account, $date_,
@@ -23,9 +63,13 @@ function add_bank_transfer($from_account, $to_account, $date_,
 		payment_person_types::misc(), "", $currency,
 		"Cannot insert a source bank transaction");
 
+	add_exchange_variation($trans_type, $trans_no, $date_, $from_account, 
+		$currency, payment_person_types::misc(), "");
+
 	// do the destination account postings
 	$total += add_gl_trans($trans_type, $trans_no, $date_, $to_account, 0, 0, "",
 		$amount, $currency);
+		
 	/*Post a balance post if $total != 0 */
 	add_gl_balance($trans_type, $trans_no, $date_, -$total);	
 	
@@ -35,6 +79,9 @@ function add_bank_transfer($from_account, $to_account, $date_,
 		$currency,
 		"Cannot insert a destination bank transaction");
 
+	add_exchange_variation($trans_type, $trans_no, $date_, $from_account, 
+		$currency, payment_person_types::misc(), "");
+	
 	add_comments($trans_type, $trans_no, $date_, $memo_);
 
 	references::save_last($ref, $trans_type);
@@ -57,6 +104,8 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_,
 	if ($trans_type != systypes::bank_payment() && $trans_type != systypes::bank_deposit())
 		display_db_error("Invalid type ($trans_type) sent to add_bank_transaction");
 
+	$do_exchange_variance = false;
+	
 	begin_transaction();
 
 	$currency = get_bank_account_currency($from_account);
@@ -93,6 +142,7 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_,
     else
     {
     	$trans_no = get_next_trans_no($trans_type);
+    	$do_exchange_variance = true;
     }
 
     add_bank_trans($trans_type, $trans_no, $from_account, $ref,
@@ -122,6 +172,9 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_,
     			$date_, $type, $gl_item->amount,
     			$person_type_id, $person_id, $currency,
     			"Cannot insert a destination bank transaction");
+    		if ($do_exchange_variance)
+    			add_exchange_variation($trans_type, $trans_no, $date_, $gl_item->code_id, 
+    				$currency, $person_type_id, $person_id);
     	}
 	}
 
@@ -129,6 +182,10 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_,
     add_gl_trans($trans_type, $trans_no, $date_, $from_account, 0, 0, "",
     	-$total, null, $person_type_id, $person_id);
 
+    if ($do_exchange_variance)
+    	add_exchange_variation($trans_type, $trans_no, $date_, $from_account, 
+    		$currency, $person_type_id, $person_id);
+
 	add_comments($trans_type, $trans_no, $date_, $memo_);
 
 	references::save_last($ref, $trans_type);
diff --git a/reporting/includes/class.pdf.inc b/reporting/includes/class.pdf.inc
index e0b9de2f..3892f692 100644
--- a/reporting/includes/class.pdf.inc
+++ b/reporting/includes/class.pdf.inc
@@ -90,6 +90,7 @@ class Cpdf extends TCPDF {
 				{
 					case "ar_EG" : 	$fontname = "ae_tholoth"; 	break;
 					case "zh_CN" : 	$fontname = "gbsn00lp"; 	break;
+					case "zh_TW" : 	$fontname = "chinese_traditional_cid0"; 	break;
 					default :      	$fontname = "dejavu"; 		break;
 				}
 			}