[MERGE] forward port of branch saas-2 up to revid 5014 mat@openerp.com-20140220145701...
authorChristophe Simonis <chs@openerp.com>
Thu, 20 Feb 2014 16:05:48 +0000 (17:05 +0100)
committerChristophe Simonis <chs@openerp.com>
Thu, 20 Feb 2014 16:05:48 +0000 (17:05 +0100)
commit65db3c635eea5324676c8f85d13e0058d66ce1b9
tree6975b6422d74a5929faa1616440693f15ba6aa5a
parentd24b67ed3ec568e3eb5b4296519e28a2721314b2
parent67866db5b62929cdbef7324a0bbee3980ac99e6a
[MERGE] forward port of branch saas-2 up to revid 5014 mat@openerp.com-20140220145701-6y7s1roj88q7ys13

bzr revid: chs@openerp.com-20140220160548-0rhulha4cml6t08v
openerp/addons/base/ir/ir_actions.py
openerp/addons/base/res/res_company.py
openerp/addons/base/res/res_company_view.xml
openerp/addons/base/tests/test_base.py
openerp/addons/base/tests/test_fields.py
openerp/osv/orm.py