Merge lp:~jean-lelievre/purchase-report/product_inventory_warning into lp:~purchase-core-editors/purchase-report/7.0

[Jean LELIEVRE ElicoCorp]

[ADD] Add the module product_inventory_warning

Product Inventory Warning
==================================================

Add a wizard to calculate the QTY of product.

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

Hello Jean,

Based on the description of the MP and the module, I would say that the feature is already in OpenERP (OpenERP already provides the qty of product). I think you should add some documentation to explain what OpenERP doesn't do, what your module brings and how to use it.

Please fix PEP8 issues and add the pot file.

I have never seen a module with so much SQL queries. I would be interested to know how it scales.

Otherwise LGTM.

Thanks for your work!

review: Needs Fixing (code review)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

No changes since 2013-11-10 after Need Fixing request -> I set this in WIP

@Jean LELIEVRE

Please do the required changes then set it in Needs Review again

Here you will find the community coding Guide Lines
which applies to new code and code ported from old version.
https://doc.openerp.com/contribute/05_developing_modules/#community-guidelines

Cheers,
Yannick

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

Hello,

The management of the project has moved to Github: https://github.com/OCA/purchase-reporting

Please migrate your merge proposal to Github. You may want to check https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub for an explanation on how to proceed.

Thanks for contributing to the project

review: Needs Resubmitting

Unmerged revisions

11. By Jean LELIEVRE ElicoCorp on 2013-08-26

[ADD] Add the module product_inventory_warning.

=== added directory 'product_inventory_warning'
=== added file 'product_inventory_warning/__init__.py'
--- product_inventory_warning/__init__.py	1970-01-01 00:00:00 +0000
+++ product_inventory_warning/__init__.py	2013-08-26 08:54:27 +0000
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: Andy Lu <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import product
+import wizard
+#import sale_compare
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 \ No newline at end of file
 
