[MERGE]with lp:~openerp-dev/openobject-addons/trunk-imp-product-variant-another-amb...
authorDarshan Kalola (OpenERP) <dka@tinyerp.com>
Fri, 17 Jan 2014 07:00:28 +0000 (12:30 +0530)
committerDarshan Kalola (OpenERP) <dka@tinyerp.com>
Fri, 17 Jan 2014 07:00:28 +0000 (12:30 +0530)
commit21c54c95a21c4f4020f9c80eba6dc694e053e90e
tree74b29483c664038b43f54de6ba5b903279893d40
parentc25333099338c3a9c03d6b8950f098af42e9cf77
parent5d770d4b6f7adc2a8391eb03032cacf739f0c49e
[MERGE]with lp:~openerp-dev/openobject-addons/trunk-imp-product-variant-another-amb and remove unnecessary changes.

bzr revid: dka@tinyerp.com-20140117070028-9xglu0v31hjid18f
addons/product/product.py
addons/product/product_view.xml
addons/product/test/compute_price_margin.yml
addons/website_sale/static/src/js/website_sale.js
addons/website_sale/views/website_sale.xml