[MERGE] forward port of branch 7.0 up to revid 5270 chs@openerp.com-20140403084524... saas-2
authorChristophe Simonis <chs@openerp.com>
Thu, 3 Apr 2014 08:48:08 +0000 (10:48 +0200)
committerChristophe Simonis <chs@openerp.com>
Thu, 3 Apr 2014 08:48:08 +0000 (10:48 +0200)
commit1c3ee251f0213b2fb83de99be8a50e630447e191
tree59b9202b6d4ffcb78c302fb95206fb43ec317dfc
parent822ef4a6211b8dfebc1be25b290265a58833c1f8
parent6fca27626a16e2be953d9093713ec7ec8d662ab5
[MERGE] forward port of branch 7.0 up to revid 5270 chs@openerp.com-20140403084524-9rb174osjrbmhgwc

bzr revid: chs@openerp.com-20140402083506-w4cywcf0kxxx9xmk
bzr revid: chs@openerp.com-20140312174526-a5rhh83g0fw8djuc
bzr revid: chs@openerp.com-20140318105837-53vsx5g7fm517cuc
bzr revid: dle@openerp.com-20140326092548-bu4bqinhvco8j5wj
bzr revid: chs@openerp.com-20140402092735-3a23yjl169vvt0iv
bzr revid: chs@openerp.com-20140402112825-ky8rcb3p467ikitc
bzr revid: chs@openerp.com-20140403084808-slnj7uis17kwi9js
addons/web/static/src/js/core.js
openerp/cli/server.py
openerp/netsvc.py
openerp/osv/expression.py
openerp/osv/fields.py
openerp/osv/orm.py