[MERGE] forward port of branch 7.0 up to 4bfcbb2
authorChristophe Simonis <chs@odoo.com>
Wed, 25 Jun 2014 09:35:11 +0000 (11:35 +0200)
committerChristophe Simonis <chs@odoo.com>
Wed, 25 Jun 2014 09:35:11 +0000 (11:35 +0200)
commita1b3e22a17c0a5f0ecfae0723e349899bcccc273
tree9c19b837c38a7607dc287194633d93754a651342
parente1e0cfbba83bc5e91216338ccf9f09f289f9e845
parent4bfcbb2a480db6b72b6db84420a39dcf641bbbb1
[MERGE] forward port of branch 7.0 up to 4bfcbb2
addons/crm_claim/crm_claim.py
openerp/osv/expression.py
openerp/osv/fields.py