Minor bugs in layout and quick entries.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ba3483214c47b8b87816e53440d57057612523a9..55cf64e12cd73e75c43700f998391ee618108833 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,12 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+21-Dec-2008 Joe Hunt
+# Minor bugs in layout and quick entries.
+$ /Includes/ui/ui_view.inc
+  /purchasing/includes/ui/invoice_ui.inc
+  /purchasing/supplier_invoice.php
+  
 20-Dec-2008 Joe Hunt
 ! Replaced the ajax paging in stock movements with the old file.
 $ /inventory/inquiry/stock_movements.php

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 643ea4493af75b2cc6040fad5267f3a2132e28d8..2b0905c08e4db3bcfe493cb9bb5b2899ac8ef63d 100644 (file)
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -591,7 +591,7 @@ function display_quick_entries(&$cart, $id, $totamount, $payment=true, $supp_tra
                                        if ($item['rate'] != 0)
                                        {
                                                $amount = $totamount * $item['rate'] / 100;
-                                               $code = ($amount < 0 ? $item['purchasing_gl_code'] : 
+                                               $code = (($amount < 0 || $payment || $supp_trans) ? $item['purchasing_gl_code'] : 
                                                        $item['sales_gl_code']);
                                                if (!$supp_trans)       
                                                        $cart->add_gl_item($code, 0, 0, $amount, $qe['description']);

diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index 693b6f92ea8c777cafc955c5136030e34083df31..a361a8b38b615e360d1524ede8a545034f83cf2d 100644 (file)
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -114,7 +114,7 @@ function invoice_header(&$supp_trans)
 
        label_row(_("Tax Group:"), $supp_trans->tax_description);
 
-       end_outer_table();
+       end_outer_table(1);
 }
 
 //--------------------------------------------------------------------------------------------------

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index af34e04c126150e2d37463a153f7a5755e3bb796..6dcd5cbaae1ba6f0f23758b5c8132b733269ea0b 100644 (file)
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -334,6 +334,7 @@ if ($id4 != -1)
        $Ajax->activate('inv_tot');
 }
 
+$id2 = -1;
 if ($_SESSION["wa_current_user"]->access == 2)
 {
        $id3 = find_submit('void_item_id');