From 0ee90d26e1d99c60c8a15b33e7b0200102e3fcea Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Fri, 17 May 2013 18:21:14 +0200 Subject: [PATCH] [FIX] Put stock_fifo_lifo.py before report import in init.py bzr revid: jco@openerp.com-20130517162114-3p7boe3km5zb01bn --- addons/stock/__init__.py | 3 ++- addons/stock/report/report_stock_move.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/stock/__init__.py b/addons/stock/__init__.py index af34462f6d6..48d3dec7620 100644 --- a/addons/stock/__init__.py +++ b/addons/stock/__init__.py @@ -22,9 +22,10 @@ from stock import * import partner import product +import stock_fifo_lifo import report import wizard import res_config -import stock_fifo_lifo + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py index e6fa9ad9af9..4f5bd3d7b6d 100644 --- a/addons/stock/report/report_stock_move.py +++ b/addons/stock/report/report_stock_move.py @@ -315,7 +315,8 @@ CREATE OR REPLACE view report_stock_valuation AS ( coalesce(sum(m.product_qty * pu.factor / pu2.factor)::decimal, 0.0) as product_qty, l.usage as location_dest_type, l_other.usage as location_src_type, - 1.0 as inventory_value + CASE WHEN ipcm.value_text in ('fifo','lifo') THEN coalesce(sum(m.price_unit * m.qty_remaining)::decimal, 0.0) + ELSE coalesce(sum(ip.value_float * m.qty_remaining)::decimal, 0.0) END as inventory_value FROM stock_move m LEFT JOIN stock_picking p ON (m.picking_id=p.id) @@ -332,7 +333,7 @@ CREATE OR REPLACE view report_stock_valuation AS ( GROUP BY p.name, m.id, m.product_id, m.product_uom, pt.categ_id, m.partner_id, m.location_id, m.location_dest_id, m.prodlot_id, m.date, m.state, l.usage, l.scrap_location, m.company_id, pt.uom_id, to_char(m.date, 'YYYY'), to_char(m.date, 'MM'), - pu2.factor, pu.factor, m.qty_remaining, l_other.usage + pu2.factor, pu.factor, m.qty_remaining, l_other.usage, ipcm.value_text, ip.value_float ) ); """)