=== added file 'product_inventory_warning/__openerp__.py'
--- product_inventory_warning/__openerp__.py	1970-01-01 00:00:00 +0000
+++ product_inventory_warning/__openerp__.py	2013-08-26 08:54:27 +0000
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author:    Andy Lu <[e-mail]>
+#               LIN Yu <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Product Inventory Warning',
+    'version': '1',
+    'category': 'Product',
+    'sequence': 1,
+    'summary': 'Product Inventory Warning',
+    'description': """
+Product Inventory Warning
+==================================================
+
+Add a wizard to calculate the QTY of product.
+    """,
+    'author': 'Elico Corp',
+    'website': 'http://www.elico-corp.com',
+    'images' : [],
+    'depends': ['product', 'product_stock_type','product_separate_cost','stock_with_cost'],
+    'data': [
+        'product_view.xml',
+        'wizard/product_qty_view.xml',
+        'wizard/product_sfc_view.xml',
+        'security/ir.model.access.csv',
+    ],
+    'test': [],
+    'demo': [],
+    'installable': True,
+    'auto_install': False,
+    'application': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added directory 'product_inventory_warning/i18n'
=== added file 'product_inventory_warning/i18n/zh_CN.po'
--- product_inventory_warning/i18n/zh_CN.po	1970-01-01 00:00:00 +0000
+++ product_inventory_warning/i18n/zh_CN.po	2013-08-26 08:54:27 +0000
@@ -0,0 +1,315 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* fc_product
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-17 08:19+0000\n"
+"PO-Revision-Date: 2013-05-17 08:19+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: fc_product
+#: view:product.inventory:0
+#: field:product.inventory,category_id:0
+#: view:product.inventory.dates:0
+#: field:product.inventory.dates,category_id:0
+msgid "Category"
+msgstr "种类"
+
+#. module: fc_product
+#: field:product.inventory,code:0
+#: field:product.inventory.dates,code:0
+msgid "SKU"
+msgstr "SKU"
+
+#. module: fc_product
+#: field:run.product.inventory.dates,from_date:0
+msgid "From"
+msgstr "开始"
+
+#. module: fc_product
+#: field:product.inventory.dates,produce_qty:0
+msgid "Production Quantity"
+msgstr "生产数量"
+
+#. module: fc_product
+#: model:ir.model,name:fc_product.model_run_product_inventory_dates
+msgid "Compute Product Inventory betweend dates"
+msgstr "根据时间生成产品粗困报表"
+
+#. module: fc_product
+#: field:run.product.inventory.dates,to_date:0
+msgid "To"
+msgstr "到"
+
+#. module: fc_product
+#: field:product.inventory.dates,start_value:0
+msgid "Start Value"
+msgstr "起初金额"
+
+#. module: fc_product
+#: field:product.inventory,ondraft_qty:0
+msgid "Not Confirm Quantity"
+msgstr "未审核采购数"
+
+#. module: fc_product
+#: field:product.inventory.dates,end_qty:0
+msgid "End Quantity"
+msgstr "期末数量"
+
+#. module: fc_product
+#: model:ir.model,name:fc_product.model_run_product_inventory
+#: view:run.product.inventory:0
+msgid "Compute Product Inventory"
+msgstr "计算产品库存"
+
+#. module: fc_product
+#: field:product.inventory.dates,consume_qty:0
+msgid "Consumption Quantity"
+msgstr "消耗数量"
+
+#. module: fc_product
+#: code:addons/fc_product/wizard/product_sfc.py:61
+#: code:addons/fc_product/wizard/sale_compare_wizard.py:61
+#: model:ir.actions.act_window,name:fc_product.action_product_inventory_dates_tree
+#: model:ir.model,name:fc_product.model_product_inventory_dates
+#: model:ir.ui.menu,name:fc_product.menu_action_product_inventory_dates_tree
+#: view:product.inventory.dates:0
+#, python-format
+msgid "Product Inventory between dates"
+msgstr "期间产品库存"
+
+#. module: fc_product
+#: field:product.inventory,onorder_qty:0
+msgid "Future Quantity"
+msgstr "预测数量"
+
+#. module: fc_product
+#: code:addons/fc_product/product.py:104
+#: code:addons/fc_product/product.py:106
+#: field:product.inventory,name_en:0
+#: field:product.inventory,name_sort_en:0
+#, python-format
+msgid "Name EN"
+msgstr "英文名"
+
+#. module: fc_product
+#: field:product.inventory.dates,start_qty:0
+msgid "Beginning Quantity"
+msgstr "起初数量"
+
+#. module: fc_product
+#: view:product.inventory:0
+#: field:product.inventory,stock_type_id:0
+#: view:product.inventory.dates:0
+#: field:product.inventory.dates,stock_type_id:0
+msgid "Stock Type"
+msgstr "仓储种类"
+
+#. module: fc_product
+#: field:product.inventory,date:0
+msgid "Creation Date"
+msgstr "创建时间"
+
+#. module: fc_product
+#: code:addons/fc_product/wizard/product_qty.py:55
+#: model:ir.model,name:fc_product.model_product_inventory
+#: view:product.inventory:0
+#, python-format
+msgid "Product Inventory"
+msgstr "产品库存"
+
+#. module: fc_product
+#: field:product.inventory.dates,produce_value:0
+msgid "Production Value"
+msgstr "生产金额"
+
+#. module: fc_product
+#: field:product.inventory,product_safe_qty:0
+#: field:product.product,product_safe_qty:0
+msgid "Minimum stock warning Quantity"
+msgstr "最小库存数量"
+
+#. module: fc_product
+#: code:addons/fc_product/sale_compare.py:63
+#, python-format
+msgid "ERP sub total"
+msgstr "ERP sub total"
+
+#. module: fc_product
+#: field:product.inventory.dates,consume_value:0
+msgid "Consumption Value"
+msgstr "消耗金额"
+
+#. module: fc_product
+#: code:addons/fc_product/product.py:101
+#: field:product.inventory,joomla_unit_cn:0
+#, python-format
+msgid "Website Product Unit in CN"
+msgstr "中文采购单位"
+
+#. module: fc_product
+#: field:product.inventory,onhand_qty:0
+msgid "Onhand Quantity"
+msgstr "在手数量"
+
+#. module: fc_product
+#: field:product.inventory,uom_id:0
+#: field:product.inventory.dates,uom_id:0
+msgid "UoM"
+msgstr "单位"
+
+#. module: fc_product
+#: field:product.inventory.dates,scrap_value:0
+msgid "Scrap Value"
+msgstr "报废金额"
+
+#. module: fc_product
+#: field:product.inventory.dates,to_date:0
+msgid "End Date"
+msgstr "结束时间"
+
+#. module: fc_product
+#: view:run.product.inventory:0
+#: view:run.product.inventory.dates:0
+msgid "Compute"
+msgstr "计算"
+
+#. module: fc_product
+#: view:run.product.inventory.dates:0
+msgid "Compute Product Inventory based on current stock moves and dates"
+msgstr "根据当前调拨和日期计算产品库存"
+
+#. module: fc_product
+#: view:run.product.inventory:0
+msgid "Compute Product Inventory based on current stock moves"
+msgstr "根据库存调拨计算产品数量"
+
+#. module: fc_product
+#: model:ir.actions.act_window,name:fc_product.action_product_inventory_tree
+#: model:ir.ui.menu,name:fc_product.menu_action_product_inventory_tree
+msgid "Product Inventory Warning"
+msgstr "最小库存报警"
+
+#. module: fc_product
+#: model:ir.model,name:fc_product.model_product_product
+#: view:product.inventory:0
+#: view:product.inventory.dates:0
+#: field:product.inventory.dates,product_id:0
+msgid "Product"
+msgstr "产品"
+
+#. module: fc_product
+#: model:ir.actions.act_window,name:fc_product.action_run_product_inventory
+#: model:ir.ui.menu,name:fc_product.menu_action_run_product_inventory
+msgid "Compute Product Inventory Warning"
+msgstr "计算最小库存报警"
+
+#. module: fc_product
+#: field:product.inventory.dates,end_price:0
+msgid "End Price"
+msgstr "期末价格"
+
+#. module: fc_product
+#: field:product.inventory,product_id:0
+msgid "Products"
+msgstr "产品"
+
+#. module: fc_product
+#: code:addons/fc_product/product.py:100
+#: field:product.inventory,joomla_unit:0
+#, python-format
+msgid "Website Product Unit"
+msgstr "产品单位中文"
+
+#. module: fc_product
+#: field:product.inventory.dates,sale_value:0
+msgid "Sale Value"
+msgstr "销售金额"
+
+#. module: fc_product
+#: field:product.inventory.dates,sale_qty:0
+msgid "Sale Quantity"
+msgstr "销售数量"
+
+#. module: fc_product
+#: model:ir.actions.act_window,name:fc_product.action_run_product_inventory_dates
+#: model:ir.ui.menu,name:fc_product.menu_action_run_product_inventory_dates
+#: view:run.product.inventory.dates:0
+msgid "Compute Product Inventory between dates"
+msgstr "根据日期计算产品库存"
+
+#. module: fc_product
+#: field:product.inventory.dates,buy_value:0
+msgid "Purchase Value"
+msgstr "采购金额"
+
+#. module: fc_product
+#: view:product.inventory:0
+msgid "Out of Stock"
+msgstr "缺货产品"
+
+#. module: fc_product
+#: model:ir.model,name:fc_product.model_product_template
+#: field:product.inventory.dates,product_tmpl_id:0
+msgid "Product Template"
+msgstr "产品模板"
+
+#. module: fc_product
+#: field:product.inventory.dates,scrap_qty:0
+msgid "Scrap Quantity"
+msgstr "Scrap Quantity"
+
+#. module: fc_product
+#: field:product.inventory,out_stock:0
+msgid "Out Stock"
+msgstr "Out Stock"
+
+#. module: fc_product
+#: view:product.inventory:0
+#: view:product.inventory.dates:0
+msgid "Group by..."
+msgstr "分组..."
+
+#. module: fc_product
+#: field:product.inventory.dates,end_value:0
+msgid "End Value"
+msgstr "期末金额"
+
+#. module: fc_product
+#: view:run.product.inventory:0
+#: view:run.product.inventory.dates:0
+msgid "_Cancel"
+msgstr "_取消"
+
+#. module: fc_product
+#: code:addons/fc_product/product.py:105
+#: code:addons/fc_product/product.py:107
+#: field:product.inventory,name_cn:0
+#: field:product.inventory,name_sort_cn:0
+#, python-format
+msgid "Name CN"
+msgstr "中文名"
+
+#. module: fc_product
+#: field:product.inventory.dates,from_date:0
+msgid "Start Date"
+msgstr "开始时间"
+
+#. module: fc_product
+#: field:product.inventory.dates,start_price:0
+msgid "Start Price"
+msgstr "开始价格"
+
+#. module: fc_product
+#: field:product.inventory.dates,buy_qty:0
+msgid "Purchase Quantity"
+msgstr "采购数量"
+
 
