[MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al.
authorDarshan Kalola (OpenERP) <dka@tinyerp.com>
Wed, 8 Jan 2014 09:36:59 +0000 (15:06 +0530)
committerDarshan Kalola (OpenERP) <dka@tinyerp.com>
Wed, 8 Jan 2014 09:36:59 +0000 (15:06 +0530)
commita9e87b56ce6a3582b001c2eabe0785c2f7c5f4fe
treef0d94b4a1e0a8efba51401fad6ce5656023498f6
parentca6c0857125d6567b3f55c450d00bb52838a5b6a
parent56e5fc3c05ab939d087e2d64240897965e922f28
[MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al.

bzr revid: dka@tinyerp.com-20140108093659-c9it34gll0ipcll2
addons/product/__openerp__.py
addons/product/product.py
addons/product/product_data.xml
addons/product/product_demo.xml
addons/product/product_view.xml
addons/product/security/product_security.xml
addons/purchase/purchase_view.xml
addons/stock/product_view.xml
addons/stock/stock_view.xml
addons/website_sale/views/website_sale_backend.xml