[MERGE] with lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb and...
authorDarshan Kalola (OpenERP) <dka@tinyerp.com>
Thu, 21 Nov 2013 12:23:11 +0000 (17:53 +0530)
committerDarshan Kalola (OpenERP) <dka@tinyerp.com>
Thu, 21 Nov 2013 12:23:11 +0000 (17:53 +0530)
commitf19a433dbb807337144fc90dbb4d7d77ba1eacb0
treed119e8fcd7dac6f10a72ea01eab35d248f97391a
parent7d43b226ab8288e5f916e3b4074f38ed16a8be7c
parent17a5f388eb814d56bdc6eaafc4c78b3c5c70a4ee
[MERGE] with  lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb and change necessary code.

bzr revid: dka@tinyerp.com-20131121122311-629hbtetmqfrtfyg
addons/account_anglo_saxon/product_view.xml
addons/point_of_sale/point_of_sale_demo.xml
addons/product/product.py
addons/product/product_data.xml
addons/product/product_demo.xml
addons/product/product_image_demo.xml
addons/product/product_view.xml
addons/purchase/purchase_view.xml