Merge lp://staging/~camptocamp/ocb-addons/7.0-fix-1335887 into lp://staging/ocb-addons
Proposed by
Yannick Vaucher @ Camptocamp
| Status: | Rejected |
|---|---|
| Rejected by: | Holger Brunn (Therp) |
| Proposed branch: | lp://staging/~camptocamp/ocb-addons/7.0-fix-1335887 |
| Merge into: | lp://staging/ocb-addons |
| Diff against target: |
17 lines (+5/-2) 1 file modified
purchase/purchase.py (+5/-2) |
| To merge this branch: | bzr merge lp://staging/~camptocamp/ocb-addons/7.0-fix-1335887 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Holger Brunn (Therp) | Disapprove | ||
| Pedro Manuel Baeza | code review | Approve | |
| Yann Papouin | Approve | ||
| Ronald Portier (Therp) | Approve | ||
|
Review via email:
|
|||
Commit message
Fix purchase order do_merge w/ 1st origin empty introduced on OCB on rev 10009
Description of the change
Fix a bug only introduced on OCB
To post a comment you must log in.
Revision history for this message
| Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote | # |
Revision history for this message
| Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote | # |
Revision history for this message
| Pedro Manuel Baeza (pedro.baeza) wrote | # |
review:
Needs Fixing
(code review)
Revision history for this message
| Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote | # |
Revision history for this message
| Pedro Manuel Baeza (pedro.baeza) wrote | # |
review:
Approve
(code review)
Unmerged revisions
- 10224. By Yannick Vaucher @ Camptocamp
-
Imp concat
- 10223. By Yannick Vaucher @ Camptocamp
-
Fix purchase order do_merge w/ 1st origin empty introduced on OCB on rev
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Personally I think this merge proposal is tackling the problem from the wrong end.
If we do not have an origin for a purchase order, the value for origin should be NULL, not an empty string.
The original code that introduced the bug should be amended to account for the possibility of NULL values in the database.