Merge lp://staging/~openerp-dev/openobject-server/6.0-bug-1071710-chs into lp://staging/openobject-server/6.0

Proposed by Christophe Simonis (OpenERP)
Status: Merged
Merged at revision: 3672
Proposed branch: lp://staging/~openerp-dev/openobject-server/6.0-bug-1071710-chs
Merge into: lp://staging/openobject-server/6.0
Diff against target: 75 lines (+25/-4)
2 files modified
bin/addons/base/test/test_osv_expression.yml (+14/-1)
bin/osv/expression.py (+11/-3)
To merge this branch: bzr merge lp://staging/~openerp-dev/openobject-server/6.0-bug-1071710-chs
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+200605@code.staging.launchpad.net
To post a comment you must log in.

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.