[MERGE] Merge with lp:openobject-addons
authorsbh (Open ERP) <sbh@tinyerp.com>
Thu, 30 Sep 2010 05:28:13 +0000 (10:58 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Thu, 30 Sep 2010 05:28:13 +0000 (10:58 +0530)
commit7b1b0739414e7aff5cbb3aa187921c5ff1b82d15
tree6b72d3c91238f5eba2c207fc0abae9a92eb76002
parent47502593c67c2f0e03b66420e8c942c1d29f8e1f
parent97546e5b0696cf176d5feedd3bef18a9f0ea05de
[MERGE] Merge with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20100930052813-81bdbjinqnf1ws0y
addons/mrp/mrp_view.xml
addons/procurement/procurement_view.xml
addons/product/product.py
addons/sale/sale.py
addons/stock/stock.py
addons/stock/stock_view.xml
addons/stock_planning/stock_planning.py