lp://staging/~niv-openerp/openobject-server/trunk-niv-newapi

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/openobject-server

OpenERP Core Team: Pending requested 2012-01-20

Diff: 74 lines (+45/-1)

2 files modified

openerp/osv/osv.py (+44/-0)
openerp/service/web_services.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3964. By Nicolas Vanhoren (OpenERP) on 2012-01-13

[imp] small design improvement

3963. By Nicolas Vanhoren (OpenERP) on 2012-01-13

[imp] implemented context replacement

3962. By Nicolas Vanhoren (OpenERP) on 2012-01-13

[imp] added execute_2

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

Launchpad automatic translations update.

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

[REL] OpenERP 6.1rc1

3959. By Antony Lesuisse (OpenERP) on 2012-01-12

[FIX] add depends on xlwt

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

[FIX] res.partner.category: merge the 2 classes bearing the same name

The name conflict causes the second class to
shadow the first one, thus breaking future
references to the first one, including any
super() call inside it!
6.1 has 2-pass loading of models so we can
simply merge the two classes now, and get
rid of the issue.

3957. By Vo Minh Thu on 2012-01-12

[FIX] gunicorn.conf.py: undo the previous change (commited by mistake with another, intended, change).

3956. By Vo Minh Thu on 2012-01-12

[IMP] res_users.login(): eliminate a possibility to get a transaction rollbacked
because of concurrent access. This can happen when the same user is trying to log in
from many clients concurrently.

3955. By Launchpad Translations on behalf of openerp on 2012-01-12

Launchpad automatic translations update.