RavishchandraMurari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-usability-remove_address_id_email-rmu
into lp:~openerp-dev/openobject-server/trunk-usability.
Requested reviews:
Amit (Open ERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-usability-remove_address_id_email-rmu/+merge/64812
hello sir
I have done all require changes...
thanks
Ravish Murari
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-usability-remove_address_id_email-rmu/+merge/64812
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-usability.
=== modified file 'openerp/addons/base/base_update.xml'
--- openerp/addons/base/base_update.xml 2011-01-06 17:38:28 +0000
+++ openerp/addons/base/base_update.xml 2011-06-16 12:29:31 +0000
@@ -119,7 +119,7 @@
context="{'user_preference': 0}"
groups="base.group_multi_company"
/>
- <field name="address_id"/>
+ <!--field name="address_id"/-->
<field name="user_email" widget="email"/>
</group>
<group colspan="1" col="2" groups="base.group_extended">
@@ -175,7 +175,7 @@
<search string="Users">
<field name="name"/>
<field name="login"/>
- <field name="address_id" string="Address"/>
+ <!--field name="address_id" string="Address"/-->
<field name="company_ids" string="Company" groups="base.group_multi_company"/>
</search>
</field>
@@ -255,7 +255,7 @@
</xpath>
<group string="res_config_contents" position="replace">
<field name="name"/>
- <field name="email"/>
+ <field name="user_email"/>
<field name="login"/>
<field name="password" password="True"/>
<field name="context_lang"/>
=== modified file 'openerp/addons/base/res/res_user.py'
--- openerp/addons/base/res/res_user.py 2011-05-06 09:37:04 +0000
+++ openerp/addons/base/res/res_user.py 2011-06-16 12:29:31 +0000
@@ -136,7 +136,7 @@
_('"email_from" needs to be set to send welcome mails '
'to users'))
return False
- if not user.get('email'):
+ if not user.get('user_email'):
return False
return tools.email_send(email_from=None, email_to=[user['email']],
@@ -175,24 +175,24 @@
extended_users = group_obj.read(cr, uid, extended_group_id, ['users'], context=context)['users']
return dict(zip(ids, ['extended' if user in extended_users else 'simple' for user in ids]))
- def _email_get(self, cr, uid, ids, name, arg, context=None):
- # perform this as superuser because the current user is allowed to read users, and that includes
- # the email, even without any direct read access on the res_partner_address object.
- return dict([(user.id, user.address_id.email) for user in self.browse(cr, 1, ids)]) # no context to avoid potential security issues as superuser
-
- def _email_set(self, cr, uid, ids, name, value, arg, context=None):
- if not isinstance(ids,list):
- ids = [ids]
- address_obj = self.pool.get('res.partner.address')
- for user in self.browse(cr, uid, ids, context=context):
- # perform this as superuser because the current user is allowed to write to the user, and that includes
- # the email even without any direct write access on the res_partner_address object.
- if user.address_id:
- address_obj.write(cr, 1, user.address_id.id, {'email': value or None}) # no context to avoid potential security issues as superuser
- else:
- address_id = address_obj.create(cr, 1, {'name': user.name, 'email': value or None}) # no context to avoid potential security issues as superuser
- self.write(cr, uid, ids, {'address_id': address_id}, context)
- return True
+# def _email_get(self, cr, uid, ids, name, arg, context=None):
+# # perform this as superuser because the current user is allowed to read users, and that includes
+# # the email, even without any direct read access on the res_partner_address object.
+# return dict([(user.id, user.address_id.email) for user in self.browse(cr, 1, ids)]) # no context to avoid potential security issues as superuser
+#
+# def _email_set(self, cr, uid, ids, name, value, arg, context=None):
+# if not isinstance(ids,list):
+# ids = [ids]
+# address_obj = self.pool.get('res.partner.address')
+# for user in self.browse(cr, uid, ids, context=context):
+# # perform this as superuser because the current user is allowed to write to the user, and that includes
+# # the email even without any direct write access on the res_partner_address object.
+# if user.address_id:
+# address_obj.write(cr, 1, user.address_id.id, {'email': value or None}) # no context to avoid potential security issues as superuser
+# else:
+# address_id = address_obj.create(cr, 1, {'name': user.name, 'email': value or None}) # no context to avoid potential security issues as superuser
+# self.write(cr, uid, ids, {'address_id': address_id}, context)
+# return True
def _set_new_password(self, cr, uid, id, name, value, args, context=None):
if value is False:
@@ -217,13 +217,13 @@
fnct_inv=_set_new_password,
string='Change password', help="Only specify a value if you want to change the user password. "
"This user will have to logout and login again!"),
- 'email': fields.char('E-mail', size=64,
+ 'user_email': fields.char('E-mail', size=64,
help='If an email is provided, the user will be sent a message '
'welcoming him.\n\nWarning: if "email_from" and "smtp_server"'
" aren't configured, it won't be possible to email new "
"users."),
'signature': fields.text('Signature', size=64),
- 'address_id': fields.many2one('res.partner.address', 'Address'),
+ # 'address_id': fields.many2one('res.partner.address', 'Address'),
'active': fields.boolean('Active'),
'action_id': fields.many2one('ir.actions.actions', 'Home Action', help="If specified, this action will be opened at logon for this user, in addition to the standard menu."),
'menu_id': fields.many2one('ir.actions.actions', 'Menu Action', help="If specified, the action will replace the standard menu for this user."),
@@ -245,7 +245,7 @@
'view': fields.function(_get_interface_type, method=True, type='selection', fnct_inv=_set_interface_type,
selection=[('simple','Simplified'),('extended','Extended')],
string='Interface', help="Choose between the simplified interface and the extended one"),
- 'user_email': fields.function(_email_get, method=True, fnct_inv=_email_set, string='Email', type="char", size=240),
+ # 'user_email': fields.function(_email_get, method=True, fnct_inv=_email_set, string='Email', type="char", size=240),
'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"),
'date': fields.datetime('Last Connection', readonly=True),
}
@@ -345,7 +345,7 @@
'company_id': _get_company,
'company_ids': _get_companies,
'groups_id': _get_group,
- 'address_id': False,
+ # 'address_id': False,
'menu_tips':True
}
@@ -513,10 +513,10 @@
_name = 'res.config.users'
_inherit = ['res.users', 'res.config']
- def _generate_signature(self, cr, name, email, context=None):
- return _('--\n%(name)s %(email)s\n') % {
+ def _generate_signature(self, cr, name, user_email, context=None):
+ return _('--\n%(name)s %(user_email)s\n') % {
'name': name or '',
- 'email': email and ' <'+email+'>' or '',
+ 'user_mail': user_email and ' <'+user_email+'>' or '',
}
def create_user(self, cr, uid, new_id, context=None):
@@ -529,21 +529,23 @@
with the user's data %-formatted into the mail body
"""
base_data = self.read(cr, uid, new_id, context=context)
- partner_id = self.pool.get('res.partner').main_partner(cr, uid)
- address = self.pool.get('res.partner.address').create(
- cr, uid, {'name': base_data['name'],
- 'email': base_data['email'],
- 'partner_id': partner_id,},
- context)
+ #partner_id = self.pool.get('res.partner').main_partner(cr, uid)
+ #address = self.pool.get('res.partner.address').create(
+
+ #cr, uid, {'name': base_data['name'],
+ #'email': base_data['email'],
+ #'partner_id': partner_id,},context)
+
user_data = dict(
base_data,
signature=self._generate_signature(
- cr, base_data['name'], base_data['email'], context=context),
- address_id=address,
+ cr, base_data['name'], base_data['user_email'], context=context)
+ #address_id=address,
)
new_user = self.pool.get('res.users').create(
cr, uid, user_data, context)
self.send_welcome_email(cr, uid, new_user, context=context)
+
def execute(self, cr, uid, ids, context=None):
'Do nothing on execution, just launch the next action/todo'
pass
_______________________________________________
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
