git.inspyration.org Git - odoo/odoo.git/commit - addons/product/product

author	Quentin (OpenERP) <qdp-launchpad@openerp.com>
	Fri, 25 Apr 2014 09:04:14 +0000 (11:04 +0200)
committer	Quentin (OpenERP) <qdp-launchpad@openerp.com>
	Fri, 25 Apr 2014 09:04:14 +0000 (11:04 +0200)
commit	7a6b00b651d96ec282c77723a80caf44e516fce3
tree	77fdd79f30b7630ffb257aa604b6d2f570ca2265	tree \| snapshot
parent	523734326363b87fd85a3b90f86bb3acb75b9b78	commit \| diff
parent	8522ae723c37e9b6ecfb7b00803049f50ffc7ce4	commit \| diff

[MERGE] merged with trunk up to revision 9381

bzr revid: qdp-launchpad@openerp.com-20140425090414-vpg4szws9y4fgznc

Unnamed repository; edit this file 'description' to name the repository.

addons/delivery/delivery_view.xml	diff1 \|	diff2 \|	blob \| history
addons/product/product_view.xml	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase.py	diff1 \|	diff2 \|	blob \| history
addons/purchase_requisition/purchase_requisition_view.xml	diff1 \|	diff2 \|	blob \| history
addons/purchase_requisition/wizard/purchase_requisition_partner.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock_view.xml	diff1 \|	diff2 \|	blob \| history