The reference for deposits and payments didn't show up in Tax Report

Minor bug in Quick Entries display

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5882fedf073d67dcdf572a03d4c83eca5c7efdda..586e6db193eab456cf5c73e7b79473d12d188a89 100644 (file)
--- 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 e73e1e3ac877aab3f5fa7020f5c95cdba0f50893..d7971cfb0d7e7c8ce078d7028b75913a0bfb077f 100644 (file)
--- 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 111d4e331a8a579f899cc6dac0e54d0fc19f5dca..8cd63f4600020435f24f5c9f2681230dcebc4307 100644 (file)
--- 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 78b54a0a9bcaab348697c421a9436d3bdbfcdba6..bc444a09b6097a3f36ae21565834e457b0ac16e1 100644 (file)
--- 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']);
                        }
                }