diff options
| author | Twinkle Christian (OpenERP) <tch@tinyerp.com> | 2012-09-07 17:36:38 +0530 |
|---|---|---|
| committer | Twinkle Christian (OpenERP) <tch@tinyerp.com> | 2012-09-07 17:36:38 +0530 |
| commit | e5a76cd41f7eba94c9cbc31e7e398773b9ce2bc4 (patch) | |
| tree | fa09c961cbe765813194e73888ba61858f845adb | |
| parent | cbd5cff60c3449c2d36ec2f193ddb9550578f476 (diff) | |
[IMP]Remove server warning
bzr revid: tch@tinyerp.com-20120907120638-0zeks1ildb1vy8w4
| -rw-r--r-- | addons/auth_reset_password/auth_reset_password.py | 9 | ||||
| -rw-r--r-- | addons/mail/security/ir.model.access.csv | 2 | ||||
| -rw-r--r-- | addons/procurement/board_mrp_procurement_view.xml | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/addons/auth_reset_password/auth_reset_password.py b/addons/auth_reset_password/auth_reset_password.py index 40afbcaa4e6..c62c529fcdd 100644 --- a/addons/auth_reset_password/auth_reset_password.py +++ b/addons/auth_reset_password/auth_reset_password.py @@ -31,13 +31,8 @@ def message_check(msg, secret): class res_users(osv.osv): _inherit = 'res.users' - _columns = { - 'user_email': fields.related('email', type='char', - deprecated='Use the email field instead of user_email. This field will be removed with OpenERP 7.1.') - } - _sql_constraints = [ - ('email_uniq', 'UNIQUE (user_email)', 'You can not have two users with the same email!') - ] + + def _auth_reset_password_secret(self, cr, uid, context=None): uuid = self.pool.get('ir.config_parameter').get_param(cr, uid, 'database.uuid') diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv index 1979e2fec05..29f11fd0b1b 100644 --- a/addons/mail/security/ir.model.access.csv +++ b/addons/mail/security/ir.model.access.csv @@ -7,3 +7,5 @@ access_mail_notification_all,mail.notification.all,model_mail_notification,,1,1, access_mail_group,mail.group,model_mail_group,base.group_user,1,1,1,1
access_mail_alias_user,mail.alias,model_mail_alias,base.group_user,1,1,1,0
access_mail_alias_system,mail.alias,model_mail_alias,base.group_system,1,1,1,1
+access_mail_mail_user,mail.mail,model_mail_mail,base.group_user,1,1,1,0
+access_mail_mail_manager,mail.mail,model_mail_mail,group_mail_manager,1,1,1,1
diff --git a/addons/procurement/board_mrp_procurement_view.xml b/addons/procurement/board_mrp_procurement_view.xml index a01ec168efa..ec2c8875361 100644 --- a/addons/procurement/board_mrp_procurement_view.xml +++ b/addons/procurement/board_mrp_procurement_view.xml @@ -17,7 +17,7 @@ <field name="arch" type="xml"> <xpath expr="/form/board/column/action[@string='Incoming Shipments']" position="before"> <action name="%(procurement_action_board)d" string="Procurements in Exception"/> - </xpath> + </xpath> </field> </record> </data> |