Merge lp://staging/~therp-nl/ocb-server/6.1-private_fields into lp://staging/ocb-server/6.1

Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 4333
Proposed branch: lp://staging/~therp-nl/ocb-server/6.1-private_fields
Merge into: lp://staging/ocb-server/6.1
Diff against target: 50 lines (+26/-0)
1 file modified
openerp/addons/base/res/res_users.py (+26/-0)
To merge this branch: bzr merge lp://staging/~therp-nl/ocb-server/6.1-private_fields
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza Approve
Holger Brunn (Therp) Approve
Stefan Rijnhart (Opener) Pending
Review via email: mp+267344@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Holger Brunn (Therp) (hbrunn) :
review: Approve
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

Some comment inside (I didn't remember I have to write here also). Old Launchpad times...

review: Needs Fixing (code review)
Revision history for this message
Holger Brunn (Therp) (hbrunn) wrote :

Pedro, please. You know where this PR comes from, let's let it pass without checking the spelling or wording in error messages

Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

I'd prefer to stay close to the original patch so that I am not making it more difficult to port any additional changes that may occur upstream.

Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

Hey, hey, don't get angry. Call it professional deformation...

I fast-trask then ;)

review: Approve
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

Thanks ;-)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: