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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 286ced7 6b8e972)

author	Christophe Simonis <chs@odoo.com>
	Tue, 10 Jun 2014 11:15:46 +0000 (13:15 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Tue, 10 Jun 2014 11:15:46 +0000 (13:15 +0200)
commit	a7c212573526436553505eeebec2069e60fd5f32
tree	ee1ffb56d841892937d4cea4ddba0f53bd29c8b1	tree \| snapshot
parent	286ced7183b746c9f580d47679150100068fe005	commit \| diff
parent	6b8e9727e5ab2e7b841c307d4700934048af8d37	commit \| diff

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

12 files changed:

addons/account_analytic_analysis/account_analytic_analysis.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/wizard/pos_payment.py	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
addons/web_kanban/static/src/css/kanban.css	diff1 \|	diff2 \|	blob \| history
addons/web_kanban/static/src/css/kanban.sass	diff1 \|	diff2 \|	blob \| history
addons/website/static/src/js/website.snippets.editor.js	diff1 \|	diff2 \|	blob \| history
addons/website/views/website_templates.xml	diff1 \|	diff2 \|	blob \| history
addons/website_event_track/views/website_event.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/module/module.py	diff1 \|	diff2 \|	blob \| history
openerp/netsvc.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history

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