lp:~openerp-dev/openobject-server/6.0-opw-576744-rha

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openobject-server/6.0 at revision 3634

Olivier Dony (Odoo): Pending requested 2012-07-31

Diff: 46 lines (+26/-5)

1 file modified

bin/addons/base/res/res_user.py (+26/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #713216: Cannot login while MRP scheduler is running

Medium

Fix Released

Link a bug report

Related blueprints

3634. By Olivier Dony (Odoo) on 2012-08-22

[FIX] res_users: improve behavior when user record is locked during login

Avoid logging an ugly and frightening traceback,
plus properly rollback the failed transaction before
continuing.

3633. By Rifakat Husen (OpenERP) on 2012-07-31

[FIX] res.users: don't delay login() if user row is currently locked, backport of r4049

3632. By Launchpad Translations on behalf of openerp on 2012-07-24

Launchpad automatic translations update.

3631. By Xavier ALT on 2012-07-16

[MERGE] OPW 51167: report: fix header pageCount always zero + add automatic per-story pageCount

3630. By Launchpad Translations on behalf of openerp on 2012-07-09

Launchpad automatic translations update.

3629. By Launchpad Translations on behalf of openerp on 2012-07-08

Launchpad automatic translations update.

3628. By Launchpad Translations on behalf of openerp on 2012-07-07

Launchpad automatic translations update.

3627. By Olivier Dony (Odoo) on 2012-06-29

[MERGE] OPW 572856: translate: attempt to auto-detect user's language preferences when no context is available

3626. By Launchpad Translations on behalf of openerp on 2012-06-27

Launchpad automatic translations update.

3625. By Xavier ALT on 2012-06-19

[MERGE] orm: fix autogenerated tree view for object having no columns (taking 'id' as default)