Merge lp://staging/~openerp-dev/openobject-server/trunk-replace-inherit_option_id-xmo into lp://staging/openobject-server
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~openerp-dev/openobject-server/trunk-replace-inherit_option_id-xmo |
| Merge into: | lp://staging/openobject-server |
| Diff against target: |
753 lines (+491/-42) 5 files modified
openerp/addons/base/ir/ir_ui_view.py (+95/-13) openerp/addons/base/tests/test_views.py (+370/-10) openerp/import_xml.rng (+16/-2) openerp/osv/orm.py (+3/-13) openerp/tools/convert.py (+7/-4) |
| To merge this branch: | bzr merge lp://staging/~openerp-dev/openobject-server/trunk-replace-inherit_option_id-xmo |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Olivier Dony (Odoo) | Pending | ||
|
Review via email:
|
|||
Description of the change
Replaces inherit_option_id by a 3-state selection:
* always applied
* optional, currently enabled
* optional, currently disabled
Addons part (most of the work) at https:/
Unmerged revisions
- 5209. By Xavier (Open ERP)
-
[MERGE] from extended view inheritance, add help for application field
- 5208. By Xavier (Open ERP)
-
[IMP] inherit_option_id -> application
- 5207. By Xavier (Open ERP)
-
[IMP] prevent changing a view from application: always to application: disabled
not sure that's actually useful, and can still go always -> enabled -> disabled...
- 5206. By Xavier (Open ERP)
-
[ADD] application field & check during inheriting views read
- 5205. By Xavier (Open ERP)
-
[MERGE] from trunk
- 5204. By Xavier (Open ERP)
-
[ADD] support for primary mode in <template>
should probably validate that there's an inherit_id (?)
- 5203. By Xavier (Open ERP)
-
[ADD] use of explicit primary mode in read_combined
- 5202. By Xavier (Open ERP)
-
[FIX] default_view should be based on mode=primary, not on inherit_id=False
- 5201. By Xavier (Open ERP)
-
[ADD] mode attribute to views
Not used yet, only defined its relation to inherit_id:
not inherit_id + primary -> ok
not inherit_id + extension -> error
inherit_id + primary -> ok
inherit_id + extension -> ok - 5200. By Xavier (Open ERP)
-
[IMP] simplify handling of callable _constraint message
