git.inspyration.org Git - odoo/odoo.git/commit - addons/website_sale/controllers/main.py

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 82bb9b0 73d39a0)

author	Christophe Simonis <chs@odoo.com>
	Thu, 10 Jul 2014 20:49:53 +0000 (22:49 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Thu, 10 Jul 2014 20:49:53 +0000 (22:49 +0200)
commit	f654a7719bd9dc420a9c9ffb9f34e37ba52e796c
tree	505b56b478a3a01ba03c7dfd5e3b6d76adcd4f5e	tree \| snapshot
parent	82bb9b0880c6b453ba641c943ceb1f2264d998c2	commit \| diff
parent	73d39a0c8c8125fc7b1e888b1ed670f54711da6e	commit \| diff

[MERGE] forward port of branch saas-5 up to 73d39a0

16 files changed:

addons/account_analytic_analysis/account_analytic_analysis.py	diff1 \|	diff2 \|	blob \| history
addons/email_template/email_template.py	diff1 \|	diff2 \|	blob \| history
addons/event/event.py	diff1 \|	diff2 \|	blob \| history
addons/event_sale/event_sale.py	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/report/holidays_summary_report.py	diff1 \|	diff2 \|	blob \| history
addons/product/product_view.xml	diff1 \|	diff2 \|	blob \| history
addons/website/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website/views/website_templates.xml	diff1 \|	diff2 \|	blob \| history
addons/website_crm/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_crm_partner_assign/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_forum/models/forum.py	diff1 \|	diff2 \|	blob \| history
addons/website_partner/models/res_partner.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/views/templates.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_model.py	diff1 \|	diff2 \|	blob \| history
openerp/models.py	diff1 \|	\|	blob \| history

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