=== added file 'product_inventory_warning/product.py'
--- product_inventory_warning/product.py	1970-01-01 00:00:00 +0000
+++ product_inventory_warning/product.py	2013-08-26 08:54:27 +0000
@@ -0,0 +1,613 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: Yannick Gouin <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it wil    l be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+import openerp.addons.decimal_precision as dp
+import time, pytz
+from datetime import datetime
+from tools.translate import _
+        
+class product_product(osv.osv):
+    _inherit = 'product.product'
+      
+    _columns = {
+        'product_safe_qty': fields.float('Minimum stock warning Quantity', digits_compute=dp.get_precision('Product Unit of Measure')),
+    }
+    _defaults = {    
+        'product_safe_qty': 0.0,
+    }
+product_product()
+
+
+class product_inventory(osv.osv):
+    _name = 'product.inventory'
+    _description = 'Product Inventory'
+    _rec_name = "code"
+    _order = 'code'
+    
+    _columns = {
+        'product_id':    fields.many2one('product.product', 'Products', required=True),
+        'onhand_qty':    fields.float("Onhand Quantity", digits_compute=dp.get_precision('Product Unit of Measure')),        
+        'onorder_qty':   fields.float("Future Quantity", digits_compute=dp.get_precision('Product Unit of Measure')),
+        'ondraft_qty':   fields.float("Not Confirm Quantity", digits_compute=dp.get_precision('Product Unit of Measure')),
+        'date':          fields.datetime('Creation Date'),
+        'category_id':   fields.many2one('product.category',string='Category'),
+        'stock_type_id': fields.many2one('product.stock_type',string='Stock Type'),
+        'uom_id':        fields.many2one('product.uom',string='UoM'),
+        'code':          fields.char('SKU', size=128,),
+        'product_safe_qty': fields.float('Minimum stock warning Quantity', digits_compute=dp.get_precision('Product Unit of Measure')),
+        'name': fields.related('product_id', 'name', string=_('Name'), type='char', size=128),
+        'out_stock':fields.boolean("Out Stock"),
+    }
+    _defaults = {
+        'onhand_qty': 0.0,
+        'onorder_qty': 0.0,
+        'ondraft_qty': 0.0,
+        'product_safe_qty': 0.0,
+        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+    }    
+    
+    
+    def compute_inventory(self, cr, uid, context=None):
+        #prod_obj = self.pool.get('product.product')
+        cr.execute("""TRUNCATE TABLE product_inventory""")
+        cr.execute("""INSERT INTO product_inventory( product_id, date) SELECT id,current_timestamp at time zone 'UTC' FROM product_product WHERE active AND id IN (SELECT distinct product_id FROM stock_move ) ORDER BY id""")
+        cr.execute("""INSERT INTO product_inventory( product_id, date) SELECT product_id,current_timestamp at time zone 'UTC' FROM purchase_order_line WHERE product_id NOT IN (SELECT distinct product_id FROM stock_move ) ORDER BY product_id""")
+        cr.execute("""
+                UPDATE product_inventory AS i 
+                SET code = p.default_code, category_id = t.categ_id,
+                    stock_type_id = t.stock_type_id, uom_id = t.uom_id, product_safe_qty = p.product_safe_qty
+                FROM product_product p, product_template t
+                WHERE i.product_id = p.id AND p.product_tmpl_id = t.id""")
+        
+        #onhand_qty
+        cr.execute("""
+                UPDATE product_inventory 
+                SET onhand_qty = sl.product_qty 
+                FROM 
+                    (SELECT m.product_id, round(coalesce(sum(m.product_qty * pu.factor / u.factor), 0.0),3) AS product_qty
+                    FROM stock_move m
+                        LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                        LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+                        LEFT JOIN product_uom u ON (m.product_uom=u.id)  
+                    WHERE m.state = 'done'
+                    AND m.location_id NOT IN (SELECT distinct d.id 
+                                              FROM stock_warehouse w, stock_location h, stock_location d
+                                              WHERE w.lot_stock_id = h.id 
+                                              AND d.parent_left >= h.parent_left 
+                                              AND d.parent_right <= h.parent_right)
+                    AND m.location_dest_id IN (SELECT distinct d.id 
+                                               FROM stock_warehouse w, stock_location h, stock_location d
+                                               WHERE w.lot_stock_id = h.id 
+                                               AND d.parent_left >= h.parent_left 
+                                               AND d.parent_right <= h.parent_right)
+                    GROUP BY m.product_id ORDER BY m.product_id) sl
+                WHERE product_inventory.product_id = sl.product_id """)
+        
+        # Useless, no ?
+        #cr.execute("""UPDATE product_inventory SET onhand_qty = 0.0 WHERE coalesce(onhand_qty,0.0) = 0.0""")
+        
+        cr.execute("""
+                UPDATE product_inventory SET onhand_qty = onhand_qty - sl.product_qty 
+                FROM 
+                    (SELECT m.product_id, round(coalesce(sum(m.product_qty * pu.factor / u.factor), 0.0),3) AS product_qty
+                    FROM stock_move m
+                        LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                        LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+                        LEFT JOIN product_uom u ON (m.product_uom=u.id)  
+                    WHERE m.state = 'done'
+                    AND m.location_id IN (SELECT distinct d.id 
+                                          FROM stock_warehouse w, stock_location h, stock_location d
+                                          WHERE w.lot_stock_id = h.id 
+                                          AND d.parent_left >= h.parent_left 
+                                          AND d.parent_right <= h.parent_right)
+                    AND m.location_dest_id NOT IN (SELECT distinct d.id 
+                                                   FROM stock_warehouse w, stock_location h, stock_location d
+                                                   WHERE w.lot_stock_id = h.id 
+                                                   AND d.parent_left >= h.parent_left 
+                                                   AND d.parent_right <= h.parent_right)
+                    GROUP BY m.product_id ORDER BY m.product_id) sl
+                WHERE product_inventory.product_id = sl.product_id """)
+        
+        
+        #onorder_qty
+        cr.execute("""
+                UPDATE product_inventory SET onorder_qty = sl.product_qty 
+                FROM 
+                    (SELECT m.product_id, round(coalesce(sum(m.product_qty * pu.factor / u.factor), 0.0),3) AS product_qty
+                    FROM stock_move m
+                        LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                        LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+                        LEFT JOIN product_uom u ON (m.product_uom=u.id)  
+                    WHERE m.state != 'cancel' AND m.state != 'new'
+                    AND m.location_id NOT IN (SELECT distinct d.id 
+                                              FROM stock_warehouse w, stock_location h, stock_location d
+                                              WHERE w.lot_stock_id = h.id 
+                                              AND d.parent_left >= h.parent_left 
+                                              AND d.parent_right <= h.parent_right)
+                    AND m.location_dest_id IN (SELECT distinct d.id 
+                                               FROM stock_warehouse w, stock_location h, stock_location d
+                                               WHERE w.lot_stock_id = h.id 
+                                               AND d.parent_left >= h.parent_left 
+                                               AND d.parent_right <= h.parent_right)
+                    GROUP BY m.product_id ORDER BY m.product_id) sl
+                WHERE product_inventory.product_id = sl.product_id """)
+        
+        # Useless, no ?
+        #cr.execute("""UPDATE product_inventory SET onorder_qty = 0.0 WHERE coalesce(onorder_qty,0.0) = 0.0""")
+        
+        cr.execute("""
+                UPDATE product_inventory SET onorder_qty = onorder_qty - sl.product_qty 
+                FROM 
+                    (SELECT m.product_id, round(coalesce(sum(m.product_qty * pu.factor / u.factor), 0.0),3) AS product_qty
+                    FROM stock_move m
+                        LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                        LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+                        LEFT JOIN product_uom u ON (m.product_uom=u.id)  
+                    WHERE m.state != 'cancel' AND m.state != 'new'
+                    AND m.location_id IN (SELECT distinct d.id 
+                                          FROM stock_warehouse w, stock_location h, stock_location d
+                                          WHERE w.lot_stock_id = h.id 
+                                          AND d.parent_left >= h.parent_left 
+                                          AND d.parent_right <= h.parent_right)
+                    AND m.location_dest_id NOT IN (SELECT distinct d.id 
+                                                   FROM stock_warehouse w, stock_location h, stock_location d
+                                                   WHERE w.lot_stock_id = h.id 
+                                                   AND d.parent_left >= h.parent_left 
+                                                   AND d.parent_right <= h.parent_right)
+                    GROUP BY m.product_id ORDER BY m.product_id) sl
+                WHERE product_inventory.product_id = sl.product_id """)
+        
+        
+        #ondraft_qty
+        cr.execute("""
+                UPDATE product_inventory SET ondraft_qty = sl.product_qty 
+                FROM 
+                    (SELECT m.product_id, round(coalesce(sum(m.product_qty * pu.factor / u.factor), 0.0),3) AS product_qty
+                    FROM purchase_order_line m
+                        LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                        LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+                        LEFT JOIN product_uom u ON (m.product_uom=u.id)  
+                    WHERE m.state = 'draft'
+                    GROUP BY m.product_id ORDER BY m.product_id) sl
+                WHERE product_inventory.product_id = sl.product_id """)
+        
+        # Useless, no ?
+        #cr.execute("""UPDATE product_inventory SET ondraft_qty = 0.0 WHERE coalesce(ondraft_qty,0.0) = 0.0""")
+        
+        cr.execute("""UPDATE product_inventory SET out_stock = True WHERE onhand_qty < product_safe_qty""")
+        return True
+
+product_inventory()
+
+
+class product_inventory_dates(osv.osv):
+    _name = 'product.inventory.dates'
+    _description = 'Product Inventory between dates'
+    _rec_name = "code"
+    _order = 'code'
+    
+    _columns = {
+        'product_id':      fields.many2one('product.product', 'Product', required=True),
+        'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True),
+        'start_qty':       fields.float("Beginning Quantity", digits_compute=dp.get_precision('Product Unit of Measure')),        
+        'buy_qty':         fields.float("Purchase Quantity", digits_compute=dp.get_precision('Product Unit of Measure')),
+        'sale_qty':        fields.float("Sale Quantity", digits_compute=dp.get_precision('Product Unit of Measure')),
+        'scrap_qty':       fields.float("Scrap Quantity", digits_compute=dp.get_precision('Product Unit of Measure')),        
+        'consume_qty':     fields.float("Consumption Quantity", digits_compute=dp.get_precision('Product Unit of Measure')),
+        'produce_qty':     fields.float("Production Quantity", digits_compute=dp.get_precision('Product Unit of Measure')),
+        'end_qty':         fields.float("End Quantity", digits_compute=dp.get_precision('Product Unit of Measure')),
+        'start_value':     fields.float("Start Value", digits_compute=dp.get_precision('Account')),
+        'start_price':     fields.float("Start Price", digits_compute=dp.get_precision('Account')),
+        'buy_value':       fields.float("Purchase Value", digits_compute=dp.get_precision('Account')),
+        'sale_value':      fields.float("Sale Value", digits_compute=dp.get_precision('Account')),
+        'scrap_value':     fields.float("Scrap Value", digits_compute=dp.get_precision('Account')),        
+        'consume_value':   fields.float("Consumption Value", digits_compute=dp.get_precision('Account')),
+        'produce_value':   fields.float("Production Value", digits_compute=dp.get_precision('Account')),
+        'end_value':       fields.float("End Value", digits_compute=dp.get_precision('Account')),
+        'end_price':       fields.float("End Price", digits_compute=dp.get_precision('Account')),
+        'category_id':     fields.many2one('product.category',string='Category'),
+        'stock_type_id':   fields.many2one('product.stock_type',string='Stock Type'),
+        'uom_id':          fields.many2one('product.uom',string='UoM'),
+        'code':            fields.char('SKU', size=128,),
+        'from_date':       fields.datetime('Start Date'),
+        'to_date':         fields.datetime('End Date'),
+        'prod_active':          fields.boolean("Product Active?"),
+    }
+    _defaults = {
+        'start_qty': 0.00,
+        'end_qty': 0.00,
+        'scrap_qty': 0.00,
+        'consume_qty': 0.00,
+        'produce_qty': 0.00,
+        'buy_qty': 0.00,
+        'sale_qty':0.00,
+    }
+
+
+    def _auto_init(self, cr, context=None):
+        super(product_inventory_dates, self)._auto_init(cr, context=context)
+        ###### Create Stored Function which calculated the Start and End prices ######
+        cr.execute("SELECT proname FROM pg_catalog.pg_proc WHERE proname = 'set_product_inventory_dates_prices'")
+        if not cr.fetchone():
+            cr.execute("""
+                CREATE OR REPLACE FUNCTION set_product_inventory_dates_prices() RETURNS integer AS $$
+                DECLARE
+                    inventory RECORD;
+                    product_value numeric(5);
+                BEGIN
+                    FOR inventory IN (SELECT product_id, product_tmpl_id, from_date, to_date FROM product_inventory_dates) LOOP
+                        -- Start Price
+                        product_value := 0;
+                        SELECT standard_price INTO product_value
+                        FROM product_price_history
+                        WHERE date <= inventory.from_date
+                        AND template_id = inventory.product_tmpl_id
+                        ORDER BY date DESC LIMIT 1;
+                        
+                        IF NOT FOUND THEN
+                            UPDATE product_inventory_dates SET start_price=0.0 WHERE product_id=inventory.product_id;
+                        ELSE
+                            UPDATE product_inventory_dates SET start_price=product_value WHERE product_id=inventory.product_id;
+                        END IF;
+                        
+                        -- End Price
+                        product_value := 0;
+                        SELECT standard_price INTO product_value
+                        FROM product_price_history
+                        WHERE date <= inventory.to_date
+                        AND template_id = inventory.product_tmpl_id
+                        ORDER BY date DESC LIMIT 1;
+                        
+                        IF NOT FOUND THEN
+                            UPDATE product_inventory_dates SET end_price=0.0 WHERE product_id=inventory.product_id;
+                        ELSE
+                            UPDATE product_inventory_dates SET end_price=product_value WHERE product_id=inventory.product_id;
+                        END IF;
+                        
+                    END LOOP;
+                    RETURN 1;
+                END;
+                $$ LANGUAGE plpgsql;""")
+            cr.commit()
+        ###### /END: Create Stored Functions ######
+    
+
+
+    def compute_inventory(self, cr, uid, context=None):
+        from_date = context.get('from_date','2013-04-01')
+        to_date = context.get('to_date','2099-12-31')
+
+        cr.execute("""TRUNCATE TABLE product_inventory_dates""")
+        
+        cr.execute("""INSERT INTO product_inventory_dates(product_id, product_tmpl_id, prod_active, from_date, to_date) 
+                SELECT id, product_tmpl_id, active, %s, %s FROM product_product 
+                ORDER BY default_code""", (from_date, to_date))
+
+        cr.execute("""
+                UPDATE product_inventory_dates AS i 
+                SET code = p.default_code, uom_id = t.uom_id, category_id=t.categ_id, stock_type_id = t.stock_type_id,
+                    scrap_qty=0.000, consume_qty=0.000, produce_qty=0.000, buy_qty=0.000,sale_qty=0.000
+                FROM product_product p, product_template t
+                WHERE i.product_id = p.id AND p.product_tmpl_id = t.id""")
+        
+        cr.execute("""SELECT * FROM set_product_inventory_dates_prices()""")
+        
+        #start
+        cr.execute("""
+                UPDATE product_inventory_dates 
+                SET start_qty = sl.product_qty, start_value = round(coalesce((sl.product_qty * product_inventory_dates.start_price), 0.0),3) 
+                FROM 
+                    (SELECT m.product_id, round(coalesce(sum(m.product_qty * pu.factor / u.factor), 0.0),3) AS product_qty
+                    FROM stock_move m
+                        LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                        LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+                        LEFT JOIN product_uom u ON (m.product_uom=u.id)  
+                    WHERE m.state = 'done' AND m.date <= %s
+                        AND m.location_id NOT IN (SELECT distinct d.id
+                                                  FROM stock_warehouse w, stock_location h, stock_location d
+                                                  WHERE w.lot_stock_id = h.id 
+                                                      AND d.parent_left >= h.parent_left 
+                                                      AND d.parent_right <= h.parent_right)
+                        AND m.location_dest_id IN (SELECT distinct d.id 
+                                                   FROM stock_warehouse w, stock_location h, stock_location d
+                                                   WHERE w.lot_stock_id = h.id 
+                                                       AND d.parent_left >= h.parent_left 
+                                                       AND d.parent_right <= h.parent_right)
+                    GROUP BY m.product_id ORDER BY m.product_id) sl
+                WHERE product_inventory_dates.product_id = sl.product_id """, (from_date,))
+        
+        # Useless, no ?
+        #cr.execute("""UPDATE product_inventory_dates SET start_qty = 0.0 WHERE coalesce(start_qty,0.0) = 0.0""")
+        
+        cr.execute("""
+                UPDATE product_inventory_dates 
+                SET start_qty = start_qty - sl.product_qty, start_value = start_value - round(coalesce((sl.product_qty * product_inventory_dates.start_price), 0.0),3)
+                FROM 
+                    (SELECT m.product_id, round(coalesce(sum(m.product_qty * pu.factor / u.factor), 0.0),3) AS product_qty
+                    FROM stock_move m 
+                        LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                        LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+                        LEFT JOIN product_uom u ON (m.product_uom=u.id)  
+                    WHERE m.state = 'done' AND m.date <= %s
+                        AND m.location_id IN (SELECT distinct d.id  
+                                              FROM stock_warehouse w, stock_location h, stock_location d
+                                              WHERE w.lot_stock_id = h.id 
+                                                  AND d.parent_left >= h.parent_left 
+                                                  AND d.parent_right <= h.parent_right)
+                        AND m.location_dest_id NOT IN (SELECT distinct d.id 
+                                                       FROM stock_warehouse w, stock_location h, stock_location d 
+                                                       WHERE w.lot_stock_id = h.id 
+                                                           AND d.parent_left >= h.parent_left 
+                                                           AND d.parent_right <= h.parent_right)
+                    GROUP BY m.product_id ORDER BY m.product_id) sl
+                WHERE product_inventory_dates.product_id = sl.product_id """, (from_date,))
+        
+        
+        #end
+        cr.execute("""
+                UPDATE product_inventory_dates  
+                SET end_qty = sl.product_qty, end_value = round(coalesce((sl.product_qty * product_inventory_dates.end_price), 0.0),3)
+                FROM 
+                    (SELECT m.product_id, round(coalesce(sum(m.product_qty * pu.factor / u.factor), 0.0),3) AS product_qty
+                    FROM stock_move m
+                        LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                        LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+                        LEFT JOIN product_uom u ON (m.product_uom=u.id)  
+                    WHERE m.state = 'done' AND m.date <= %s 
+                        AND m.location_id NOT IN (SELECT distinct d.id 
+                                                  FROM stock_warehouse w, stock_location h, stock_location d
+                                                  WHERE w.lot_stock_id = h.id 
+                                                      AND d.parent_left >= h.parent_left 
+                                                      AND d.parent_right <= h.parent_right)
+                        AND m.location_dest_id IN (SELECT distinct d.id 
+                                                   FROM stock_warehouse w, stock_location h, stock_location d
+                                                   WHERE w.lot_stock_id = h.id 
+                                                       AND d.parent_left >= h.parent_left 
+                                                       AND d.parent_right <= h.parent_right)
+                    GROUP BY m.product_id ORDER BY m.product_id) sl
+                WHERE product_inventory_dates.product_id = sl.product_id """, (to_date,))
+        
+        # Useless, no ?
+        #cr.execute("""UPDATE product_inventory_dates SET end_qty = 0.0 WHERE coalesce(end_qty,0.0) = 0.0""")
+        
+        cr.execute("""
+                UPDATE product_inventory_dates 
+                SET end_qty = end_qty - sl.product_qty, end_value = end_value - round(coalesce((sl.product_qty * product_inventory_dates.end_price), 0.0),3)
+                FROM 
+                    (SELECT m.product_id, round(coalesce(sum(m.product_qty * pu.factor / u.factor), 0.0),3) AS product_qty
+                    FROM stock_move m 
+                        LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                        LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+                        LEFT JOIN product_uom u ON (m.product_uom=u.id)  
+                    WHERE m.state = 'done' AND m.date <= %s
+                        AND m.location_id IN (SELECT distinct d.id 
+                                              FROM stock_warehouse w, stock_location h, stock_location d
+                                              WHERE w.lot_stock_id = h.id 
+                                                  AND d.parent_left >= h.parent_left 
+                                                  AND d.parent_right <= h.parent_right)
+                        AND m.location_dest_id NOT IN (SELECT distinct d.id 
+                                                       FROM stock_warehouse w, stock_location h, stock_location d
+                                                       WHERE w.lot_stock_id = h.id 
+                                                           AND d.parent_left >= h.parent_left 
+                                                           AND d.parent_right <= h.parent_right)
+                    GROUP BY m.product_id ORDER BY m.product_id) sl
+                WHERE product_inventory_dates.product_id = sl.product_id """, (to_date,))
+        
+        
+        #buy
+        cr.execute("""
+                UPDATE product_inventory_dates 
+                SET buy_qty = sl.product_qty, buy_value = sl.product_value 
+                FROM 
+                    (SELECT m.product_id, round(coalesce(sum(m.product_qty * pu.factor / u.factor),0.0),3) AS product_qty,
+                            round(coalesce(sum(m.amount_total), 0.0),3) AS product_value
+                    FROM stock_move m
+                        LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                        LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+                        LEFT JOIN product_uom u ON (m.product_uom=u.id)  
+                    WHERE m.state = 'done' AND m.date >= %s AND m.date <= %s
+                        AND m.location_id IN (SELECT id FROM stock_location WHERE usage='supplier')
+                        AND m.location_dest_id NOT IN (SELECT id FROM stock_location WHERE usage='supplier')
+                    GROUP BY m.product_id ORDER BY m.product_id) sl
+                WHERE product_inventory_dates.product_id = sl.product_id """, (from_date, to_date,))
+        #po_price for return is negative
+        cr.execute("""
+                UPDATE product_inventory_dates 
+                SET buy_qty = buy_qty - sl.product_qty, buy_value = buy_value + sl.product_value 
+                FROM 
+                    (SELECT m.product_id, round(coalesce(sum(m.product_qty * pu.factor / u.factor),0.0),3) AS product_qty,
+                            round(coalesce(sum(m.amount_total), 0.0),3) AS product_value
+                    FROM stock_move m
+                        LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                        LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+                        LEFT JOIN product_uom u ON (m.product_uom=u.id)  
+                    WHERE m.state = 'done' AND m.date >= %s AND m.date <= %s
+                        AND m.location_id NOT IN (SELECT id FROM stock_location WHERE usage='supplier')
+                        AND m.location_dest_id IN (SELECT id FROM stock_location WHERE usage='supplier')
+                    GROUP BY m.product_id ORDER BY m.product_id) sl
+                WHERE product_inventory_dates.product_id = sl.product_id """, (from_date, to_date,))
+
+
+        #sale
+        cr.execute("""
+                UPDATE product_inventory_dates 
+                SET sale_qty = sl.product_qty, sale_value = sl.product_value 
+                FROM 
+                    (SELECT m.product_id, round(coalesce(sum(m.product_qty * pu.factor / u.factor), 0.0),3) AS product_qty,
+                            round(coalesce(sum(m.product_qty * pu.factor / u.factor * m.price_unit), 0.0),3) AS product_value
+                    FROM stock_move m
+                        LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                        LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+                        LEFT JOIN product_uom u ON (m.product_uom=u.id)  
+                    WHERE m.state = 'done' AND m.date >= %s AND m.date <= %s
+                        AND m.location_id NOT IN (SELECT id FROM stock_location WHERE usage='customer')
+                        AND m.location_dest_id IN (SELECT id FROM stock_location WHERE usage='customer')
+                    GROUP BY m.product_id ORDER BY m.product_id) sl
+                WHERE product_inventory_dates.product_id = sl.product_id """, (from_date, to_date,))
+        
+        cr.execute("""
+                UPDATE product_inventory_dates 
+                SET sale_qty = sale_qty - sl.product_qty, sale_value = sale_value - sl.product_value 
+                FROM 
+                    (SELECT m.product_id, round(coalesce(sum(m.product_qty * pu.factor / u.factor), 0.0),3) AS product_qty,
+                            round(coalesce(sum(m.product_qty * pu.factor / u.factor * m.price_unit), 0.0),3) AS product_value
+                    FROM stock_move m
+                        LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                        LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+                        LEFT JOIN product_uom u ON (m.product_uom=u.id)  
+                    WHERE m.state = 'done' AND m.date >= %s AND m.date <= %s
+                        AND m.location_id IN (SELECT id FROM stock_location WHERE usage='customer')
+                        AND m.location_dest_id NOT IN (SELECT id FROM stock_location WHERE usage='customer')
+                    GROUP BY m.product_id ORDER BY m.product_id) sl
+                WHERE product_inventory_dates.product_id = sl.product_id """, (from_date, to_date,))
+        
+
+        #scrap
+        cr.execute("""
+                UPDATE product_inventory_dates 
+                SET scrap_qty = sl.product_qty, scrap_value = sl.product_value 
+                FROM 
+                    (SELECT m.product_id, round(coalesce(sum(m.product_qty * pu.factor / u.factor), 0.0),3) AS product_qty,
+                            round(coalesce(sum(m.product_qty * pu.factor / u.factor * m.price_unit), 0.0),3) AS product_value
+                    FROM stock_move m
+                        LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                        LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+                        LEFT JOIN product_uom u ON (m.product_uom=u.id)  
+                    WHERE m.state = 'done' AND m.date >= %s AND m.date <= %s
+                        AND m.location_id IN (SELECT id FROM stock_location WHERE usage='inventory')
+                        AND m.location_dest_id NOT IN (SELECT id FROM stock_location WHERE usage='inventory')
+                    GROUP BY m.product_id ORDER BY m.product_id) sl
+                WHERE product_inventory_dates.product_id = sl.product_id """, (from_date, to_date,))
+        
+        cr.execute("""
+                UPDATE product_inventory_dates 
+                SET scrap_qty = scrap_qty - sl.product_qty, scrap_value = scrap_value - sl.product_value 
+                FROM 
+                    (SELECT m.product_id, round(coalesce(sum(m.product_qty * pu.factor / u.factor), 0.0),3) AS product_qty,
+                            round(coalesce(sum(m.product_qty * pu.factor / u.factor * m.price_unit), 0.0),3) AS product_value
+                    FROM stock_move m
+                        LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                        LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+                        LEFT JOIN product_uom u ON (m.product_uom=u.id)  
+                    WHERE m.state = 'done' AND m.date >= %s AND m.date <= %s
+                        AND m.location_id NOT IN (SELECT id FROM stock_location WHERE usage='inventory')
+                        AND m.location_dest_id IN (SELECT id FROM stock_location WHERE usage='inventory')
+                    GROUP BY m.product_id ORDER BY m.product_id) sl
+                WHERE product_inventory_dates.product_id = sl.product_id """, (from_date, to_date,))
+
+
+        #consume
+        cr.execute("""
+                UPDATE product_inventory_dates 
+                SET consume_qty = sl.product_qty, consume_value = sl.product_value 
+                FROM 
+                    (SELECT m.product_id, round(coalesce(sum(m.product_qty * pu.factor / u.factor), 0.0),3) AS product_qty,
+                            round(coalesce(sum(m.product_qty * pu.factor / u.factor * m.price_unit), 0.0),3) AS product_value
+                    FROM stock_move m
+                        --INNER JOIN mrp_production_move_ids mp on m.id = mp.move_id
+                        LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                        LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+                        LEFT JOIN product_uom u ON (m.product_uom=u.id)  
+                    WHERE m.state = 'done' AND m.date >= %s AND m.date <= %s
+                        AND m.location_id NOT IN (SELECT id FROM stock_location WHERE usage='production')
+                        AND m.location_dest_id IN (SELECT id FROM stock_location WHERE usage='production')
+                    GROUP BY m.product_id ORDER BY m.product_id) sl
+                WHERE product_inventory_dates.product_id = sl.product_id """, (from_date, to_date,))
+        
+        cr.execute("""
+                UPDATE product_inventory_dates 
+                SET consume_qty = consume_qty - sl.product_qty, consume_value = consume_value - sl.product_value 
+                FROM 
+                    (SELECT m.product_id, round(coalesce(sum(m.product_qty * pu.factor / u.factor), 0.0),3) AS product_qty,
+                            round(coalesce(sum(m.product_qty * pu.factor / u.factor * m.price_unit), 0.0),3) AS product_value
+                    FROM stock_move m
+                        --INNER JOIN mrp_production_move_ids mp on m.id = mp.move_id
+                        LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                        LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+                        LEFT JOIN product_uom u ON (m.product_uom=u.id)  
+                    WHERE m.state = 'done' AND m.date >= %s AND m.date <= %s
+                        AND m.location_id IN (SELECT id FROM stock_location WHERE usage='production')
+                        AND m.location_dest_id NOT IN (SELECT id FROM stock_location WHERE usage='production')
+                    GROUP BY m.product_id ORDER BY m.product_id) sl
+                WHERE product_inventory_dates.product_id = sl.product_id """, (from_date, to_date,))
+
+
+        #produce
+        cr.execute("""
+                UPDATE product_inventory_dates 
+                SET produce_qty = sl.product_qty, produce_value = sl.product_value 
+                FROM 
+                    (SELECT m.product_id, round(coalesce(sum(m.product_qty * pu.factor / u.factor), 0.0),3) AS product_qty,
+                            round(coalesce(sum(m.product_qty * pu.factor / u.factor * m.price_unit), 0.0),3) AS product_value
+                    FROM stock_move m
+                        LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                        LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+                        LEFT JOIN product_uom u ON (m.product_uom=u.id)  
+                    WHERE m.state = 'done' AND m.date >= %s AND m.date <= %s
+                        AND m.production_id IS NOT NULL
+                        AND m.location_id IN (SELECT id FROM stock_location WHERE usage='production')
+                        AND m.location_dest_id NOT IN (SELECT id FROM stock_location WHERE usage='production')
+                    GROUP BY m.product_id ORDER BY m.product_id) sl
+                WHERE product_inventory_dates.product_id = sl.product_id """, (from_date, to_date,))
+        
+        cr.execute("""
+                UPDATE product_inventory_dates 
+                SET produce_qty = produce_qty - sl.product_qty, produce_value = produce_value - sl.product_value 
+                FROM 
+                    (SELECT m.product_id, round(coalesce(sum(m.product_qty * pu.factor / u.factor), 0.0),3) AS product_qty,
+                            round(coalesce(sum(m.product_qty * pu.factor / u.factor * m.price_unit), 0.0),3) AS product_value
+                    FROM stock_move m
+                        LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                        LEFT JOIN product_uom pu ON (pt.uom_id=pu.id)
+                        LEFT JOIN product_uom u ON (m.product_uom=u.id)  
+                    WHERE m.state = 'done' AND m.date >= %s AND m.date <= %s
+                        AND m.production_id IS NOT NULL
+                        AND m.location_id NOT IN (SELECT id FROM stock_location WHERE usage='production')
+                        AND m.location_dest_id IN (SELECT id FROM stock_location WHERE usage='production')
+                    GROUP BY m.product_id ORDER BY m.product_id) sl
+                WHERE product_inventory_dates.product_id = sl.product_id """, (from_date, to_date,))
+        
+        return True
+
+product_inventory_dates()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'product_inventory_warning/product_view.xml'
--- product_inventory_warning/product_view.xml	1970-01-01 00:00:00 +0000
+++ product_inventory_warning/product_view.xml	2013-08-26 08:54:27 +0000
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>        
+       <record id="product_normal_form_view_safeqty" model="ir.ui.view">
+            <field name="name">product.normal.form.safeqty</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='incoming_qty']" position="before">
+                    <field name="product_safe_qty"/>
+                </xpath>
+            </field>
+        </record>
+        
+        <record id="view_product_inventory_tree" model="ir.ui.view">
+            <field name="name">product.inventory.tree</field>
+            <field name="model">product.inventory</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Product Inventory" colors="red:onhand_qty &lt; product_safe_qty" >
+                    <field name="stock_type_id"/>
+                	<field name="category_id"/>
+                    <field name="product_id"/>
+                    <field name="name"/>
+                    <field name="onhand_qty"/>
+                    <field name="onorder_qty"/>
+                    <field name="uom_id"/>
+                    <field name="ondraft_qty"/>
+                    <field name="product_safe_qty"/>
+                    <field name="code" invisible="1"/>
+                    <field name="date"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_product_inventory_search" model="ir.ui.view">
+            <field name="name">product.inventory.search</field>
+            <field name="model">product.inventory</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Product Inventory">
+                    <field name="product_id"/>
+                    <field name="stock_type_id"/>
+                    <field name="category_id"/>
+                    <field name="onhand_qty"/>
+                    <filter string='Out of Stock' icon="terp-mrp" domain="[('out_stock','=',True)]"/>
+                   <group  expand='0' string='Group by...'>
+                       <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'category_id'}"/>
+                       <filter string='Stock Type' icon="terp-mrp" domain="[]" context="{'group_by' : 'stock_type_id'}"/>
+                       <filter string='Product' icon="terp-go-home" domain="[]" context="{'group_by' : 'product_id'}"/>
+                   </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="action_product_inventory_tree" model="ir.actions.act_window">
+            <field name="name">Product Inventory Warning</field>
+            <field name="res_model">product.inventory</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="search_view_id" ref="view_product_inventory_search"/>
+            <field name="limit">60</field>
+        </record>
+
+        <menuitem
+            id="menu_action_product_inventory_tree"
+            parent="purchase.menu_procurement_management_product"
+            action="action_product_inventory_tree"
+            sequence = "95"/>
+            
+            
+        <record id="view_product_inventory_dates_tree" model="ir.ui.view">
+            <field name="name">product.inventory.dates.tree</field>
+            <field name="model">product.inventory.dates</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Product Inventory between dates">
+                    <field name="stock_type_id"/>
+                	<field name="category_id"/>
+                    <field name="product_id"/>
+                    <field name="start_qty" sum="Start Qty"/>
+                    <field name="start_value" sum="Start Value"/>
+                    <field name="buy_qty" sum="Buy Qty"/>
+                    <field name="buy_value" sum="Buy Value"/>
+                    <field name="sale_qty" sum="Sale Qty"/>
+                    <field name="sale_value" sum="Sale Value"/>
+                    <field name="scrap_qty" sum="Scrap Qty"/>
+                    <field name="scrap_value" sum="Scrap Value"/>
+                    <field name="consume_qty" sum="Consume Qty"/>
+                    <field name="consume_value" sum="Consume Value"/>
+                    <field name="produce_qty" sum="Produce Qty"/>
+                    <field name="produce_value" sum="Produce Value"/>
+                    <field name="end_qty" sum="End Qty"/>
+                    <field name="end_value" sum="End Value"/>
+                    <field name="code" invisible="1"/>
+                    <field name="uom_id"/>
+                    <field name="from_date"/>
+                    <field name="to_date"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_product_inventory_dates_search" model="ir.ui.view">
+            <field name="name">product.inventory.dates.search</field>
+            <field name="model">product.inventory.dates</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Product Inventory between dates">
+                    <field name="product_id"/>
+                    <field name="stock_type_id"/>
+                    <field name="category_id"/>
+                   <group  expand='0' string='Group by...'>
+                       <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'category_id'}"/>
+                       <filter string='Stock Type' icon="terp-mrp" domain="[]" context="{'group_by' : 'stock_type_id'}"/>
+                       <filter string='To Date' icon="terp-go-home" domain="[]" context="{'group_by' : 'to_date'}"/>
+                   </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="action_product_inventory_dates_tree" model="ir.actions.act_window">
+            <field name="name">Product Inventory between dates</field>
+            <field name="res_model">product.inventory.dates</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="search_view_id" ref="view_product_inventory_dates_search"/>
+            <field name="limit">60</field>
+        </record>
+
+        <menuitem
+            id="menu_action_product_inventory_dates_tree"
+            parent="purchase.menu_procurement_management_product"
+            action="action_product_inventory_dates_tree"
+            sequence = "97"/>
+    </data>
+</openerp>
 
