Minor bug fix in Quick Entry tax account choice for Journal Entry.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5be11e3aec246c15273675c88910aae7dbde827c..fd8c9fd0f47f04b871062a35155dac8952c2d137 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+13-Feb-2009 Joe Hunt
+# Minor bug fix in Quick Entry tax account choice for Journal Entry.
+$ /includes/ui/ui_view.inc
+
 12-Feb-2009 Janusz Dobrowolski
 ! Changed extension menu file placement, added support for gettext in extensions.
 $ /frontaccounting.php

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 66d42c7fefa37e8bbc18a1a9757fe7fd7467517f..fff49cb0af62bc9897b165b4636bebb1a31e666f 100644 (file)
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -611,8 +611,8 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
                                                else
                                                        $tax = round2($base * $item_tax['rate'] / 100,  user_price_dec());
 
-                                               $gl_code = $type != QE_DEPOSIT 
-                                                       ? $item_tax['purchasing_gl_code'] : $item_tax['sales_gl_code'];
+                                               $gl_code = ($type == QE_DEPOSIT || ($type == QE_JOURNAL && $base < 0)) 
+                                                       ? $item_tax['sales_gl_code'] : $item_tax['purchasing_gl_code'];
                                                $tax_total += $tax;
                                                if ($type != QE_SUPPINV)
                                                        $cart->add_gl_item($gl_code,