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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 78457a1 0d4d9af)

author	Quentin (OpenERP) <qdp-launchpad@openerp.com>
	Wed, 26 Mar 2014 15:27:51 +0000 (16:27 +0100)
committer	Quentin (OpenERP) <qdp-launchpad@openerp.com>
	Wed, 26 Mar 2014 15:27:51 +0000 (16:27 +0100)
commit	e0b27b4ee8e2d26eeae98a4dbc69a3485f39a8a8
tree	a3887e48d1bdeaf27b04c5c4e636e677b9e1c586	tree \| snapshot
parent	78457a17ea7175c02baf823c296b5cefe1a52a03	commit \| diff
parent	0d4d9af5f4b7ca695e33af370848350b437c132e	commit \| diff

[MERGE] merged trunk up to revision 9251

bzr revid: qdp-launchpad@openerp.com-20140326152751-b6bo0fawrzmd71f0

13 files changed:

addons/mrp/mrp.py	diff1 \|	diff2 \|	blob \| history
addons/mrp_repair/mrp_repair.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/product/product_view.xml	diff1 \|	diff2 \|	blob \| history
addons/product_margin/product_margin.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase_view.xml	diff1 \|	diff2 \|	blob \| history
addons/sale/sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/sale_stock/sale_stock_view.xml	diff1 \|	diff2 \|	blob \| history
addons/stock/stock_view.xml	diff1 \|	diff2 \|	blob \| history
addons/stock/wizard/stock_change_product_qty.py	diff1 \|	diff2 \|	blob \| history
addons/stock/wizard/stock_move_view.xml	diff1 \|	diff2 \|	blob \| history

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