Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/trunk-bug-1088030-tpa into lp:openobject-server

  1. trunk-bug-1088030-tpa
  2. Merge into trunk
Proposed by Turkesh Patel (openERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-server/trunk-bug-1088030-tpa
Merge into: lp:openobject-server
Diff against target: 12 lines (+1/-1)
1 file modified
openerp/addons/base/res/res_users.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-bug-1088030-tpa
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+140361@code.launchpad.net

Description of the change

[FIX] Restrict deletion of Company when related users exist.

To post a comment you must log in.

Unmerged revisions

4706. By Turkesh Patel (openERP)

[FIX] restrict deletion of company on res.user

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/res/res_users.py'
2--- openerp/addons/base/res/res_users.py 2012-12-17 21:47:00 +0000
3+++ openerp/addons/base/res/res_users.py 2012-12-18 06:29:21 +0000
4@@ -162,7 +162,7 @@
5 # available to the current user (should be the user's companies?), when the user_preference
6 # context is set.
7 'company_id': fields.many2one('res.company', 'Company', required=True,
8- help='The company this user is currently working for.', context={'user_preference': True}),
9+ help='The company this user is currently working for.', ondelete="restrict", context={'user_preference': True}),
10 'company_ids':fields.many2many('res.company','res_company_users_rel','user_id','cid','Companies'),
11 # backward compatibility fields
12 'user_email': fields.related('email', type='char',