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

author	Christophe Simonis <chs@odoo.com>
	Sun, 22 Jun 2014 13:36:10 +0000 (15:36 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Sun, 22 Jun 2014 13:36:10 +0000 (15:36 +0200)
commit	e862ff7033dd001a84d7e0a192d0da7b11384bd9
tree	349a80be398aeb306d443239c88e522f66d43e39	tree \| snapshot
parent	0e595c418612d8236d63ec70c2f8dccb7cff3407	commit \| diff
parent	4cb5381deecdf28d2a0f6b1e7f4b16a611ec9de9	commit \| diff

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

Conflicts:
openerp/addons/base/module/wizard/base_module_upgrade_view.xml

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

addons/sale/sale.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/view_form.js	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/module/module_view.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/module/wizard/base_module_upgrade_view.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_config.py	diff1 \|	diff2 \|	blob \| history
openerp/http.py	diff1 \|	diff2 \|	blob \| history