[FIX] fixes of bug introduced in the previous merge with trunk
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 26 Mar 2014 16:22:08 +0000 (17:22 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 26 Mar 2014 16:22:08 +0000 (17:22 +0100)
commit0d7e144492e7df91c8616272e4b1673b852dee7d
treeba6e1c22e16a7ad22bfcceb19912af6c33f1ab9e
parenta73211f83f24e3f393200603e8def597dacaca04
[FIX] fixes of bug introduced in the previous merge with trunk

bzr revid: qdp-launchpad@openerp.com-20140326162208-d5m8qr8gz8fel7q1
addons/product/product.py
addons/product_margin/product_margin.py