Fixed backward compatibility for cogs GL account setup

diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc
index 26ff38a4fd674ee3dcdd899c4592a14e6f03f988..fc3d1b9c04b56506b221c6c45740ebde8790b01a 100644 (file)
--- a/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@ -201,11 +201,13 @@ 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 = (is_inventory_item($entered_grn->item_code) ? $stock_gl_code["inventory_account"] : $stock_gl_code["cogs_account"]);
+               $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"]));
 
                $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $supplier_accounts["purchase_account"],
                        $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
-                       $entered_grn->this_quantity_inv * $line_taxfree, $supp_trans->supplier_id);             
+                       $entered_grn->this_quantity_inv * $line_taxfree, $supp_trans->supplier_id);
                /*$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);*/