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

author	Christophe Simonis <chs@odoo.com>
	Tue, 21 Oct 2014 12:33:36 +0000 (14:33 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Tue, 21 Oct 2014 12:33:36 +0000 (14:33 +0200)
commit	262eb662de489d98b76dece7305b594399161014
tree	cc278cc262ef41b609fd04bcb2568ae738518a9a	tree \| snapshot
parent	d80376a43d378cdf3539f499aa1a5df6775b7375	commit \| diff
parent	22c390285f7ec44fb0b67ade35ce6c9f39c71f8e	commit \| diff

[MERGE] forward port of branch 8.0 up to d80376a

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

addons/mail/mail_thread.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/report/pos_order_report.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/js/models.js	diff1 \|	diff2 \|	blob \| history
addons/web/controllers/main.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_partner.py	diff1 \|	diff2 \|	blob \| history