Merge lp://staging/~hbrunn/ocb-server/7.0-lp1124130 into lp://staging/ocb-server
Proposed by
Holger Brunn (Therp)
| Status: | Merged |
|---|---|
| Approved by: | Alexandre Fayolle - camptocamp |
| Approved revision: | 4835 |
| Merged at revision: | 4861 |
| Proposed branch: | lp://staging/~hbrunn/ocb-server/7.0-lp1124130 |
| Merge into: | lp://staging/ocb-server |
| Diff against target: |
12 lines (+1/-1) 1 file modified
openerp/osv/fields.py (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~hbrunn/ocb-server/7.0-lp1124130 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alexandre Fayolle - camptocamp | Approve | ||
| Stefan Rijnhart (Opener) | Approve | ||
|
Review via email:
|
|||
Description of the change
automatically derived from https:/
To post a comment you must log in.
Revision history for this message
| Stefan Rijnhart (Opener) (stefan-opener) wrote | # |
Revision history for this message
| Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote | # |
review:
Approve
Revision history for this message
| Stefan Rijnhart (Opener) (stefan-opener) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Read the line in a larger context in fields.py and it looks good. I'd say something about the line length but it was already too long before you inserted this bit. You could still consider changing it as you wrote the original patch for the official branches. These have not yet been merged so you could change it there too.
Note that I am against unnecessary refactoring in this project to avoid conflicts with upstream, but in this case it would not make a difference. Not blocking AFAIK.