=== added directory 'product_inventory_warning/security'
=== added file 'product_inventory_warning/security/ir.model.access.csv'
--- product_inventory_warning/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ product_inventory_warning/security/ir.model.access.csv	2013-08-26 08:54:27 +0000
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_product_inventory_wro,product_inventory wro,product_inventory_warning.model_product_inventory,stock.group_stock_user,1,0,0,0
+access_product_inventorydates_wro,product_inventory_dates wro,product_inventory_warning.model_product_inventory_dates,stock.group_stock_user,1,0,0,0
 \ No newline at end of file
 
=== added directory 'product_inventory_warning/wizard'
=== added file 'product_inventory_warning/wizard/__init__.py'
--- product_inventory_warning/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ product_inventory_warning/wizard/__init__.py	2013-08-26 08:54:27 +0000
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: Andy Lu <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import product_qty
+import product_sfc
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'product_inventory_warning/wizard/product_qty.py'
--- product_inventory_warning/wizard/product_qty.py	1970-01-01 00:00:00 +0000
+++ product_inventory_warning/wizard/product_qty.py	2013-08-26 08:54:27 +0000
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-Today Elico Corp. All Rights Reserved.
+#    Author: Andy Lu <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+from osv import fields, osv
+from tools.translate import _
+
+class product_qty(osv.osv_memory):
+    _name = "run.product.inventory"
+    _description = "Compute Product Inventory"
+    _columns = {
+
+    }
+
+    def compute_inventory(self, cr, uid, ids, context=None):
+        """ To compute inventory.
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: the ID or list of IDs if we want more than one
+        @param context: A standard dictionary
+        @return:
+        """
+        if context is None:
+            context = {}
+
+        pi_obj = self.pool.get('product.inventory')
+        pi_obj.compute_inventory(cr, uid)
+
+        mod_obj = self.pool.get('ir.model.data')
+
+        res = mod_obj.get_object_reference(cr, uid, 'product_inventory_warning', 'view_product_inventory_tree')
+        res_id = res and res[1] or False,
+
+        return {
+            'name': _('Product Inventory'),
+            'view_type': 'form',
+            'view_mode': 'tree',
+            'view_id': res_id,
+            'res_model': 'product.inventory',
+            'context': "{}",
+            'type': 'ir.actions.act_window',
+            'target': 'current',
+            'res_id': False,
+        }
+        #return {'type': 'ir.actions.act_window_close'}
+
+product_qty()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'product_inventory_warning/wizard/product_qty_view.xml'
--- product_inventory_warning/wizard/product_qty_view.xml	1970-01-01 00:00:00 +0000
+++ product_inventory_warning/wizard/product_qty_view.xml	2013-08-26 08:54:27 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_run_product_inventory" model="ir.ui.view">
+            <field name="name">Compute Product Inventory</field>
+            <field name="model">run.product.inventory</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Compute Product Inventory">
+                    <separator string="Compute Product Inventory based on current stock moves" colspan="4" />
+                    <separator string="" colspan="4" />
+                    <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
+                    <button name="compute_inventory" string="Compute" type="object" icon="gtk-ok"/>
+             </form>
+            </field>
+        </record>
+
+        <act_window name="Compute Product Inventory Warning"            
+            res_model="run.product.inventory"
+            view_mode="form"
+            target="new"
+            context="{}"  
+            id="action_run_product_inventory"/>
+
+        <menuitem
+            id="menu_action_run_product_inventory"
+            parent="purchase.menu_procurement_management_product"
+            action="action_run_product_inventory"
+            sequence = "90"/>
+    </data>
+</openerp>
 
