From e1face140a007355cdeea1725c02d10cb34c80dd Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Sun, 21 Dec 2008 09:47:43 +0000 Subject: [PATCH] Minor bugs in layout and quick entries. --- CHANGELOG.txt | 6 ++++++ includes/ui/ui_view.inc | 2 +- purchasing/includes/ui/invoice_ui.inc | 2 +- purchasing/supplier_invoice.php | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ba348321..55cf64e1 100644 --- 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 643ea449..2b0905c0 100644 --- 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 693b6f92..a361a8b3 100644 --- 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 af34e04c..6dcd5cba 100644 --- 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'); -- 2.30.2