[MERGE] Forward-port of latest saas-2 bugfixes, up to rev.5012 revid:mat@openerp...
authorMartin Trigaux <mat@openerp.com>
Wed, 19 Feb 2014 14:06:17 +0000 (15:06 +0100)
committerMartin Trigaux <mat@openerp.com>
Wed, 19 Feb 2014 14:06:17 +0000 (15:06 +0100)
commitc83247c38b69d7bda0c791ec066d3c0b699e5824
tree815dfd18ea880d22f9c9e2b228b74e2d6eae3431
parent035ad1331618fa0d7c7b6881ded0d09ad2d19a72
parente635ebe6c1ebbde9c7d53bbf92e975c6f64bbd9c
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev.5012 revid:mat@openerp.com-20140219134943-60ssztc01cxdtk09

bzr revid: mat@openerp.com-20140219140617-na0q47yaloblb67i
openerp/addons/base/ir/ir_actions.py
openerp/addons/base/res/res_users.py
openerp/osv/fields.py
openerp/osv/orm.py
openerp/service/db.py