From 0f1e8a8fa48392a82cc7b86af430b9ffc4e12dff Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Fri, 28 Aug 2009 07:48:34 +0000
Subject: [PATCH] The reference for deposits and payments didn't show up in Tax
 Report Minor bug in Quick Entries display

---
 CHANGELOG.txt                    | 7 +++++++
 gl/includes/db/gl_db_banking.inc | 2 +-
 gl/includes/db/gl_db_trans.inc   | 2 +-
 includes/ui/ui_view.inc          | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5882fedf..586e6db1 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,13 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+28-Aug-2009 Joe Hunt
+# The reference for deposits and payments didn't show up in Tax Report
+$ /gl/includes/db/gl_db_banking.inc
+  /gl/includes/db/gl_db_trans.inc
+# Minor bug in Quick Entries display
+$ /includes/ui/ui_view.inc
+  
 27-Aug-2009 Joe Hunt
 # bank_trans_type_id removed from bank_trans in en_US-demo.sql and en_US-new.sql.
 $ /sql/en_US-demo.sql
diff --git a/gl/includes/db/gl_db_banking.inc b/gl/includes/db/gl_db_banking.inc
index e73e1e3a..d7971cfb 100644
--- a/gl/includes/db/gl_db_banking.inc
+++ b/gl/includes/db/gl_db_banking.inc
@@ -212,7 +212,7 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_,
 		$ex_rate = get_exchange_rate_from_home_currency($currency, $date_);
 			
 		add_gl_tax_details($gl_item->code_id, $trans_type, $trans_no, -$amount,
-			$ex_rate, $date_, $memo_);
+			$ex_rate, $date_, $ref);
 	}
 
 	// do the source account postings
diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index 111d4e33..8cd63f46 100644
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -388,7 +388,7 @@ function write_journal_entries(&$cart, $reverse)
     	}
 		// store tax details if the gl account is a tax account
 		add_gl_tax_details($journal_item->code_id, 
-			($journal_item->amount < 0.0 ? 2 : 1), $trans_id, -$journal_item->amount, 1, $date_, $memo_);
+			($journal_item->amount < 0.0 ? 2 : 1), $trans_id, -$journal_item->amount, 1, $date_, $ref);
 	}
 	
 	if ($new) {
diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 78b54a0a..bc444a09 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -534,7 +534,7 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
 				case "t": // post taxes calculated on base amount
 				case "t+": // ditto & increase base amount
 				case "t-": // ditto & reduce base amount
-					if (substr($qe_line['action'],0,1) != 'T') 
+					if (substr($row['action'],0,1) != 'T') 
 						$totrate += get_tax_type_default_rate($row['dest_id']);
 			}
 		}
-- 
2.30.2