From 11f109f7a390bc2c02ccc245f5af4df06deba28d Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Sun, 22 Aug 2010 19:21:13 +0000 Subject: [PATCH 1/1] Fixed backward compatibility for cogs GL account setup --- purchasing/includes/db/invoice_db.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index 26ff38a4..fc3d1b9c 100644 --- 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);*/ -- 2.30.2