Raphael Collet (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-usability-remove_address_id-rmu into
lp:~openerp-dev/openobject-addons/trunk-usability-users.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-remove_address_id-rmu/+merge/70175
Remove user address.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-remove_address_id-rmu/+merge/70175
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-usability-remove_address_id-rmu into
lp:~openerp-dev/openobject-addons/trunk-usability-users.
=== modified file 'base_action_rule/base_action_rule.py'
--- base_action_rule/base_action_rule.py 2011-06-24 10:24:19 +0000
+++ base_action_rule/base_action_rule.py 2011-08-02 14:51:34 +0000
@@ -277,10 +277,8 @@
'object_date': hasattr(obj, 'date') and obj.date or False,
'object_description': hasattr(obj, 'description') and obj.description or False,
'object_user': hasattr(obj, 'user_id') and (obj.user_id and obj.user_id.name) or '/',
- 'object_user_email': hasattr(obj, 'user_id') and (obj.user_id and \
- obj.user_id.address_id and obj.user_id.address_id.email) or '/',
- 'object_user_phone': hasattr(obj, 'user_id') and (obj.user_id and\
- obj.user_id.address_id and obj.user_id.address_id.phone) or '/',
+ 'object_user_email': hasattr(obj, 'user_id') and (obj.user_id and obj.user_id.user_email) or '/',
+ 'object_user_phone': hasattr(obj, 'partner_address_id') and (obj.partner_address_id and obj.partner_address_id.phone) or '/',
'partner': hasattr(obj, 'partner_id') and (obj.partner_id and obj.partner_id.name) or '/',
'partner_email': hasattr(obj, 'partner_address_id') and (obj.partner_address_id and\
obj.partner_address_id.email) or '/',
@@ -304,9 +302,9 @@
body = self.format_mail(obj, body)
if not emailfrom:
- if hasattr(obj, 'user_id') and obj.user_id and obj.user_id.address_id and\
- obj.user_id.address_id.email:
- emailfrom = obj.user_id.address_id.email
+ if hasattr(obj, 'user_id') and obj.user_id and\
+ obj.user_id.user_email:
+ emailfrom = obj.user_id.user_email
name = '[%d] %s' % (obj.id, tools.ustr(obj.name))
emailfrom = tools.ustr(emailfrom)
@@ -404,8 +402,8 @@
emails = []
if hasattr(obj, 'user_id') and action.act_mail_to_user:
- if obj.user_id and obj.user_id.address_id:
- emails.append(obj.user_id.address_id.email)
+ if obj.user_id:
+ emails.append(obj.user_id.user_email)
if action.act_mail_to_watchers:
emails += (action.act_email_cc or '').split(',')
=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py 2011-07-01 23:41:24 +0000
+++ base_calendar/base_calendar.py 2011-08-02 14:51:34 +0000
@@ -245,7 +245,7 @@
continue
else:
result[id][name] = self._get_address(attdata.sent_by_uid.name, \
- attdata.sent_by_uid.address_id.email)
+ attdata.sent_by_uid.user_email)
if name == 'cn':
if attdata.user_id:
@@ -535,7 +535,7 @@
return {'value': {'email': ''}}
usr_obj = self.pool.get('res.users')
user = usr_obj.browse(cr, uid, user_id, *args)
- return {'value': {'email': user.address_id.email, 'availability':user.availability}}
+ return {'value': {'email': user.user_email, 'availability':user.availability}}
def do_tentative(self, cr, uid, ids, context=None, *args):
""" Makes event invitation as Tentative
@@ -889,9 +889,9 @@
""" % (alarm.name, alarm.trigger_date, alarm.description, \
alarm.user_id.name, alarm.user_id.signature)
- mail_to = [alarm.user_id.address_id.email]
+ mail_to = [alarm.user_id.user_email]
for att in alarm.attendee_ids:
- mail_to.append(att.user_id.address_id.email)
+ mail_to.append(att.user_id.user_email)
if mail_to:
tools.email_send(
tools.config.get('email_from', False),
=== modified file 'base_calendar/wizard/base_calendar_invite_attendee.py'
--- base_calendar/wizard/base_calendar_invite_attendee.py 2011-04-26 07:39:18 +0000
+++ base_calendar/wizard/base_calendar_invite_attendee.py 2011-08-02 14:51:34 +0000
@@ -98,12 +98,12 @@
user = user_obj.browse(cr, uid, user_id)
res = {
'user_id': user_id,
- 'email': user.address_id.email
+ 'email': user.user_email
}
res.update(ref)
vals.append(res)
- if user.address_id.email:
- mail_to.append(user.address_id.email)
+ if user.user_email:
+ mail_to.append(user.user_email)
elif type == 'external' and datas.get('email'):
res = {'email': datas['email']}
=== modified file 'crm/crm.py'
--- crm/crm.py 2011-07-01 23:41:24 +0000
+++ crm/crm.py 2011-08-02 14:51:34 +0000
@@ -65,7 +65,7 @@
context = {}
if not context.get('portal'):
return False
- return self.pool.get('res.users').browse(cr, uid, uid, context).address_id.id
+ return self.pool.get('res.partner.address').browse(cr, uid, uid, context)
def _get_default_partner(self, cr, uid, context=None):
"""Gives id of partner for current user
@@ -75,10 +75,8 @@
context = {}
if not context.get('portal', False):
return False
- user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
- if not user.address_id:
- return False
- return user.address_id.partner_id.id
+ part_id = self.pool.get('res.partner.address').browse(cr, uid, uid, context=context)
+ return part_id.partner_id
def _get_default_email(self, cr, uid, context=None):
"""Gives default email address for current user
@@ -87,9 +85,7 @@
if not context.get('portal', False):
return False
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
- if not user.address_id:
- return False
- return user.address_id.email
+ return user.user_email
def _get_default_user(self, cr, uid, context=None):
"""Gives current user id
=== modified file 'crm/crm_action_rule.py'
--- crm/crm_action_rule.py 2011-05-02 12:16:02 +0000
+++ crm/crm_action_rule.py 2011-08-02 14:51:34 +0000
@@ -48,8 +48,8 @@
def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from', False), context=None):
body = self.format_mail(obj, body)
if not emailfrom:
- if hasattr(obj, 'user_id') and obj.user_id and obj.user_id.address_id and obj.user_id.address_id.email:
- emailfrom = obj.user_id.address_id.email
+ if hasattr(obj, 'user_id') and obj.user_id and obj.user_id.user_email:
+ emailfrom = obj.user_id.user_email
name = '[%d] %s' % (obj.id, tools.ustr(obj.name))
emailfrom = tools.ustr(emailfrom)
=== modified file 'mail_gateway/mail_gateway.py'
--- mail_gateway/mail_gateway.py 2011-07-01 23:41:24 +0000
+++ mail_gateway/mail_gateway.py 2011-08-02 14:51:34 +0000
@@ -164,8 +164,8 @@
'description': details or (hasattr(case, 'description') and case.description or False),
'email_to': email,
'email_from': email_from or \
- (hasattr(case, 'user_id') and case.user_id and case.user_id.address_id and \
- case.user_id.address_id.email),
+ (hasattr(case, 'user_id') and case.user_id and \
+ case.user_id.user_email),
'email_cc': email_cc,
'email_bcc': email_bcc,
'partner_id': partner_id,
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2011-08-02 14:40:20 +0000
+++ project/project_view.xml 2011-08-02 14:51:34 +0000
@@ -63,7 +63,6 @@
<tree string="Members">
<field name="name"/>
<field name="user_email"/>
- <field name="address_id"/>
</tree>
</field>
</page>
=== modified file 'project/wizard/project_task_close.py'
--- project/wizard/project_task_close.py 2011-06-29 10:31:46 +0000
+++ project/wizard/project_task_close.py 2011-08-02 14:51:34 +0000
@@ -84,8 +84,8 @@
elif data.manager_warn or data.partner_warn:
project = task.project_id
subject = _("Task '%s' Closed") % task.name
- if task.user_id and task.user_id.address_id and task.user_id.address_id.email:
- from_adr = task.user_id.address_id.email
+ if task.user_id and task.user_id.user_email:
+ from_adr = task.user_id.user_email
signature = task.user_id.signature
else:
raise osv.except_osv(_('Error'), _("Couldn't send mail because your email address is not configured!"))
=== modified file 'project_mailgate/project_mailgate.py'
--- project_mailgate/project_mailgate.py 2011-06-29 14:01:54 +0000
+++ project_mailgate/project_mailgate.py 2011-08-02 14:51:34 +0000
@@ -103,7 +103,7 @@
else:
select = ids
for task in self.browse(cr, uid, select, context=context):
- user_email = (task.user_id and task.user_id.address_id and task.user_id.address_id.email) or False
+ user_email = (task.user_id and task.user_id.user_email) or False
res += [(user_email, False, False, task.priority)]
if isinstance(ids, (str, int, long)):
return len(res) and res[0] or False
=== modified file 'project_scrum/wizard/project_scrum_email.py'
--- project_scrum/wizard/project_scrum_email.py 2011-01-14 00:11:01 +0000
+++ project_scrum/wizard/project_scrum_email.py 2011-08-02 14:51:34 +0000
@@ -82,7 +82,7 @@
email_from = tools.config.get('email_from', False)
user = user_pool.browse(cr, uid, uid, context=context)
- user_email = email_from or user.address_id.email
+ user_email = email_from or user.user_email
body = "%s\n" %(data.message)
body += "\n%s\n" %_('Tasks since yesterday')
=== modified file 'survey/survey.py'
--- survey/survey.py 2011-07-01 23:41:24 +0000
+++ survey/survey.py 2011-08-02 14:51:34 +0000
@@ -741,7 +741,7 @@
if user_id:
user_obj = self.pool.get('res.users')
user = user_obj.browse(cr, uid, user_id, context=context)
- return {'value': {'email': user.address_id.email}}
+ return {'value': {'email': user.user_email}}
return {}
survey_request()
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
