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

author	Quentin (OpenERP) <qdp-launchpad@openerp.com>
	Mon, 24 Jun 2013 09:53:19 +0000 (11:53 +0200)
committer	Quentin (OpenERP) <qdp-launchpad@openerp.com>
	Mon, 24 Jun 2013 09:53:19 +0000 (11:53 +0200)
commit	dee5ace29b438849fe9520f5382c3cc571d5246c
tree	387a7593e96aa1721ea029c1785dacc67caeb303	tree \| snapshot
parent	8f68e390e22f62178f4306780ade2f63d3bba6d0	commit \| diff
parent	ea03ed65b60a352b41932b5a12001c3aef3d776f	commit \| diff

[MERGE] trunk

bzr revid: qdp-launchpad@openerp.com-20130624095319-sqkrnk4r1mst8nvk

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

addons/point_of_sale/point_of_sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/security/ir.model.access.csv	diff1 \|	diff2 \|	blob \| history
addons/purchase/stock.py	diff1 \|	diff2 \|	blob \| history
addons/stock/product.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history
addons/stock/wizard/stock_partial_move.py	diff1 \|	diff2 \|	blob \| history
addons/stock/wizard/stock_partial_picking.py	diff1 \|	diff2 \|	blob \| history
addons/stock/wizard/stock_return_picking.py	diff1 \|	diff2 \|	blob \| history