summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-02-17 19:23:08 +0100
committerChristophe Simonis <chs@odoo.com>2016-02-17 19:23:08 +0100
commiteb9e5913c98bf82755bb384e2efffa764bb0e5fb (patch)
tree8fad8f82f15a6a56fe68e1789ff2d19446f5aecb
parent87a01c75ef1dde98bc31f714d8ac4b2ea598e316 (diff)
parent519dd27358864bf5a758ffd11f5c71a32e0b3098 (diff)
[MERGE] forward port of branch saas-7 up to 519dd27
-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 163949fb682..dfd94f1cc97 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -561,10 +561,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