From 3a7997a6e1e9db791c3245eb93eba93ae70dd800 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 26 Mar 2013 14:05:54 +0100 Subject: [PATCH 01/14] [IMP] mail: move alias_id on res_users view bzr revid: chm@openerp.com-20130326130554-rgx7uq7z60qjay3j --- addons/mail/res_users_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml index f49ff72194a..1cacadfc898 100644 --- a/addons/mail/res_users_view.xml +++ b/addons/mail/res_users_view.xml @@ -26,7 +26,7 @@ - + From 53c1b28ace9e29ea365c2df76dd1a13c624f01e7 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 27 Mar 2013 14:21:01 +0100 Subject: [PATCH 02/14] [IMP] res_user: Don't raise if there are no outgoing server bzr revid: chm@openerp.com-20130327132101-fxbgemek27hv93li --- addons/auth_signup/res_users.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py index b5383e41775..6f9890e9acb 100644 --- a/addons/auth_signup/res_users.py +++ b/addons/auth_signup/res_users.py @@ -262,13 +262,7 @@ class res_users(osv.Model): for user in self.browse(cr, uid, ids, context): if not user.email: raise osv.except_osv(_("Cannot send email: user has no email address."), user.name) - mail_id = self.pool.get('email.template').send_mail(cr, uid, template.id, user.id, True, context=context) - mail_state = mail_obj.read(cr, uid, mail_id, ['state'], context=context) - - if mail_state and mail_state['state'] == 'exception': - raise self.pool.get('res.config.settings').get_config_warning(cr, _("Cannot send email: no outgoing email server configured.\nYou can configure it under %(menu:base_setup.menu_general_configuration)s."), context) - else: - return True + self.pool.get('email.template').send_mail(cr, uid, template.id, user.id, True, context=context) def create(self, cr, uid, values, context=None): # overridden to automatically invite user to sign up From 177f51cb541f6f635d445ca24ce4453d79eb6d39 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 10 Apr 2013 15:02:44 +0200 Subject: [PATCH 03/14] [IMP] auth_signup: change reset_password to no_reset_password context value bzr revid: chm@openerp.com-20130410130244-3ef6mpw6s09xjn75 --- addons/auth_signup/res_users.py | 2 +- addons/portal/wizard/portal_wizard.py | 2 +- addons/share/wizard/share_wizard.py | 1 + addons/survey/wizard/survey_send_invitation.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py index 6f9890e9acb..0a8dde685f1 100644 --- a/addons/auth_signup/res_users.py +++ b/addons/auth_signup/res_users.py @@ -268,7 +268,7 @@ class res_users(osv.Model): # overridden to automatically invite user to sign up user_id = super(res_users, self).create(cr, uid, values, context=context) user = self.browse(cr, uid, user_id, context=context) - if context and context.get('reset_password') and user.email: + if user.email and (not context or not context.get('no_reset_password')): ctx = dict(context, create_user=True) self.action_reset_password(cr, uid, [user.id], context=ctx) return user_id diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py index e3047cd5edb..e363afa47cb 100644 --- a/addons/portal/wizard/portal_wizard.py +++ b/addons/portal/wizard/portal_wizard.py @@ -172,7 +172,7 @@ class wizard_user(osv.osv_memory): @return: browse record of model res.users """ res_users = self.pool.get('res.users') - create_context = dict(context or {}, noshortcut=True) # to prevent shortcut creation + create_context = dict(context or {}, noshortcut=True, no_reset_password=True) # to prevent shortcut creation values = { 'login': extract_email(wizard_user.email), 'partner_id': wizard_user.partner_id.id, diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py index 429a1dc2f08..0189c1682dd 100644 --- a/addons/share/wizard/share_wizard.py +++ b/addons/share/wizard/share_wizard.py @@ -230,6 +230,7 @@ class share_wizard(osv.TransientModel): current_user = user_obj.browse(cr, UID_ROOT, uid, context=context) # modify context to disable shortcuts when creating share users context['noshortcut'] = True + context['no_reset_password'] = True created_ids = [] existing_ids = [] if wizard_data.user_type == 'emails': diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py index 5d96d0246f9..b27aa608c98 100644 --- a/addons/survey/wizard/survey_send_invitation.py +++ b/addons/survey/wizard/survey_send_invitation.py @@ -190,7 +190,7 @@ Thanks,''') % (name, self.pool.get('ir.config_parameter').get_param(cr, uid, 'we 'action_id': act_id[0], 'survey_id': [[6, 0, survey_ids]] } - user = user_ref.create(cr, uid, res_data) + user = user_ref.create(cr, uid, res_data, {'no_reset_password': True}) if user not in new_user: new_user.append(user) created+= "- %s (Login: %s, Password: %s)\n" % (partner.name or _('Unknown'),\ From 329459237f18917bef600f10fda149bdd11d4908 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 16 Apr 2013 12:30:02 +0200 Subject: [PATCH 04/14] [FIX] auth_signup: if not context: context = {} bzr revid: chm@openerp.com-20130416103002-sdbrpbnwxkx0qcpw --- addons/auth_signup/res_users.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py index 0a8dde685f1..2f7bd553d3d 100644 --- a/addons/auth_signup/res_users.py +++ b/addons/auth_signup/res_users.py @@ -269,6 +269,8 @@ class res_users(osv.Model): user_id = super(res_users, self).create(cr, uid, values, context=context) user = self.browse(cr, uid, user_id, context=context) if user.email and (not context or not context.get('no_reset_password')): - ctx = dict(context, create_user=True) - self.action_reset_password(cr, uid, [user.id], context=ctx) + if not context: + context = {} + context.update({'create_user': True}) + self.action_reset_password(cr, uid, [user.id], context=context) return user_id From 40f387e2d0ab2a6dcd34a9808cf83a1ffff9f575 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 25 Apr 2013 15:38:09 +0200 Subject: [PATCH 05/14] [FIX] user_creation: test yml, add context no_reset_password bzr revid: chm@openerp.com-20130425133809-11n44mzahzk2kk52 --- addons/crm/test/lead2opportunity_assign_salesmen.yml | 7 +++++++ .../test/worktask_entry_to_timesheetline_entry.yml | 1 + 2 files changed, 8 insertions(+) diff --git a/addons/crm/test/lead2opportunity_assign_salesmen.yml b/addons/crm/test/lead2opportunity_assign_salesmen.yml index 0edd3b8edce..1c68c682533 100644 --- a/addons/crm/test/lead2opportunity_assign_salesmen.yml +++ b/addons/crm/test/lead2opportunity_assign_salesmen.yml @@ -24,38 +24,45 @@ name: 'Test lead 4' contact_name: 'Fabrice Lepoilu' stage_id: stage_lead1 + context: {'no_reset_password': True} - !record {model: crm.lead, id: test_crm_lead_05}: type: 'lead' name: 'Test lead 5' contact_name: 'Fabrice Lepoilu' stage_id: stage_lead1 + context: {'no_reset_password': True} - !record {model: crm.lead, id: test_crm_lead_06}: type: 'lead' name: 'Test lead 6' partner_name: 'Agrolait SuperSeed SA' stage_id: stage_lead1 + context: {'no_reset_password': True} - !record {model: res.users, id: test_res_user_01}: name: 'Test user A' login: 'tua' new_password: 'tua' + context: {'no_reset_password': True} - !record {model: res.users, id: test_res_user_02}: name: 'Test user B' login: 'tub' new_password: 'tub' + context: {'no_reset_password': True} - !record {model: res.users, id: test_res_user_03}: name: 'Test user C' login: 'tuc' new_password: 'tuc' + context: {'no_reset_password': True} - !record {model: res.users, id: test_res_user_04}: name: 'Test user D' login: 'tud' new_password: 'tud' + context: {'no_reset_password': True} - I create a mass convert wizard and convert all the leads. - diff --git a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml index 3efd133ffb6..68f1d1adbdf 100644 --- a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml +++ b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml @@ -8,6 +8,7 @@ password: hr groups_id: - base.group_hr_manager + context: {'no_reset_password': True} - Create a product with type service used to specify employees designation - From a027590d6eca9b65c2fdfe5a2509137e839e42ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 15 May 2013 10:29:39 +0200 Subject: [PATCH 06/14] [CLEAN] Some code cleaning about context management bzr revid: tde@openerp.com-20130515082939-oediun6cb9wd87lh --- addons/auth_signup/res_users.py | 6 +++--- addons/survey/wizard/survey_send_invitation.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py index 2f7bd553d3d..ab1823df980 100644 --- a/addons/auth_signup/res_users.py +++ b/addons/auth_signup/res_users.py @@ -265,12 +265,12 @@ class res_users(osv.Model): self.pool.get('email.template').send_mail(cr, uid, template.id, user.id, True, context=context) def create(self, cr, uid, values, context=None): + if context is None: + context = {} # overridden to automatically invite user to sign up user_id = super(res_users, self).create(cr, uid, values, context=context) user = self.browse(cr, uid, user_id, context=context) - if user.email and (not context or not context.get('no_reset_password')): - if not context: - context = {} + if user.email and not context.get('no_reset_password'): context.update({'create_user': True}) self.action_reset_password(cr, uid, [user.id], context=context) return user_id diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py index 339a22f1eba..eacc19bf23a 100644 --- a/addons/survey/wizard/survey_send_invitation.py +++ b/addons/survey/wizard/survey_send_invitation.py @@ -190,7 +190,8 @@ Thanks,''') % (name, self.pool.get('ir.config_parameter').get_param(cr, uid, 'we 'action_id': act_id[0], 'survey_id': [[6, 0, survey_ids]] } - user = user_ref.create(cr, uid, res_data, {'no_reset_password': True}) + create_ctx = dict(context, no_reset_password=True) + user = user_ref.create(cr, uid, res_data, context=create_ctx) if user not in new_user: new_user.append(user) created+= "- %s (Login: %s, Password: %s)\n" % (partner.name or _('Unknown'),\ From 1606f28c01b621676c79ee2723e296990b2ff6d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 15 May 2013 10:59:27 +0200 Subject: [PATCH 07/14] [REV] Reverted changes un test files: context is not a field when creating a res.users. bzr revid: tde@openerp.com-20130515085927-jvumvr371yuusbhf --- addons/crm/test/lead2opportunity_assign_salesmen.yml | 7 ------- .../test/worktask_entry_to_timesheetline_entry.yml | 1 - 2 files changed, 8 deletions(-) diff --git a/addons/crm/test/lead2opportunity_assign_salesmen.yml b/addons/crm/test/lead2opportunity_assign_salesmen.yml index 1c68c682533..0edd3b8edce 100644 --- a/addons/crm/test/lead2opportunity_assign_salesmen.yml +++ b/addons/crm/test/lead2opportunity_assign_salesmen.yml @@ -24,45 +24,38 @@ name: 'Test lead 4' contact_name: 'Fabrice Lepoilu' stage_id: stage_lead1 - context: {'no_reset_password': True} - !record {model: crm.lead, id: test_crm_lead_05}: type: 'lead' name: 'Test lead 5' contact_name: 'Fabrice Lepoilu' stage_id: stage_lead1 - context: {'no_reset_password': True} - !record {model: crm.lead, id: test_crm_lead_06}: type: 'lead' name: 'Test lead 6' partner_name: 'Agrolait SuperSeed SA' stage_id: stage_lead1 - context: {'no_reset_password': True} - !record {model: res.users, id: test_res_user_01}: name: 'Test user A' login: 'tua' new_password: 'tua' - context: {'no_reset_password': True} - !record {model: res.users, id: test_res_user_02}: name: 'Test user B' login: 'tub' new_password: 'tub' - context: {'no_reset_password': True} - !record {model: res.users, id: test_res_user_03}: name: 'Test user C' login: 'tuc' new_password: 'tuc' - context: {'no_reset_password': True} - !record {model: res.users, id: test_res_user_04}: name: 'Test user D' login: 'tud' new_password: 'tud' - context: {'no_reset_password': True} - I create a mass convert wizard and convert all the leads. - diff --git a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml index 68f1d1adbdf..3efd133ffb6 100644 --- a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml +++ b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml @@ -8,7 +8,6 @@ password: hr groups_id: - base.group_hr_manager - context: {'no_reset_password': True} - Create a product with type service used to specify employees designation - From 7f5bfb5641097b4aff2fc3d89b3f1d9e470fefcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 24 May 2013 13:27:54 +0200 Subject: [PATCH 08/14] [IMP] sale_crm: moved default_section_id form of res.users into preferences. bzr revid: tde@openerp.com-20130524112754-un0x4g07f4xo5p2j --- addons/sale_crm/sale_crm_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml index 31c0317969a..dd11a5a2d49 100644 --- a/addons/sale_crm/sale_crm_view.xml +++ b/addons/sale_crm/sale_crm_view.xml @@ -101,7 +101,7 @@ - + From d58925a9c58f66c55491952794a70ef5ad9df33f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 24 May 2013 13:48:09 +0200 Subject: [PATCH 09/14] [IMP] auth_signup: res_users form view: buttons with link style bzr revid: tde@openerp.com-20130524114809-rtgttpmb5obqaqvb --- addons/auth_signup/res_users_view.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/auth_signup/res_users_view.xml b/addons/auth_signup/res_users_view.xml index 28f66eb101d..60c419db737 100644 --- a/addons/auth_signup/res_users_view.xml +++ b/addons/auth_signup/res_users_view.xml @@ -31,9 +31,11 @@