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

author	Christophe Simonis <chs@odoo.com>
	Sun, 22 Jun 2014 13:30:57 +0000 (15:30 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Sun, 22 Jun 2014 13:30:57 +0000 (15:30 +0200)
commit	1f20f61ab4f6acf79f4db6ba9a17c1282014ef5f
tree	c7c529d2dfa15a007eebbf8fe90d830d157adaa7	tree \| snapshot
parent	4be9142c117423326203b5812f7ac9d19c673608	commit \| diff
parent	75884c3e1a06f9f6c2ffd4ab272287369f9a325c	commit \| diff

[MERGE] forward port of branch saas-3 up to 75884c3

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/ir/ir_http.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/module/module.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_config.py	diff1 \|	diff2 \|	blob \| history
openerp/http.py	diff1 \|	diff2 \|	blob \| history
openerp/service/server.py	diff1 \|	diff2 \|	blob \| history