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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e59077b bf53aed)

author	Christophe Simonis <chs@odoo.com>
	Thu, 19 Jun 2014 13:44:07 +0000 (15:44 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Thu, 19 Jun 2014 13:44:07 +0000 (15:44 +0200)
commit	5087612d1da85a8661f7aa124969b2ee9e155c10
tree	b876bacb13667313d5a070932b486b243d12295f	tree \| snapshot
parent	e59077b0f9b5dfcba4eb9da273c2656f4da29a75	commit \| diff
parent	bf53aeda9436310f493a77fc24f8cc35f362ec5b	commit \| diff

[MERGE] forward port of branch saas-3 up to bf53aed

19 files changed:

addons/account/account_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/account_analytic_analysis/account_analytic_analysis.py	diff1 \|	diff2 \|	blob \| history
addons/auth_oauth/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/gamification/models/challenge.py	diff1 \|	diff2 \|	blob \| history
addons/hr/hr.py	diff1 \|	diff2 \|	blob \| history
addons/hr/hr_view.xml	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_thread.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/css/base.css	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/css/base.sass	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/search.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	diff1 \|	diff2 \|	blob \| history
addons/web_calendar/static/src/js/web_calendar.js	diff1 \|	diff2 \|	blob \| history
addons/website/static/src/js/website.editor.js	diff1 \|	diff2 \|	blob \| history
addons/website_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_actions.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_actions.xml	diff1 \|	diff2 \|	blob \| history
openerp/osv/fields.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history

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