From 08a111b5fb05e93309303a603b6edd2fc251802a Mon Sep 17 00:00:00 2001 From: "Hiral Patel (OpenERP)" Date: Wed, 7 Nov 2012 11:58:31 +0530 Subject: [PATCH 1/9] [IMP] Override the unlink method for 'res.partner' bzr revid: hip@tinyerp.com-20121107062831-d6l7v4ws1f5cu6tp --- openerp/addons/base/res/res_partner.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index df42bb81521..8edbf33aadc 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -349,6 +349,13 @@ class res_partner(osv.osv, format_address): # _constraints = [(_check_ean_key, 'Error: Invalid ean code', ['ean13'])] + def unlink(self, cr, uid, ids, context=None): + if not ids: + return True + res_id = self.pool.get('res.users').search(cr, uid, [('partner_id', '=', ids)], context=context) + res_user.unlink(cr, uid, res_id) + return super(res_partner,self).unlink(cr, uid, ids, context=context) + def write(self, cr, uid, ids, vals, context=None): # Update parent and siblings or children records if isinstance(ids, (int, long)): From 83d3ff99bd4612b5847ef3903665b5d087494ab2 Mon Sep 17 00:00:00 2001 From: "RGA(OpenERP)" <> Date: Wed, 7 Nov 2012 19:37:06 +0530 Subject: [PATCH 2/9] [FIX] translation tree view bzr revid: rgaopenerp-20121107140706-dwy1l9381qrl6fb9 --- openerp/addons/base/ir/ir_translation_view.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openerp/addons/base/ir/ir_translation_view.xml b/openerp/addons/base/ir/ir_translation_view.xml index 5555b371c58..d1c790de758 100644 --- a/openerp/addons/base/ir/ir_translation_view.xml +++ b/openerp/addons/base/ir/ir_translation_view.xml @@ -54,12 +54,12 @@ ir.translation - - + + - - - + + + From 9be7efdc163b8d9c2b27aa12581f42d4cade94d1 Mon Sep 17 00:00:00 2001 From: "Hiral Patel (OpenERP)" Date: Thu, 8 Nov 2012 14:29:33 +0530 Subject: [PATCH 3/9] [IMP] make field read-only if multi-companies is not installed bzr revid: hip@tinyerp.com-20121108085933-3kkoi75f21teqj2w --- openerp/addons/base/res/res_users_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index 78579fc66df..eec8b62daa6 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -100,7 +100,7 @@ - + From 3a3d1943b5b91b4dc1687823b25f3ae8c576e771 Mon Sep 17 00:00:00 2001 From: "RGA(OpenERP)" <> Date: Thu, 8 Nov 2012 16:17:15 +0530 Subject: [PATCH 4/9] [Fix] Indentation in module description bzr revid: rgaopenerp-20121108104715-l5p486td0fuu25tx --- openerp/addons/base/i18n/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po index 7b6fa115b29..2252863e2e7 100644 --- a/openerp/addons/base/i18n/fr.po +++ b/openerp/addons/base/i18n/fr.po @@ -7159,7 +7159,7 @@ msgstr "" "condition\n" " qu'il comprenne les éléments nécessaires pour la manipulation des " "courriels entrants\n" -" (voir la classe mail.thread pour plus de détails).\n" +" (voir la classe mail.thread pour plus de détails).\n" " * Comprend un mécanisme de file d'attente avec ordonnanceur\n" " configurable automatisé \n" " * Comprend un assistant de composition de courriels générique , qui peut " From 07c9837872130b1449bd34bd12ce92735498140e Mon Sep 17 00:00:00 2001 From: "Hiral Patel (OpenERP)" Date: Fri, 9 Nov 2012 16:29:39 +0530 Subject: [PATCH 5/9] [IMP] Improve the code bzr revid: hip@tinyerp.com-20121109105939-cx0ia3v2vtbqo9se --- openerp/addons/base/res/res_partner.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index 8edbf33aadc..0e31d4736d7 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -352,7 +352,8 @@ class res_partner(osv.osv, format_address): def unlink(self, cr, uid, ids, context=None): if not ids: return True - res_id = self.pool.get('res.users').search(cr, uid, [('partner_id', '=', ids)], context=context) + res_user = self.pool.get('res.users') + res_id = res_user.search(cr, uid, [('partner_id', '=', ids)], context=context) res_user.unlink(cr, uid, res_id) return super(res_partner,self).unlink(cr, uid, ids, context=context) From 01174cd2118675140559db4463cab5a34f26905a Mon Sep 17 00:00:00 2001 From: "RGA(OpenERP)" <> Date: Mon, 19 Nov 2012 18:29:17 +0530 Subject: [PATCH 6/9] add exception on deletion of partner bzr revid: rgaopenerp-20121119125917-eourqspwm19zsrd3 --- openerp/addons/base/res/res_partner.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index 0e31d4736d7..9ad1738d467 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -353,9 +353,12 @@ class res_partner(osv.osv, format_address): if not ids: return True res_user = self.pool.get('res.users') - res_id = res_user.search(cr, uid, [('partner_id', '=', ids)], context=context) - res_user.unlink(cr, uid, res_id) - return super(res_partner,self).unlink(cr, uid, ids, context=context) + user_ids = res_user.search(cr, uid, [('partner_id', '=', ids)], context=context) + if user_ids: + raise osv.except_osv(_('Error!'), + _('You can not delete partner because there is some related user to this partner')) + res = super(res_partner,self).unlink(cr, uid, ids, context=context) + return res def write(self, cr, uid, ids, vals, context=None): # Update parent and siblings or children records From d1a55260351ed1a2f7c3a285fb1559b8d3eb1c91 Mon Sep 17 00:00:00 2001 From: "ajay javiya (OpenERP)" Date: Tue, 20 Nov 2012 15:25:53 +0530 Subject: [PATCH 7/9] [FIX]:Fix customer, delete the contact Administrator bzr revid: aja@tinyerp.com-20121120095553-eqy877z8qrodhsua --- openerp/addons/base/res/res_users.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index 3aee2ed630b..0394ef8c0fd 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -107,6 +107,16 @@ class groups(osv.osv): groups() +class res_partner(osv.osv): + _inherit = 'res.partner' + + def unlink(self, cr, uid, ids,context=None): + user_obj = self.pool.get('res.users') + partner_ids = user_obj.search(cr, uid, [('partner_id','in',ids)]) + if partner_ids: + raise osv.except_osv(_('Warning!'), _('Please delete the user linked with this partner first.')) + return super(res_partner, self).unlink(cr, uid, ids, context) + class res_users(osv.osv): """ User class. A res.users record models an OpenERP user and is different from an employee. From 9b54de9c87929c76f755182fddf8a01e4fc7c0b5 Mon Sep 17 00:00:00 2001 From: "RGA(OpenERP)" <> Date: Wed, 21 Nov 2012 11:15:43 +0530 Subject: [PATCH 8/9] [REV] remove last commit of exception message bzr revid: rgaopenerp-20121121054543-urly4lk6vk62gd9l --- openerp/addons/base/res/res_partner.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index 9ad1738d467..0e31d4736d7 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -353,12 +353,9 @@ class res_partner(osv.osv, format_address): if not ids: return True res_user = self.pool.get('res.users') - user_ids = res_user.search(cr, uid, [('partner_id', '=', ids)], context=context) - if user_ids: - raise osv.except_osv(_('Error!'), - _('You can not delete partner because there is some related user to this partner')) - res = super(res_partner,self).unlink(cr, uid, ids, context=context) - return res + res_id = res_user.search(cr, uid, [('partner_id', '=', ids)], context=context) + res_user.unlink(cr, uid, res_id) + return super(res_partner,self).unlink(cr, uid, ids, context=context) def write(self, cr, uid, ids, vals, context=None): # Update parent and siblings or children records From ab35954eae09d4dd908d729063d107863dfd6e1b Mon Sep 17 00:00:00 2001 From: "RGA(OpenERP)" <> Date: Wed, 21 Nov 2012 18:43:28 +0530 Subject: [PATCH 9/9] [fix] change approriate variable name bzr revid: rgaopenerp-20121121131328-sil5bbznc6y1lh6e --- openerp/addons/base/res/res_users.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index a26afd24a3b..da849da1334 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -112,8 +112,8 @@ class res_partner(osv.osv): def unlink(self, cr, uid, ids,context=None): user_obj = self.pool.get('res.users') - partner_ids = user_obj.search(cr, uid, [('partner_id','in',ids)]) - if partner_ids: + user_ids = user_obj.search(cr, uid, [('partner_id','in',ids)]) + if user_ids: raise osv.except_osv(_('Warning!'), _('Please delete the user linked with this partner first.')) return super(res_partner, self).unlink(cr, uid, ids, context)