=== added file 'product_inventory_warning/wizard/product_sfc.py'
--- product_inventory_warning/wizard/product_sfc.py	1970-01-01 00:00:00 +0000
+++ product_inventory_warning/wizard/product_sfc.py	2013-08-26 08:54:27 +0000
@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-Today Elico Corp. All Rights Reserved.
+#    Author: Andy Lu <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+from osv import fields, osv
+from tools.translate import _
+import time
+
+class product_sfc(osv.osv_memory):
+    _name = "run.product.inventory.dates"
+    _description = "Compute Product Inventory betweend dates"
+    _columns = {
+                
+        'from_date': fields.datetime('From', required=True), 
+        'to_date': fields.datetime('To', required=True),
+
+    }
+    _defaults = {
+        'from_date': lambda *a: time.strftime('%Y-%m-%d 16:00:00'),
+        'to_date': lambda *a: time.strftime('%Y-%m-%d 15:59:59'),
+    }
+
+    def compute_inventory(self, cr, uid, ids, context=None):
+        """ To compute inventory.
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: the ID or list of IDs if we want more than one
+        @param context: A standard dictionary
+        @return:
+        """
+        if context is None:
+            context = {}
+        data = self.browse(cr, uid, ids, context=context)[0]        
+        context['from_date'] = data.from_date
+        context['to_date'] = data.to_date
+
+        pi_obj = self.pool.get('product.inventory.dates')
+        pi_obj.compute_inventory(cr, uid, context)
+
+        mod_obj = self.pool.get('ir.model.data')
+
+        res = mod_obj.get_object_reference(cr, uid, 'product_inventory_warning', 'view_product_inventory_dates_tree')
+        res_id = res and res[1] or False,
+
+        return {
+            'name': _('Product Inventory between dates'),
+            'view_type': 'form',
+            'view_mode': 'tree',
+            'view_id': res_id,
+            'res_model': 'product.inventory.dates',
+            'context': "{}",
+            'type': 'ir.actions.act_window',
+            'target': 'current',
+            'res_id': False,
+        }
+        #return {'type': 'ir.actions.act_window_close'}
+
+product_sfc()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'product_inventory_warning/wizard/product_sfc_view.xml'
--- product_inventory_warning/wizard/product_sfc_view.xml	1970-01-01 00:00:00 +0000
+++ product_inventory_warning/wizard/product_sfc_view.xml	2013-08-26 08:54:27 +0000
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_run_product_inventory" model="ir.ui.view">
+            <field name="name">Compute Product Inventory</field>
+            <field name="model">run.product.inventory</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Compute Product Inventory">
+                    <separator string="Compute Product Inventory based on current stock moves" colspan="4" />
+                    <separator string="" colspan="4" />
+                    <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
+                    <button name="compute_inventory" string="Compute" type="object" icon="gtk-ok"/>
+             </form>
+            </field>
+        </record>
+
+        <act_window name="Compute Product Inventory Warning"            
+            res_model="run.product.inventory"
+            view_mode="form"
+            target="new"
+            context="{}"  
+            id="action_run_product_inventory"/>
+
+        <menuitem
+            id="menu_action_run_product_inventory"
+            parent="purchase.menu_procurement_management_product"
+            action="action_run_product_inventory"
+            sequence = "90"/>
+            
+
+        <record id="view_run_product_inventory_dates" model="ir.ui.view">
+            <field name="name">Compute Product Inventory between dates</field>
+            <field name="model">run.product.inventory.dates</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Compute Product Inventory between dates">
+                    <separator string="Compute Product Inventory based on current stock moves and dates" colspan="4" />
+                    <field name="from_date"/>
+                    <field name="to_date"/>
+                    <separator string="" colspan="4" />
+                    <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
+                    <button name="compute_inventory" string="Compute" type="object" icon="gtk-ok"/>
+             </form>
+            </field>
+        </record>
+
+        <act_window name="Compute Product Inventory between dates"            
+            res_model="run.product.inventory.dates"
+            view_mode="form"
+            target="new"
+            context="{}"  
+            id="action_run_product_inventory_dates"/>
+
+        <menuitem
+            id="menu_action_run_product_inventory_dates"
+            parent="purchase.menu_procurement_management_product"
+            action="action_run_product_inventory_dates"
+            sequence = "96"/>            
+    </data>
+</openerp>