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

author	Frédéric van der Essen <fva@openerp.com>
	Mon, 14 May 2012 15:50:31 +0000 (17:50 +0200)
committer	Frédéric van der Essen <fva@openerp.com>
	Mon, 14 May 2012 15:50:31 +0000 (17:50 +0200)
commit	f2051414f71d239217fe928aee9dbc7ed6501d4a
tree	db6df7b96d1c3a89a48013f5a94fe435e53a80ec	tree \| snapshot
parent	bce82f1800e6069ddfb3d8b9aca9ef7b29df149c	commit \| diff
parent	43ed050319ab1627ac99677b3012a73c06fa77ad	commit \| diff

[MERGE] trunk

bzr revid: fva@openerp.com-20120514155031-x7h0f12110g2gqhb

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

addons/account/account_view.xml	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/wizard/pos_close_statement.xml	diff1 \|	diff2 \|	blob \| history
addons/procurement/procurement_view.xml	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history