Merge lp:~openerp-dev/openobject-addons/6.0-bug-753133-tta into lp:openobject-addons/6.0

Proposed by SnippetBucket.com
Status: Merged
Approved by: Jay Vora (Serpent Consulting Services)
Approved revision: no longer in the source branch.
Merged at revision: 4529
Proposed branch: lp:~openerp-dev/openobject-addons/6.0-bug-753133-tta
Merge into: lp:openobject-addons/6.0
Diff against target: 11 lines (+0/-1)
1 file modified
hr/hr.py (+0/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.0-bug-753133-tta
Reviewer Review Type Date Requested Status
Jay Vora (Serpent Consulting Services) (community) Needs Fixing
Review via email: mp+57467@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jay Vora (Serpent Consulting Services) (jayvora) wrote :

Tejas,

I apologize for rejecting your previous merge proposal, you were absolutely right that we really do not need this line in _defaults.

The 'address_id' is being set by default as user's company's address.

Can you please remove the line and propose a merge again?

Accept my apologies.

Thanks.

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr/hr.py'
2--- hr/hr.py 2011-03-02 09:37:22 +0000
3+++ hr/hr.py 2011-04-15 10:54:00 +0000
4@@ -191,7 +191,6 @@
5 _defaults = {
6 'active': 1,
7 'photo': _get_photo,
8- 'address_id': lambda self,cr,uid,c: self.pool.get('res.partner.address').browse(cr, uid, uid, c).partner_id.id
9 }
10
11 def _check_recursion(self, cr, uid, ids, context=None):