Merge lp:~openerp-dev/openobject-server/trunk-fix-unlink-irmodelfields-chs into lp:openobject-server
Status: | Needs review |
---|---|
Proposed branch: | lp:~openerp-dev/openobject-server/trunk-fix-unlink-irmodelfields-chs |
Merge into: | lp:openobject-server |
Diff against target: |
389 lines (+83/-58) 7 files modified
openerp/addons/base/base.sql (+1/-0) openerp/addons/base/ir/ir_model.py (+32/-26) openerp/addons/base/module/module.py (+2/-9) openerp/modules/db.py (+10/-3) openerp/modules/loading.py (+4/-2) openerp/osv/orm.py (+32/-12) openerp/service/db.py (+2/-6) |
To merge this branch: | bzr merge lp:~openerp-dev/openobject-server/trunk-fix-unlink-irmodelfields-chs |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP Core Team | Pending | ||
Review via email: mp+207622@code.launchpad.net |
Unmerged revisions
- 4967. By Christophe Simonis (OpenERP)
-
merge upstream
- 4966. By Christophe Simonis (OpenERP)
-
[FIX] base: pre-create table_name column on ir_model table
- 4965. By Christophe Simonis (OpenERP)
-
[MERGE] go trunk
- 4964. By Christophe Simonis (OpenERP)
-
[IMP] ir.model: new field table_name, allow deletion of table and views that are not in the registry
- 4963. By Christophe Simonis (OpenERP)
-
[IMP] create_
categories( ): avoid a useless query as we already know the xmlids - 4962. By Christophe Simonis (OpenERP)
-
[FIX] ir_module_
module. _update_ category( ): do not try to be clever and always call create_categories() to be sure xmlids are tracked - 4961. By Christophe Simonis (OpenERP)
-
[IMP] ir_model_
data._process_ end(): also log xmlid of deleted records - 4960. By Christophe Simonis (OpenERP)
-
[FIX] ir_model_
data._process_ end(): correct context passed to unlink() - 4959. By Christophe Simonis (OpenERP)
-
[FIX] do not set the category of modules at initialization. Wait the registry to be available to allow tracking of generated xmlids
- 4958. By Christophe Simonis (OpenERP)
-
[FIX] orm: during update of ir.model and ir.model.fields, mark xmlid's to force unlink() of deleted models and columns.
[FIX] ir.model.data: during cleanup of deleted xmlid's, also delete ones with noupdate set to NULL. Force unlink() of ir.model and ir.model.fields records