lp:~numerigraphe-team/ocb-server/7.0-import-non-local-warning-mat
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
Branch merges
Related source package recipes
Branch information
Recent revisions
- 5257. By Martin Trigaux (OpenERP)
-
[IMP] import resource (python module) in a way we avoid triggering the warning (name clash with module resource)
- 5254. By Martin Trigaux (OpenERP)
-
[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
- 5252. By Martin Trigaux (OpenERP)
-
[MERGE] [FIX] orm: create a foreign key for the function fields of type many2one and store value (opw #604792)
- 5251. By Olivier Dony (Odoo)
-
[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)
-
[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. - 5248. By Martin Trigaux (OpenERP)
-
[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:
- lp:ocb-server
