summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-02-17 19:23:20 +0100
committerChristophe Simonis <chs@odoo.com>2016-02-17 19:23:20 +0100
commita5df5e85e44dcb91489e14345f8ced42afa1c58c (patch)
tree254c4074aa1a44a0aedc9595c7f10663f81137b1
parent60c9cac46b0f32069a6763c3bf0b9e3a64d90e7d (diff)
parenteb9e5913c98bf82755bb384e2efffa764bb0e5fb (diff)
[MERGE] forward port of branch saas-9 up to eb9e591
-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 47b93b3e4bc..49698c12aad 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -563,10 +563,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