Merge lp:~vauxoo/openerp-venezuela-localization/7.0-ovl-rev-1977-kty into lp:openerp-venezuela-localization

Proposed by Katherine Zaoral (Vauxoo)
Status: Merged
Merged at revision: 1003
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/7.0-ovl-rev-1977-kty
Merge into: lp:openerp-venezuela-localization
Diff against target: 12 lines (+1/-1)
1 file modified
ovl/model/account.py (+1/-1)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/7.0-ovl-rev-1977-kty
Reviewer Review Type Date Requested Status
Katherine Zaoral (Vauxoo) Approve
Review via email: mp+228890@code.launchpad.net

Description of the change

[MERGE] change the way the format method is used because is compatible with
version python 2.7.x and above, and one of the server of our clients is
running in 2.6.x an raise a python ValueError.

To post a comment you must log in.
Revision history for this message
Katherine Zaoral (Vauxoo) (kathy-zaoral) wrote :

LGTM

review: Approve
Revision history for this message
Katherine Zaoral (Vauxoo) (kathy-zaoral) wrote :

waiting runbot

Revision history for this message
Katherine Zaoral (Vauxoo) (kathy-zaoral) wrote :

runbot is green
i will proceed with the merge

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ovl/model/account.py'
2--- ovl/model/account.py 2014-06-25 16:30:38 +0000
3+++ ovl/model/account.py 2014-07-30 15:52:59 +0000
4@@ -58,7 +58,7 @@
5 aml_ids += [aml_brw.id for aml_brw in am_brw.line_id]
6
7 return {
8- 'domain': "[('id','in', {})]".format(str(aml_ids)),
9+ 'domain': str([('id', 'in', aml_ids)]),
10 'name': _('Journal Entries'),
11 'view_type': 'form',
12 'view_mode': 'tree,form',