Wrong stock item code when processing supplier invoice

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index da37409bf740f8916e77b8836bee3e0def5aec37..e034b70816eda8b4102a682cd90eed2cee56600e 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -23,6 +23,8 @@ $ -> Affected files
 05-Sep-2010 Joe Hunt
 ! Release 2.3 RC
 $ version.php
+# Wrong stock item code when processing supplier invoice
+$ /purchasing/includes/db/invoice_db.inc
 
 04-Sep-2010 Joe Hunt
 # Fixed installed_extensions.php creation

diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc
index 16e25680ce5fa88d9efe97d9e21f611e169dda07..860820a160fca7b3783baedc011a036b0b63a230 100644 (file)
--- a/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@ -201,9 +201,8 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
                $line_taxfree = $entered_grn->taxfree_charge_price($supp_trans->tax_group_id);
                $line_tax = $entered_grn->full_charge_price($supp_trans->tax_group_id) - $line_taxfree;
                $stock_gl_code = get_stock_gl_code($entered_grn->item_code);
-               $iv_act = $supplier_accounts["purchase_account"] ? $supplier_accounts["purchase_account"] :
-                       ((is_inventory_item($entered_grn->item_code) ? $stock_gl_code["inventory_account"] 
-                               : $stock_gl_code["cogs_account"]));
+               $iv_act = (is_inventory_item($entered_grn->item_code) ? $stock_gl_code["inventory_account"] : 
+                       ($supplier_accounts["purchase_account"] ? $supplier_accounts["purchase_account"] : $stock_gl_code["cogs_account"]));
                $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $iv_act,
                        $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
                        $entered_grn->this_quantity_inv * $line_taxfree, $supp_trans->supplier_id);