Created by Lionel Sausin - Numérigraphe on 2014-05-14 and last modified on 2014-05-14

Fix an import conflict with the python module "resource".
Unchanged branch from lp:~openerp-dev/openobject-server/7.0-import-non-local-warning-mat
Green on runbot.

Get this branch:
bzr branch lp:~numerigraphe-team/ocb-server/7.0-import-non-local-warning-mat
Members of Numérigraphe can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

OpenERP Community Backports (Server)

Recent revisions

5257. By Martin Trigaux (OpenERP) on 2014-03-10

[IMP] import resource (python module) in a way we avoid triggering the warning (name clash with module resource)

5256. By Launchpad Translations on behalf of openerp on 2014-03-08

Launchpad automatic translations update.

5255. By Launchpad Translations on behalf of openerp on 2014-03-07

Launchpad automatic translations update.

5254. By Martin Trigaux (OpenERP) on 2014-03-06

[MERGE] [FIX] test ir.sequence: when testing the lock mechanism, verify the error based on an error code instead of the error message which is sensible to the locale of the system

5253. By Launchpad Translations on behalf of openerp on 2014-03-06

Launchpad automatic translations update.

5252. By Martin Trigaux (OpenERP) on 2014-03-05

[MERGE] [FIX] orm: create a foreign key for the function fields of type many2one and store value (opw #604792)

5251. By Olivier Dony (Odoo) on 2014-03-04

[FIX] orm.read_group: improve test coverage and corner case handling:

- allow leading spaces in orderby spec for m2o columns
- extra test for read_group on multiple columns
- proper handling of groupby on numeric column with default order

5250. By Olivier Dony (Odoo) on 2014-02-28

[FIX] orm.read_group: fix various issues introduced in recent commit, cleanup

Fixed the implementation of the sorting for inherited
columns, many2one columns, and aggregated columns.
Added corresponding tests with increased coverage of
the read_group() method.

5249. By Launchpad Translations on behalf of openerp on 2014-03-01

Launchpad automatic translations update.

5248. By Martin Trigaux (OpenERP) on 2014-02-26

[MERGE] [FIX] orm: when generating xml ids for export, use the model of the exported field instead of the current model. Courtesy of Stefan Rijnhart (Therp).

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.