Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/6.1-opw-572490-rha into lp:openobject-addons/6.1

  1. 6.1-opw-572490-rha
  2. Merge into 6.1
Proposed by Rifakat Husen (OpenERP)
Status: Approved
Approved by: Vinay Rana (OpenERP)
Approved revision: 6664
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-572490-rha
Merge into: lp:openobject-addons/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
project/project.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-572490-rha
Reviewer Review Type Date Requested Status
Vinay Rana (OpenERP) (community) Approve
Naresh(OpenERP) Pending
Review via email: mp+96965@code.launchpad.net

Description of the change

Hello,

Currently cannot unlink analytic account when project module is installed, we need to
provide project access rights to current user even if that user does not belong to
project management part.

Please review it.

Thanks,
Rifakat

To post a comment you must log in.
Revision history for this message
Vinay Rana (OpenERP) (vra-openerp) wrote :

This is already merged with 6.0 version with following revision :
http://bazaar.launchpad.net/~openerp/openobject-addons/6.0/revision/5175

Now needs to fix same for 6.1.

review: Approve
Reply
Revision history for this message
Vinay Rana (OpenERP) (vra-openerp) wrote :

So please forward port to 6.1

Reply
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Hello

This bug was qualified as Not Relevant on Trunk (means that architecture on trunk has changed and so this bug has no meaning anymore). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Reply

Unmerged revisions

6664. By Rifakat Husen (OpenERP)

[FIX] project: cannot unlink analytic account due to project module

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'project/project.py'
--- project/project.py 2012-02-15 14:51:12 +0000
+++ project/project.py 2012-03-12 05:10:24 +0000
@@ -1140,7 +1140,7 @@
11401140
1141 def unlink(self, cr, uid, ids, *args, **kwargs):1141 def unlink(self, cr, uid, ids, *args, **kwargs):
1142 project_obj = self.pool.get('project.project')1142 project_obj = self.pool.get('project.project')
1143 analytic_ids = project_obj.search(cr, uid, [('analytic_account_id','in',ids)])1143 analytic_ids = project_obj.search(cr, 1, [('analytic_account_id','in',ids)])
1144 if analytic_ids:1144 if analytic_ids:
1145 raise osv.except_osv(_('Warning !'), _('Please delete the project linked with this account first.'))1145 raise osv.except_osv(_('Warning !'), _('Please delete the project linked with this account first.'))
1146 return super(account_analytic_account, self).unlink(cr, uid, ids, *args, **kwargs)1146 return super(account_analytic_account, self).unlink(cr, uid, ids, *args, **kwargs)