odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] lp:~florent.x/openobject-addons/trunk-use-simplejson 

bzr revid: al@openerp.com-20121218152110-aj4rxlzlovfp1qhw
This commit is contained in:
Antony Lesuisse 2012-12-18 16:21:10 +01:00
parent 0e77d66989
commit 32cd94c631
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/edi/models/edi.py
View File

@ -21,7 +21,7 @@
import base64
import hashlib
import json
import simplejson as json
import logging
import re
import time

4
addons/edi/test/edi_partner_test.yml
View File

@ -7,7 +7,7 @@
and reimport it.
-
!python {model: edi.edi}: |
import json
import simplejson as json
res_partner = self.pool.get('res.partner')
doc = self.generate_edi(cr, uid, [res_partner.browse(cr, uid, ref('base.res_partner_2'))])
edi_doc, = json.loads(doc)
@ -39,4 +39,4 @@
edi_doc_output, = json.loads(doc_output)
for attribute in ('__model', '__module', '__id', 'name', '__attachments'):
assert edi_doc_output.get(attribute) == edi_doc.get(attribute), \
'Incorrect value for %s, expected %r, got %r' % (attribute, edi_doc.get(attribute), edi_doc_output.get(attribute))
'Incorrect value for %s, expected %r, got %r' % (attribute, edi_doc.get(attribute), edi_doc_output.get(attribute))