From 00ab78871bc8ddd0b13732e6e29232cdf29b80d4 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Thu, 14 Jul 2011 12:47:07 +0530 Subject: [PATCH 1/2] [usability] fix the server crash problems of merge bzr revid: tta@openerp.com-20110714071707-i9g7lh2yqgt2a8ke --- openerp/addons/base/res/partner/partner.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openerp/addons/base/res/partner/partner.py b/openerp/addons/base/res/partner/partner.py index af39b27e157..fc869431700 100644 --- a/openerp/addons/base/res/partner/partner.py +++ b/openerp/addons/base/res/partner/partner.py @@ -157,9 +157,9 @@ class res_partner(osv.osv): def create(self, cr, user, values, context=None): # add a default address if none is given - if not values.get('address'): - values['address'] = [(0, 0, {'type': 'default'})] - return super(res_partner, self).create(cr, user, values, context) + if vals.has_key('address') and not vals.get('address'): + vals.get('address').append((0, 0, {'type': 'default'})) + return super(res_partner, self).create(cr, user, vals, context) def do_share(self, cr, uid, ids, *args): return True From 2ae545a3976d83cd1d4e3d49ce23535812044f24 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Thu, 14 Jul 2011 12:58:30 +0530 Subject: [PATCH 2/2] [usability] fix the server crash problems of merge bzr revid: tta@openerp.com-20110714072830-e1dbm9pkcnlawh2l --- openerp/addons/base/res/partner/partner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/partner/partner.py b/openerp/addons/base/res/partner/partner.py index fc869431700..aadd6ef8848 100644 --- a/openerp/addons/base/res/partner/partner.py +++ b/openerp/addons/base/res/partner/partner.py @@ -155,7 +155,7 @@ class res_partner(osv.osv): default.update({'name': name+ _(' (copy)'), 'events':[]}) return super(res_partner, self).copy(cr, uid, id, default, context) - def create(self, cr, user, values, context=None): + def create(self, cr, user, vals, context=None): # add a default address if none is given if vals.has_key('address') and not vals.get('address'): vals.get('address').append((0, 0, {'type': 'default'}))