Merge lp:~openerp-dev/openobject-server/trunk-bug-1029344-aja into lp:openobject-server
Proposed by
ajay javiya (OpenERP)
| Status: | Rejected |
|---|---|
| Rejected by: | Vo Minh Thu |
| Proposed branch: | lp:~openerp-dev/openobject-server/trunk-bug-1029344-aja |
| Merge into: | lp:openobject-server |
| Diff against target: |
20 lines (+2/-2) 1 file modified
openerp/tools/translate.py (+2/-2) |
| To merge this branch: | bzr merge lp:~openerp-dev/openobject-server/trunk-bug-1029344-aja |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenERP Core Team | Pending | ||
|
Review via email:
|
|||
Description of the change
Hello,
Fix issue Synchronize translation terms crash when abstract models are used.
Thank You
To post a comment you must log in.
Revision history for this message
| Vo Minh Thu (thu) wrote | # |
Unmerged revisions
- 4478. By ajay javiya (OpenERP)
-
[FIX]:Synchronize translation issue
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The `not(... or ...)` is not equivalent to the previous condition (i.e. it will crash if objmodel is None). It should have been `not (... and ...)`.
The test for AbstractModel is better than nothing (i.e. to not discard report which have _auto to False but still exist in database) but still not enough; we need something more accurate.
As we have still the merge prop. from Guewen I will reject this one and work on the other one.