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

author	Christophe Simonis <chs@odoo.com>
	Fri, 12 Sep 2014 15:28:55 +0000 (17:28 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Fri, 12 Sep 2014 15:28:55 +0000 (17:28 +0200)
commit	fdc62713a5ac7a4f084a911311150fc6b9fe4a21
tree	39abc6760d9fa7a9b07e4af7b3983fda707d09ba	tree \| snapshot
parent	abba7aa2122f846f92cc31dceab3a2eb037d4de3	commit \| diff
parent	9b1cdea223b8b5bcc0decd3e55512b391e16673d	commit \| diff

[MERGE] forward port of branch 7.0 up to 9b1cdea

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

addons/hr_expense/hr_expense.py	diff1 \|	diff2 \|	blob \| history
addons/l10n_ro/res_partner.py	diff1 \|	diff2 \|	blob \| history
addons/mrp_repair/mrp_repair.py	diff1 \|	diff2 \|	blob \| history
addons/stock/wizard/stock_return_picking.py	diff1 \|	diff2 \|	blob \| history
addons/survey/wizard/survey_answer.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/chrome.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/data.js	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_mail_server.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history