summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-02-17 19:22:45 +0100
committerChristophe Simonis <chs@odoo.com>2016-02-17 19:22:45 +0100
commit519dd27358864bf5a758ffd11f5c71a32e0b3098 (patch)
tree6611d46b2a27c244faee8ab5f6f4e5cd7915fb9e
parent5be43b8d9ae4485ac28e9afb7dd7cdecefb58abc (diff)
parentd5f28f4a64c2c03cb4313d1d22bf12d33ca88c00 (diff)
[MERGE] forward port of branch 9.0 up to d5f28f4
-rw-r--r--openerp/addons/base/res/res_partner.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index b0b4ddb04e3..1a51dec4f57 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -548,10 +548,8 @@ class res_partner(osv.Model, format_address):
@api.model
def create(self, vals):
- if vals.get('type') == 'delivery':
- vals['image'] = self.with_context(partner_type='delivery')._get_default_image(False, False)
- elif vals.get('type') == 'invoice':
- vals['image'] = self.with_context(partner_type='invoice')._get_default_image(False, False)
+ if vals.get('type') and not self._context.get('partner_type'):
+ self = self.with_context(partner_type=vals['type'])
if vals.get('website'):
vals['website'] = self._clean_website(vals['website'])
# function field not correctly triggered at create -> remove me when