RavishchandraMurari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-usability-remove_address_id-rmu into
lp:~openerp-dev/openobject-addons/trunk-usability.
Requested reviews:
Amit (Open ERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-remove_address_id-rmu/+merge/64019
hello sir
I have done require changes..
Thanks
Ravish
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-remove_address_id-rmu/+merge/64019
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-usability.
=== modified file 'base_action_rule/base_action_rule.py'
--- base_action_rule/base_action_rule.py 2011-03-04 12:53:34 +0000
+++ base_action_rule/base_action_rule.py 2011-06-09 14:15:30 +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, 'user_id') and (obj.user_id and obj.user_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-05-03 13:11:17 +0000
+++ base_calendar/base_calendar.py 2011-06-09 14:15:30 +0000
@@ -242,7 +242,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:
@@ -531,7 +531,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
@@ -886,9 +886,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-06-09 14:15:30 +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 'mail_gateway/mail_gateway.py'
--- mail_gateway/mail_gateway.py 2011-05-02 18:46:43 +0000
+++ mail_gateway/mail_gateway.py 2011-06-09 14:15:30 +0000
@@ -164,8 +164,7 @@
'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_mailgate/project_mailgate.py'
--- project_mailgate/project_mailgate.py 2011-01-14 00:11:01 +0000
+++ project_mailgate/project_mailgate.py 2011-06-09 14:15:30 +0000
@@ -100,7 +100,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/project_scrum.py'
--- project_scrum/project_scrum.py 2011-03-09 06:21:48 +0000
+++ project_scrum/project_scrum.py 2011-06-09 14:15:30 +0000
@@ -320,7 +320,7 @@
email_from = tools.config.get('email_from', False)
meeting_id = self.browse(cr, uid, ids, context=context)[0]
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
- user_email = email_from or user.address_id.email or email_from
+ user_email = email_from or user.user_email or email_from
body = _("Hello %s,\n \nI am sending you Daily Meeting Details of date %s for the Sprint %s\n") %(meeting_id.sprint_id.scrum_master_id.name, meeting_id.date, meeting_id.sprint_id.name)
body += _('\n*Tasks since yesterday:\n_______________________%s\n*Task for Today:\n_______________________ %s\n\n*Blocks encountered:\n_______________________ %s') %(meeting_id.question_yesterday,meeting_id.question_today, meeting_id.question_blocks or _('No Blocks'))
body += _("\n\nThank you,\n%s") % user.name
=== 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-06-09 14:15:30 +0000
@@ -71,7 +71,9 @@
active_id = context.get('active_id', False)
scrum_meeting_pool = self.pool.get('project.scrum.meeting')
+
user_pool = self.pool.get('res.users')
+
meeting = scrum_meeting_pool.browse(cr, uid, active_id, context=context)
# wizard data
@@ -81,9 +83,11 @@
data = self.browse(cr, uid, data_id, context=context)
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')
body += "_______________________\n"
=== modified file 'survey/survey.py'
--- survey/survey.py 2011-01-18 11:54:45 +0000
+++ survey/survey.py 2011-06-09 14:15:30 +0000
@@ -740,7 +740,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
