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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e7780ac 5739aeb)

author	Denis Ledoux <dle@odoo.com>
	Wed, 23 Jul 2014 11:16:59 +0000 (13:16 +0200)
committer	Denis Ledoux <dle@odoo.com>
	Wed, 23 Jul 2014 11:18:30 +0000 (13:18 +0200)
commit	a5f7891b689a325dd33e1d0ade0ea003f2785f60
tree	b94604a3bf144a33ac623c2552f7af962b383661	tree \| snapshot
parent	e7780ac97a6a45dcf295d4aa86509b00efdf618d	commit \| diff
parent	5739aebfb1711bb94c2f94bfb03ec12f17e9430d	commit \| diff

[MERGE] forward port of branch saas-4 up to 5739aebfb1711bb94c2f94bfb03ec12f17e9430d

16 files changed:

addons/account/account_move_line.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_phonecall.py	diff1 \|	diff2 \|	blob \| history
addons/hr_payroll/hr_payroll.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_followers.py	diff1 \|	diff2 \|	blob \| history
addons/mail/tests/test_mail_features.py	diff1 \|	diff2 \|	blob \| history
addons/procurement/wizard/schedulers_all.py	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/project/project_view.xml	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/website_crm/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_forum/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_forum/models/forum.py	diff1 \|	diff2 \|	blob \| history
addons/website_mail/views/website_mail.xml	diff1 \|	diff2 \|	blob \| history
addons/website_mail_group/views/website_mail_group.xml	diff1 \|	diff2 \|	blob \| history
addons/website_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/views/templates.xml	diff1 \|	\|	blob \| history

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