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

[MERGE] Foward-port saas-5 up to ee4df1e

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

addons/account/account_analytic_line.py	diff1 \|	diff2 \|	blob \| history
addons/account/account_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/crm/base_partner_merge.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_thread.py	diff1 \|	diff2 \|	blob \| history
addons/mass_mailing/models/mass_mailing.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/chrome.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/xml/base.xml	diff1 \|	diff2 \|	blob \| history
openerp/models.py	diff1 \|	\|	blob \| history