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

author	Quentin (OpenERP) <qdp-launchpad@openerp.com>
	Thu, 17 Oct 2013 12:13:49 +0000 (14:13 +0200)
committer	Quentin (OpenERP) <qdp-launchpad@openerp.com>
	Thu, 17 Oct 2013 12:13:49 +0000 (14:13 +0200)
commit	eddd2f357512082278b45c43c5a2de59bbba3569
tree	868dd61ff8a46363e1835d7b60d037240763d393	tree \| snapshot
parent	66b0500f3c1344ae212164d2425af8cd1156089a	commit \| diff
parent	68e1c6c3d69028bc3e1db66c50e3a38e83a64795	commit \| diff

[MERGE] merged with main feature branch

bzr revid: qdp-launchpad@openerp.com-20131017121349-xyip1fn6j0itiz56

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

addons/purchase/purchase.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase_view.xml	diff1 \|	diff2 \|	blob \| history
addons/sale_stock/sale_stock.py	diff1 \|	diff2 \|	blob \| history
addons/stock/product.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock_view.xml	diff1 \|	diff2 \|	blob \| history