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

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openobject-addons

Antony Lesuisse (OpenERP): Approve on 2012-02-14

Diff: 67 lines (+7/-7)

3 files modified

edi/controllers/main.py (+3/-3)
edi/models/edi.py (+2/-2)
edi/test/edi_partner_test.yml (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

6348. By Florent on 2012-01-15

[REF] consistently use simplejson as json library.

6347. By Launchpad Translations on behalf of openerp on 2012-01-15

Launchpad automatic translations update.

6346. By Xavier (Open ERP) on 2012-01-13

[FIX] edi: the final semicolon in an openerp-web module is not optional, and breaks the loading of the module in production mode

6345. By Launchpad Translations on behalf of openerp on 2012-01-14

Launchpad automatic translations update.

6344. By Raphael Collet (OpenERP) on 2012-01-13

[MERGE] stock: always use full name in name_get of stock.location

6343. By Raphael Collet (OpenERP) on 2012-01-13

[IMP] stock: add uom next to quantity in kanban view of product

6342. By Raphael Collet (OpenERP) on 2012-01-13

[IMP] fetchmail: fix form view of fetchmail.server

6341. By Launchpad Translations on behalf of openerp on 2012-01-13

Launchpad automatic translations update.

6340. By Olivier Dony (Odoo) on 2012-01-12

[REL] OpenERP 6.1rc1

6339. By Thibault Delavallée (OpenERP) on 2012-01-12

[MERGE]: survey: fixed a bug in warning message when users exceed maximal number of allowed answers