[MERGE] lp:~florent.x/openobject-addons/trunk-use-simplejson
bzr revid: al@openerp.com-20121218152110-aj4rxlzlovfp1qhw
This commit is contained in:
parent
0e77d66989
commit
32cd94c631
|
@ -21,7 +21,7 @@
|
|||
|
||||
import base64
|
||||
import hashlib
|
||||
import json
|
||||
import simplejson as json
|
||||
import logging
|
||||
import re
|
||||
import time
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue