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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 23436ca fa07bc8)

author	Christophe Simonis <chs@odoo.com>
	Wed, 30 Jul 2014 18:30:14 +0000 (20:30 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Wed, 30 Jul 2014 18:30:14 +0000 (20:30 +0200)
commit	e4cb5202a056ba0ad666af0268861e672a2cdab3
tree	7ffadb844202eaa8a4e3c6c9460b4a534ea34438	tree \| snapshot
parent	23436ca25943037a01a1ff435e05aaa32a9ffed3	commit \| diff
parent	fa07bc85329d825107f332053cecd2a51771823c	commit \| diff

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

19 files changed:

addons/account/account_move_line.py	diff1 \|	diff2 \|	blob \| history
addons/account_voucher/account_voucher.py	diff1 \|	diff2 \|	blob \| history
addons/delivery/delivery.py	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_thread.py	diff1 \|	diff2 \|	blob \| history
addons/project/report/project_report.py	diff1 \|	diff2 \|	blob \| history
addons/sale/res_config.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history
addons/survey/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/chrome.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/views.js	diff1 \|	diff2 \|	blob \| history
addons/website/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website/models/ir_http.py	diff1 \|	diff2 \|	blob \| history
addons/website/static/src/js/website.editor.js	diff1 \|	diff2 \|	blob \| history
addons/website_crm/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_crm_partner_assign/views/website_crm_partner_assign.xml	diff1 \|	diff2 \|	blob \| history
addons/website_membership/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_membership/views/website_membership.xml	diff1 \|	diff2 \|	blob \| history

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