[MERGE]merge with latest wms-trunk
authorCedric Snauwaert <csn@openerp.com>
Fri, 24 Jan 2014 09:44:19 +0000 (10:44 +0100)
committerCedric Snauwaert <csn@openerp.com>
Fri, 24 Jan 2014 09:44:19 +0000 (10:44 +0100)
commit70ec840eaf5afdc57735c9fbee62b976459e4b11
tree1e71e394db7a006be9362e6e3560f57858f08324
parent86e7d60e23643b4cadd32a7273824e5845fc2dc9
parent2d27b4c82459c05ca03ee4a83b97a69ff3dc72ec
[MERGE]merge with latest wms-trunk

bzr revid: csn@openerp.com-20140124094419-monnhyomr8721nbx
addons/product/product.py
addons/product/product_view.xml