Merge lp:~openerp-dev/openobject-addons/trunk-replace-inherit_option_id-xmo into lp:openobject-addons

[Xavier (Open ERP)]

Replaces inherit_option_id by a 3-state selection

Corresponding server changes at https://code.launchpad.net/~openerp-dev/openobject-server/trunk-replace-inherit_option_id-xmo/+merge/218404

Unmerged revisions

9424. By Xavier (Open ERP) on 2014-05-06

[FIX] website: inherit_option_id -> application

9423. By Xavier (Open ERP) on 2014-05-05

[IMP] renamed some stuff for clarity

9422. By Xavier (Open ERP) on 2014-05-05

[IMP] dict(int: True) -> set(int)

9421. By Xavier (Open ERP) on 2014-05-05

[IMP] use set to collect inherit_id and inherit_option_id

Also add a few comments to note understanding of code

9420. By Xavier (Open ERP) on 2014-05-05

[IMP] use sets to check for groups/ACL

rco notes that group tests are generally intersections, if the user has *any*
group set on the object he can see/use it. This change is a literal
translation of the original semantics, which may be wrong.

9419. By Xavier (Open ERP) on 2014-05-05

[IMP] no need to ensure an actual context if the method does not use it

just forwarding the context object does not count as using it, if callees want
a context they can ensure they've got one on their own

9418. By Xavier (Open ERP) on 2014-05-05

[IMP] don't pointlessly recreate view_obj every time _views_get is called, better use of pool & data APIs

9417. By Xavier (Open ERP) on 2014-05-05

[IMP] use sorted + key instead of sort + cmp

9416. By Xavier (Open ERP) on 2014-05-05

[REM] unused stack_result

=== modified file 'website/controllers/main.py'
--- website/controllers/main.py	2014-05-05 16:38:41 +0000
+++ website/controllers/main.py	2014-05-06 12:31:51 +0000
@@ -112,22 +112,25 @@
     @http.route('/website/theme_change', type='http', auth="user", website=True)
     def theme_change(self, theme_id=False, **kwargs):
         imd = request.registry['ir.model.data']
-        view = request.registry['ir.ui.view']
+        Views = request.registry['ir.ui.view']
 
-        view_model, view_option_id = imd.get_object_reference(
+        _, theme_template_id = imd.get_object_reference(
             request.cr, request.uid, 'website', 'theme')
-        views = view.search(
-            request.cr, request.uid, [('inherit_id', '=', view_option_id)],
-            context=request.context)
-        view.write(request.cr, request.uid, views, {'inherit_id': False},
-                   context=request.context)
+        views = Views.search(request.cr, request.uid, [
+            ('inherit_id', '=', theme_template_id),
+            ('application', '=', 'enabled'),
+        ], context=request.context)
+        Views.write(request.cr, request.uid, views, {
+            'application': 'disabled',
+        }, context=request.context)
 
         if theme_id:
             module, xml_id = theme_id.split('.')
-            view_model, view_id = imd.get_object_reference(
+            _, view_id = imd.get_object_reference(
                 request.cr, request.uid, module, xml_id)
-            view.write(request.cr, request.uid, [view_id],
-                       {'inherit_id': view_option_id}, context=request.context)
+            Views.write(request.cr, request.uid, [view_id], {
+                'application': 'enabled'
+            }, context=request.context)
 
         return request.render('website.themes', {'theme_changed': True})
 
@@ -151,54 +154,45 @@
         module_obj.button_immediate_upgrade(request.cr, request.uid, module_ids, context=request.context)
         return request.redirect(redirect)
 
-    @http.route('/website/customize_template_toggle', type='json', auth='user', website=True)
-    def customize_template_set(self, view_id):
-        view_obj = request.registry.get("ir.ui.view")
-        view = view_obj.browse(request.cr, request.uid, int(view_id),
-                               context=request.context)
-        if view.inherit_id:
-            value = False
-        else:
-            value = view.inherit_option_id and view.inherit_option_id.id or False
-        view_obj.write(request.cr, request.uid, [view_id], {
-            'inherit_id': value
-        }, context=request.context)
-        return True
-
     @http.route('/website/customize_template_get', type='json', auth='user', website=True)
-    def customize_template_get(self, xml_id, optional=True):
+    def customize_template_get(self, xml_id, full=False):
+        """ Lists the templates customizing ``xml_id``. By default, only
+        returns optional templates (which can be toggled on and off), if
+        ``full=True`` returns all templates customizing ``xml_id``
+        """
         imd = request.registry['ir.model.data']
         view_model, view_theme_id = imd.get_object_reference(
             request.cr, request.uid, 'website', 'theme')
 
-        user = request.registry['res.users'].browse(request.cr, request.uid, request.uid, request.context)
-        group_ids = [g.id for g in user.groups_id]
+        user = request.registry['res.users']\
+            .browse(request.cr, request.uid, request.uid, request.context)
+        user_groups = set(user.groups_id)
 
-        view = request.registry.get("ir.ui.view")
-        views = view._views_get(request.cr, request.uid, xml_id, context=request.context)
-        done = {}
+        views = request.registry["ir.ui.view"]\
+            ._views_get(request.cr, request.uid, xml_id, context=request.context)
+        done = set()
         result = []
         for v in views:
-            if v.groups_id and [g for g in v.groups_id if g.id not in group_ids]:
+            if not user_groups.issuperset(v.groups_id):
                 continue
-            if v.inherit_option_id and v.inherit_option_id.id != view_theme_id or not optional:
-                if v.inherit_option_id.id not in done:
+            if full or (v.application != 'always' and v.inherit_id.id != view_theme_id):
+                if v.inherit_id not in done:
                     result.append({
-                        'name': v.inherit_option_id.name,
+                        'name': v.inherit_id.name,
                         'id': v.id,
                         'xml_id': v.xml_id,
                         'inherit_id': v.inherit_id.id,
                         'header': True,
                         'active': False
                     })
-                    done[v.inherit_option_id.id] = True
+                    done.add(v.inherit_id)
                 result.append({
                     'name': v.name,
                     'id': v.id,
                     'xml_id': v.xml_id,
                     'inherit_id': v.inherit_id.id,
                     'header': False,
-                    'active': (v.inherit_id.id == v.inherit_option_id.id) or (not optional and v.inherit_id.id)
+                    'active': v.application in ('always', 'enabled'),
                 })
         return result
 

=== modified file 'website/models/ir_ui_view.py'
--- website/models/ir_ui_view.py	2014-05-05 16:38:41 +0000
+++ website/models/ir_ui_view.py	2014-05-06 12:31:51 +0000
@@ -13,8 +13,6 @@
 class view(osv.osv):
     _inherit = "ir.ui.view"
     _columns = {
-        'inherit_option_id': fields.many2one('ir.ui.view','Optional Inheritancy'),
-        'inherited_option_ids': fields.one2many('ir.ui.view','inherit_option_id','Optional Inheritancies'),
         'page': fields.boolean("Whether this view is a web page template (complete)"),
         'website_meta_title': fields.char("Website meta title", size=70, translate=True),
         'website_meta_description': fields.text("Website meta description", size=160, translate=True),
@@ -24,25 +22,30 @@
         'page': False,
     }
 
+
+    def _view_obj(self, cr, uid, view_id, context=None):
+        if isinstance(view_id, basestring):
+            return self.pool['ir.model.data'].xmlid_to_object(
+                cr, uid, view_id, raise_if_not_found=True, context=context
+            )
+        elif isinstance(view_id, (int, long)):
+            return self.browse(cr, uid, view_id, context=context)
+
+        # assume it's already a view object (WTF?)
+        return view_id
+
     # Returns all views (called and inherited) related to a view
     # Used by translation mechanism, SEO and optional templates
-    def _views_get(self, cr, uid, view, options=True, context=None, root=True, stack_result=None):
-        if not context:
-            context = {}
-        if not stack_result:
-            stack_result = []
-
-        def view_obj(view):
-            if isinstance(view, basestring):
-                mod_obj = self.pool.get("ir.model.data")
-                m, n = view.split('.')
-                view = mod_obj.get_object(cr, uid, m, n, context=context)
-            elif isinstance(view, (int, long)):
-                view = self.pool.get("ir.ui.view").browse(cr, uid, view, context=context)
-            return view
-
+    def _views_get(self, cr, uid, view_id, options=True, context=None, root=True):
+        """ For a given view ``view_id``, should return:
+
+        * the view itself
+        * all views inheriting from it, enabled or not
+          - but not the optional children of a non-enabled child
+        * all views called from it (via t-call)
+        """
         try:
-            view = view_obj(view)
+            view = self._view_obj(cr, uid, view_id, context=context)
         except ValueError:
             # Shall we log that ?
             return []
@@ -55,19 +58,25 @@
         node = etree.fromstring(view.arch)
         for child in node.xpath("//t[@t-call]"):
             try:
-                call_view = view_obj(child.get('t-call'))
+                called_view = self._view_obj(cr, uid, child.get('t-call'), context=context)
             except ValueError:
                 continue
-            if call_view not in result:
-                result += self._views_get(cr, uid, call_view, options=options, context=context, stack_result=result)
-
-        todo = view.inherit_children_ids
-        if options:
-            todo += filter(lambda x: not x.inherit_id, view.inherited_option_ids)
-        # Keep options in a determinitic order whatever their enabled disabled status
-        todo.sort(lambda x,y:cmp(x.id,y.id))
-        for child_view in todo:
-            for r in self._views_get(cr, uid, child_view, options=bool(child_view.inherit_id), context=context, root=False, stack_result=result):
+            if called_view not in result:
+                result += self._views_get(cr, uid, called_view, options=options, context=context)
+
+        extensions = view.inherit_children_ids
+        if not options:
+            # only active children
+            extensions = (v for v in view.inherit_children_ids
+                          if v.application in ('always', 'enabled'))
+
+        # Keep options in a deterministic order regardless of their applicability
+        for extension in sorted(extensions, key=lambda v: v.id):
+            for r in self._views_get(
+                    cr, uid, extension,
+                    # only return optional grandchildren if this child is enabled
+                    options=extension.application in ('always', 'enabled'),
+                    context=context, root=False):
                 if r not in result:
                     result.append(r)
         return result

=== modified file 'website/static/src/js/website.ace.js'
--- website/static/src/js/website.ace.js	2014-02-25 16:57:20 +0000
+++ website/static/src/js/website.ace.js	2014-05-06 12:31:51 +0000
@@ -97,7 +97,7 @@
             var viewId = $(document.documentElement).data('view-xmlid');
             openerp.jsonRpc('/website/customize_template_get', 'call', {
                 'xml_id': viewId,
-                'optional': false,
+                'full': true,
             }).then(function (views) {
                 self.loadViews.call(self, views);
                 self.open.call(self);

=== modified file 'website/static/src/js/website.editor.js'
--- website/static/src/js/website.editor.js	2014-04-23 15:48:52 +0000
+++ website/static/src/js/website.editor.js	2014-05-06 12:31:51 +0000
@@ -470,8 +470,14 @@
             });
             menu.on('click', 'a[data-action!=ace]', function (event) {
                 var view_id = $(event.currentTarget).data('view-id');
-                openerp.jsonRpc('/website/customize_template_toggle', 'call', {
-                    'view_id': view_id
+                return openerp.jsonRpc('/web/dataset/call_kw', 'call', {
+                    model: 'ir.ui.view',
+                    method: 'toggle',
+                    args: [],
+                    kwargs: {
+                        ids: [parseInt(view_id, 10)],
+                        context: website.get_context()
+                    }
                 }).then( function() {
                     window.location.reload();
                 });

=== modified file 'website/views/themes.xml'
--- website/views/themes.xml	2014-03-14 13:46:42 +0000
+++ website/views/themes.xml	2014-05-06 12:31:51 +0000
@@ -203,82 +203,82 @@
      All Default Themes
 -->
 
-    <template id="website.theme_amelia" name="Amelia" inherit_option_id="website.theme">
+    <template id="website.theme_amelia" name="Amelia" inherit_id="website.theme" optional="disabled">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/amelia.min.css' t-ignore="true"/>
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/amelia.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
-    <template id="website.theme_cerulean" name="Cerulean" inherit_option_id="website.theme">
+    <template id="website.theme_cerulean" name="Cerulean" inherit_id="website.theme" optional="disabled">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/cerulean.min.css' t-ignore="true"/>
         </xpath>
     </template>
 
-    <template id="website.theme_cosmo" name="Cosmo" inherit_option_id="website.theme">
+    <template id="website.theme_cosmo" name="Cosmo" inherit_id="website.theme" optional="disabled">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/cosmo.min.css' t-ignore="true"/>
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/cosmo.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
-    <template id="website.theme_cyborg" name="Cyborg" inherit_option_id="website.theme">
+    <template id="website.theme_cyborg" name="Cyborg" inherit_id="website.theme" optional="disabled">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/cyborg.min.css' t-ignore="true"/>
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/cyborg.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
-    <template id="website.theme_flatly" name="Flatly" inherit_option_id="website.theme">
+    <template id="website.theme_flatly" name="Flatly" inherit_id="website.theme" optional="disabled">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/flatly.min.css' t-ignore="true"/>
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/flatly.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
-    <template id="website.theme_journal" name="Journal" inherit_option_id="website.theme">
+    <template id="website.theme_journal" name="Journal" inherit_id="website.theme" optional="disabled">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/journal.min.css' t-ignore="true"/>
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/journal.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
-    <template id="website.theme_readable" name="Readable" inherit_option_id="website.theme">
+    <template id="website.theme_readable" name="Readable" inherit_id="website.theme" optional="disabled">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/readable.min.css' t-ignore="true"/>
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/readable.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
-    <template id="website.theme_simplex" name="Simplex" inherit_option_id="website.theme">
+    <template id="website.theme_simplex" name="Simplex" inherit_id="website.theme" optional="disabled">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/simplex.min.css' t-ignore="true"/>
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/simplex.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
-    <template id="website.theme_slate" name="Slate" inherit_option_id="website.theme">
+    <template id="website.theme_slate" name="Slate" inherit_id="website.theme" optional="disabled">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/slate.min.css' t-ignore="true"/>
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/slate.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
-    <template id="website.theme_spacelab" name="Spacelab" inherit_option_id="website.theme">
+    <template id="website.theme_spacelab" name="Spacelab" inherit_id="website.theme" optional="disabled">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/spacelab.min.css' t-ignore="true"/>
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/spacelab.fix.css' t-ignore="true"/>
         </xpath>
     </template>
 
-    <template id="website.theme_united" name="United" inherit_option_id="website.theme">
+    <template id="website.theme_united" name="United" inherit_id="website.theme" optional="disabled">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/united.min.css' t-ignore="true"/>
         </xpath>
     </template>
 
-    <template id="website.theme_yeti" name="Yeti" inherit_option_id="website.theme">
+    <template id="website.theme_yeti" name="Yeti" inherit_id="website.theme" optional="disabled">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/yeti.min.css' t-ignore="true"/>
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/yeti.fix.css' t-ignore="true"/>

=== modified file 'website/views/website_templates.xml'
--- website/views/website_templates.xml	2014-05-01 15:56:33 +0000
+++ website/views/website_templates.xml	2014-05-06 12:31:51 +0000
@@ -215,7 +215,7 @@
     </html>
 </template>
 
-<template id="layout_logo_show" inherit_id="website.layout" inherit_option_id="website.layout" name="Show Logo">
+<template id="layout_logo_show" inherit_id="website.layout" optional="enabled" name="Show Logo">
     <xpath expr="//header//a[@class='navbar-brand']" position="replace">
         <a href="/" class="navbar-brand logo">
             <img src="/logo.png"/>
@@ -261,43 +261,43 @@
     <script type="text/javascript">
         var CKEDITOR_BASEPATH = '/web/static/lib/ckeditor/';
     </script>
-    <link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
-    <link rel='stylesheet' href='/website/static/src/css/editor.css'/>
+        <link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
+        <link rel='stylesheet' href='/website/static/src/css/editor.css'/>
 
     <link rel='stylesheet' href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css"/>
 
-    <link rel="stylesheet" href="/web/static/lib/select2/select2.css"/>
-    <link rel="stylesheet" href="/website/static/lib/select2-bootstrap-css/select2-bootstrap.css"/>
-
-    <script type="text/javascript" src="/web/static/lib/select2/select2.js"></script>
-
-    <script type="text/javascript" src="/web/static/lib/ckeditor/ckeditor.js"></script>
+        <link rel="stylesheet" href="/web/static/lib/select2/select2.css"/>
+        <link rel="stylesheet" href="/website/static/lib/select2-bootstrap-css/select2-bootstrap.css"/>
+
+        <script type="text/javascript" src="/web/static/lib/select2/select2.js"></script>
+
+        <script type="text/javascript" src="/web/static/lib/ckeditor/ckeditor.js"></script>
     <script type="text/javascript" src="/website/static/lib/ace/ace.js"></script>
     <script type="text/javascript" src="/website/static/lib/ace/theme-monokai.js"></script>
     <script type="text/javascript" src="/website/static/lib/ace/mode-xml.js"></script>
-    <script type="text/javascript" src="/website/static/lib/vkbeautify/vkbeautify.0.99.00.beta.js"></script>
-    <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
-    <!-- mutation observers shim backed by mutation events (8 < IE < 11, Safari < 6, FF < 14, Chrome < 17) -->
-    <script type="text/javascript" src="/website/static/lib//jquery.mjs.nestedSortable/jquery.mjs.nestedSortable.js"></script>
-    <script type="text/javascript" src="/website/static/lib/MutationObservers/test/sidetable.js"></script>
-    <script type="text/javascript" src='/website/static/lib/nearest/jquery.nearest.js'></script>
-    <script type="text/javascript" src="/website/static/lib/MutationObservers/MutationObserver.js"></script>
+        <script type="text/javascript" src="/website/static/lib/vkbeautify/vkbeautify.0.99.00.beta.js"></script>
+        <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
+        <!-- mutation observers shim backed by mutation events (8 < IE < 11, Safari < 6, FF < 14, Chrome < 17) -->
+        <script type="text/javascript" src="/website/static/lib//jquery.mjs.nestedSortable/jquery.mjs.nestedSortable.js"></script>
+        <script type="text/javascript" src="/website/static/lib/MutationObservers/test/sidetable.js"></script>
+        <script type="text/javascript" src='/website/static/lib/nearest/jquery.nearest.js'></script>
+        <script type="text/javascript" src="/website/static/lib/MutationObservers/MutationObserver.js"></script>
 
-    <script type="text/javascript" src="/website/static/src/js/website.editor.js"></script>
+        <script type="text/javascript" src="/website/static/src/js/website.editor.js"></script>
     <script type="text/javascript" src="/website/static/src/js/website.editor.newpage.js"></script> <!-- groups="base.group_website_designer" -->
     <script type="text/javascript" src="/website/static/src/js/website.menu.js"></script> <!-- groups="base.group_website_designer" -->
-    <script type="text/javascript" src="/website/static/src/js/website.mobile.js"></script>
-    <script type="text/javascript" src="/website/static/src/js/website.seo.js"></script>
+        <script type="text/javascript" src="/website/static/src/js/website.mobile.js"></script>
+        <script type="text/javascript" src="/website/static/src/js/website.seo.js"></script>
     <script type="text/javascript" src="/website/static/src/js/website.tour.js"></script>
     <script type="text/javascript" src="/website/static/src/js/website.tour.banner.js"></script> <!-- groups="base.group_website_designer" -->
     <script type="text/javascript" src="/website/static/src/js/website.snippets.editor.js"></script>
     <script type="text/javascript" src="/website/static/src/js/website.ace.js"></script>
     <script type="text/javascript" src="/website/static/src/js/website.translator.js"></script>
 
-    <script type="text/javascript" src="/website/static/src/js/jQuery.transfo.js"></script>
+        <script type="text/javascript" src="/website/static/src/js/jQuery.transfo.js"></script>
 </template>
 
-<template id="debugger" inherit_option_id="website.layout" name="Debugger &amp; Tests">
+<template id="debugger" inherit_id="website.layout" optional="disabled" name="Debugger &amp; Tests">
     <xpath expr='//t[@name="layout_head"]' position="after">
         <script type="text/javascript" src="/website/static/src/js/website.tour.js"></script>
     </xpath>
@@ -311,7 +311,7 @@
     </xpath>
 </template>
 
-<template id="show_sign_in" inherit_option_id="website.layout" inherit_id="website.layout" name="Show Sign In" groups="base.group_public">
+<template id="show_sign_in" optional="enabled" inherit_id="website.layout" name="Show Sign In" groups="base.group_public">
     <xpath expr="//ul[@id='top_menu']" position="inside">
         <li class="divider"/>
         <li>
@@ -322,7 +322,7 @@
     </xpath>
 </template>
 
-<template id="footer_custom" inherit_option_id="website.layout" name="Custom Footer">
+<template id="footer_custom" inherit_id="website.layout" optional="disabled" name="Custom Footer">
     <xpath expr="//div[@id='footer_container']" position="before">
         <div class="oe_structure">
             <section data-snippet-id='three-columns' class="mt16 mb16">

=== modified file 'website_blog/views/website_blog_templates.xml'
--- website_blog/views/website_blog_templates.xml	2014-04-25 10:17:53 +0000
+++ website_blog/views/website_blog_templates.xml	2014-05-06 12:31:51 +0000
@@ -161,7 +161,7 @@
 
 <!-- Option: Blog Post List: show tags -->
 <template id="opt_blog_post_short_tags" name="Tags"
-        inherit_option_id="website_blog.blog_post_short" inherit_id="website_blog.blog_post_short">
+        optional="enabled" inherit_id="website_blog.blog_post_short">
     <xpath expr="//div[@name='blog_post_data']" position="inside">
         <p class="post-meta text-muted text-center" t-if="len(blog_post.tag_ids)">
             <span class="fa fa-tags"/>
@@ -264,7 +264,7 @@
 
 <!-- Options: Blog Post: breadcrumb -->
 <template id="blog_breadcrumb" name="Breadcrumb"
-        inherit_option_id="website_blog.blog_post_complete">
+        inherit_id="website_blog.blog_post_complete" optional="disabled">
     <xpath expr="//div[@id='title']" position="before">
         <div class="container">
           <div class="row">
@@ -284,7 +284,7 @@
 
 <!-- Options: Blog Post: user can reply -->
 <template id="opt_blog_post_complete_comment" name="Allow blog post comment"
-        inherit_option_id="website_blog.blog_post_complete"
+        inherit_id="website_blog.blog_post_complete" optional="disabled"
         groups="website_mail.group_comment">
     <xpath expr="//ul[@id='comments-list']" position="before">
         <section class="mb32 read_width css_editable_mode_hidden">
@@ -306,7 +306,7 @@
 
 <!-- Options: Blog Post: user can select text for tweet -->
 <template id="opt_blog_post_select_to_tweet" name="Select to Tweet"
-        inherit_option_id="website_blog.blog_post_complete">
+        inherit_id="website_blog.blog_post_complete" optional="disabled">
     <xpath expr="//div[@id='blog_content']" position="attributes">
         <attribute name="class">js_tweet mt32</attribute>
     </xpath>
@@ -317,7 +317,7 @@
 
 <!-- Options: Blog Post: user can add Inline Discussion -->
 <template id="opt_blog_post_inline_discussion" name="Allow comment in text"
-        inherit_option_id="website_blog.blog_post_complete">
+        inherit_id="website_blog.blog_post_complete" optional="disabled">
     <xpath expr="//div[@id='blog_content']" position="attributes">
         <attribute name="enable_chatter_discuss">True</attribute>
     </xpath>
@@ -325,7 +325,7 @@
 
 <!-- Options: Blog Post: show tags -->
 <template id="opt_blog_post_complete_tags" name="Tags"
-        inherit_option_id="website_blog.blog_post_complete" inherit_id="website_blog.blog_post_complete">
+        optional="enabled" inherit_id="website_blog.blog_post_complete">
     <xpath expr="//p[@name='blog_post_data']" position="after">
         <p class="post-meta text-muted text-center" t-if="len(blog_post.tag_ids)">
             <span class="fa fa-tags"/>
@@ -354,7 +354,7 @@
 <!-- Option:Right Column for extra info -->
 
 <template id="index_right" name="Right Column"
-        inherit_option_id="website_blog.blog_post_short">
+        inherit_id="website_blog.blog_post_short" optional="disabled">
     <xpath expr="//div[@id='main_column']" position="attributes">
         <attribute name="class">col-sm-8</attribute>
     </xpath>
@@ -365,7 +365,7 @@
 
 <!-- Option:Right Column: tags -->
 <template id="opt_blog_rc_tags" name="Tags"
-        inherit_option_id="website_blog.index_right">
+        inherit_id="website_blog.index_right" optional="disabled">
     <xpath expr="//div[@id='blog_right_column']" position="inside">
         <section class="mt32">
         <h4>Tags</h4>
@@ -382,7 +382,7 @@
 
 <!-- Option:Right Column: archives -->
 <template id="opt_blog_rc_history" name="Archives"
-        inherit_option_id="website_blog.index_right">
+        inherit_id="website_blog.index_right" optional="disabled">
     <xpath expr="//div[@id='blog_right_column']" position="inside">
         <section class="mt32">
         <h4>Archives</h4>
@@ -399,7 +399,7 @@
 
 <!-- Option:Right Column: about us -->
 <template id="opt_blog_rc_about_us" name="About Us" priority="2"
-        inherit_option_id="website_blog.index_right">
+        inherit_id="website_blog.index_right" optional="disabled">
     <xpath expr="//div[@id='blog_right_column']" position="inside">
         <section class="mt32">
         <h4>About us</h4>
@@ -416,7 +416,7 @@
 
 <!-- Option:Right Column: follow us -->
 <template id="opt_blog_rc_follow_us" name="Follow us" priority="4"
-        inherit_option_id="website_blog.index_right">
+        inherit_id="website_blog.index_right" optional="disabled">
     <xpath expr="//div[@id='blog_right_column']" position="inside">
         <section class="mt32">
             <h4>Follow us<small t-if="blog">: <t t-esc="blog.name"/></small></h4>
@@ -443,7 +443,7 @@
 
 <!-- Option:Right Column: blogs -->
 <template id="opt_blog_rc_blogs" name="Our Blogs" priority="6"
-        inherit_option_id="website_blog.index_right">
+        inherit_id="website_blog.index_right" optional="disabled">
     <xpath expr="//div[@id='blog_right_column']" position="inside">
         <section class="mt32 mb32">
         <h4>Our Blogs</h4>

=== modified file 'website_crm/views/website_crm.xml'
--- website_crm/views/website_crm.xml	2014-04-08 14:41:10 +0000
+++ website_crm/views/website_crm.xml	2014-05-06 12:31:51 +0000
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 
-<template id="contactus_form" name="Contact Form" inherit_id="website.contactus" inherit_option_id="website.contactus">
+<template id="contactus_form" name="Contact Form" inherit_id="website.contactus" optional="enabled">
     <xpath expr="//div[@name='mail_button']" position="replace">
         <form action="/crm/contactus" method="post" class="form-horizontal mt32" enctype="multipart/form-data">
             <t t-foreach="kwargs" t-as="kwarg">
@@ -47,7 +47,7 @@
     </xpath>
 </template>
 
-<template id="contactus_form_company_name" name="Company Name" inherit_id="website_crm.contactus_form" inherit_option_id="website_crm.contactus_form">
+<template id="contactus_form_company_name" name="Company Name" inherit_id="website_crm.contactus_form" optional="enabled">
     <xpath expr="//div[@name='email_from_container']" position="after">
         <div t-attf-class="form-group #{error and 'partner_name' in error and 'has-error' or ''}">
             <label class="col-md-3 col-sm-4 control-label" for="partner_name">Your Company</label>

=== modified file 'website_crm_partner_assign/views/website_crm_partner_assign.xml'
--- website_crm_partner_assign/views/website_crm_partner_assign.xml	2014-03-14 16:23:46 +0000
+++ website_crm_partner_assign/views/website_crm_partner_assign.xml	2014-05-06 12:31:51 +0000
@@ -108,7 +108,7 @@
     </t>
 </template>
 
-<template id="ref_country" inherit_id="website_crm_partner_assign.index" inherit_option_id="website_crm_partner_assign.index" name="Left World Map">
+<template id="ref_country" inherit_id="website_crm_partner_assign.index" optional="enabled" name="Left World Map">
     <xpath expr="//ul[@id='reseller_countries']" position="after">
         <h3>World Map</h3>
         <ul class="nav">

=== modified file 'website_customer/views/website_customer.xml'
--- website_customer/views/website_customer.xml	2014-03-14 16:23:46 +0000
+++ website_customer/views/website_customer.xml	2014-05-06 12:31:51 +0000
@@ -65,7 +65,7 @@
 </template>
 
 <!-- Option: left column: World Map -->
-<template id="opt_country" inherit_option_id="website_customer.index" name="Show Map">
+<template id="opt_country" inherit_id="website_customer.index" optional="disabled" name="Show Map">
     <xpath expr="//div[@id='ref_left_column']" position="inside">
 
         <iframe t-attf-src="/google_map/?partner_ids=#{ google_map_partner_ids }&amp;partner_url=/customers/&amp;output=embed"
@@ -73,7 +73,7 @@
     </xpath>
 </template>
 
-<template id="opt_country_list" inherit_id="website_customer.index" inherit_option_id="website_customer.index" name="Filter on Countries">
+<template id="opt_country_list" inherit_id="website_customer.index" optional="enabled" name="Filter on Countries">
     <xpath expr="//div[@id='ref_left_column']" position="inside">
         <h3>References by Country</h3>
         <ul class="nav nav-pills nav-stacked mt16 mb32">
@@ -119,7 +119,7 @@
   </t>
 </template>
 
-<template id="partner_assign" inherit_option_id="website_customer.details" inherit_id="website_customer.details" name="Implemented By">
+<template id="partner_assign" optional="enabled" inherit_id="website_customer.details" name="Implemented By">
     <xpath expr="//div[@id='left_column']" position="inside">
         <t t-if="assigned_partner_data">
             <div class="panel panel-default">

=== modified file 'website_event/views/website_event.xml'
--- website_event/views/website_event.xml	2014-05-01 20:01:50 +0000
+++ website_event/views/website_event.xml	2014-05-06 12:31:51 +0000
@@ -87,7 +87,7 @@
     </t>
 </template>
 
-<template id="event_right_photos" inherit_option_id="website_event.index" name="Photos">
+<template id="event_right_photos" inherit_id="website_event.index" optional="disabled" name="Photos">
     <xpath expr="//div[@id='right_column']" position="inside">
         <div class="row">
             <div class="col-md-12 mb16">
@@ -106,7 +106,7 @@
     </xpath>
 </template>
 
-<template id="event_right_quotes" inherit_option_id="website_event.index" name="Quotes">
+<template id="event_right_quotes" inherit_id="website_event.index" optional="disabled" name="Quotes">
     <xpath expr="//div[@id='right_column']" position="inside">
         <div class="row">
             <div class="col-md-12 mb16">
@@ -123,7 +123,7 @@
     </xpath>
 </template>
 
-<template id="event_right_country_event" inherit_option_id="website_event.index" name="Country Events">
+<template id="event_right_country_event" inherit_id="website_event.index" optional="disabled" name="Country Events">
     <xpath expr="//div[@id='right_column']" position="inside">
         <div class="row">
             <div class="col-md-12 mb16 mt16 country_events">
@@ -140,7 +140,7 @@
     </xpath>
 </template>
 
-<template id="event_left_column" inherit_option_id="website_event.index" inherit_id="website_event.index" name="Filters">
+<template id="event_left_column" optional="enabled" inherit_id="website_event.index" name="Filters">
     <xpath expr="//div[@id='middle_column']" position="attributes">
         <attribute name="class">col-md-6</attribute>
     </xpath>
@@ -159,7 +159,7 @@
     </xpath>
 </template>
 
-<template id="event_category" inherit_option_id="website_event.event_left_column" name="Filter by Category">
+<template id="event_category" inherit_id="website_event.event_left_column" optional="disabled" name="Filter by Category">
     <xpath expr="//div[@id='left_column']" position="inside">
         <ul class="nav nav-pills nav-stacked mt32">
             <t t-foreach="types">
@@ -173,7 +173,7 @@
     </xpath>
 </template>
 
-<template id="event_location" inherit_option_id="website_event.event_left_column" name="Filter by Country">
+<template id="event_location" inherit_id="website_event.event_left_column" optional="disabled" name="Filter by Country">
     <xpath expr="//div[@id='left_column']" position="inside">
         <ul class="nav nav-pills nav-stacked mt32">
             <t t-foreach="countries">

=== modified file 'website_event_sale/views/website_event_sale.xml'
--- website_event_sale/views/website_event_sale.xml	2014-04-24 13:45:33 +0000
+++ website_event_sale/views/website_event_sale.xml	2014-05-06 12:31:51 +0000
@@ -26,7 +26,7 @@
     </xpath>
 </template>
 
-<template id="event_description_full" inherit_id="website_event.event_description_full" inherit_option_id="website_event.event_description_full" name="Event's Ticket form">
+<template id="event_description_full" inherit_id="website_event.event_description_full" optional="enabled" name="Event's Ticket form">
     <xpath expr="//div[@t-field='event.description']" position="before">
         <form t-attf-action="/event/add_cart?event_id=#{ event.id }" method="post" t-if="event.event_ticket_ids">
             <table itemprop="offers" class="table table-striped">

=== modified file 'website_event_track/views/website_event.xml'
--- website_event_track/views/website_event.xml	2014-04-09 18:43:34 +0000
+++ website_event_track/views/website_event.xml	2014-05-06 12:31:51 +0000
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 
-<template name="Sponsors" id="event_sponsor" inherit_option_id="website_event.layout" inherit_id="website_event.layout">
+<template name="Sponsors" id="event_sponsor" optional="enabled" inherit_id="website_event.layout">
     <xpath expr="//t[@t-call='website.layout']" position="inside">
         <t t-set="head">
             <link rel='stylesheet' href='/website_event_track/static/src/css/website_event_track.css'/>
@@ -155,7 +155,7 @@
     </t>
 </template>
 
-<template id="tracks_filter" inherit_id="website_event_track.tracks" inherit_option_id="website_event_track.tracks" name="Filter on Tags">
+<template id="tracks_filter" inherit_id="website_event_track.tracks" optional="enabled" name="Filter on Tags">
     <xpath expr="//div[@id='left_column']" position="inside">
         <ul class="nav nav-pills nav-stacked">
             <li t-att-class="'' if searches.get('tag') else 'active'"><a t-attf-href="/event/#{ slug(event) }/track">All Tags</a></li>
@@ -244,7 +244,7 @@
     </t>
 </template>
 
-<template id="event_track_social" name="Social Widgets" inherit_option_id="website_event_track.track_view">
+<template id="event_track_social" name="Social Widgets" inherit_id="website_event_track.track_view" optional="disabled">
     <xpath expr="//div[@id='right_column']" position="inside">
         <div class="panel panel-default">
             <div class="panel-heading">

=== modified file 'website_hr/views/website_hr.xml'
--- website_hr/views/website_hr.xml	2013-12-12 10:58:21 +0000
+++ website_hr/views/website_hr.xml	2014-05-06 12:31:51 +0000
@@ -3,7 +3,7 @@
 <data>
 <!-- Page --> 
 
-<template id="aboutus" inherit_id="website.aboutus" inherit_option_id="website.aboutus" name="Our Team">
+<template id="aboutus" inherit_id="website.aboutus" optional="enabled" name="Our Team">
     <xpath expr="//div[@class='oe_structure']" position="after">
         <section class="container">
             <div class="col-sm-12 text-center" t-if="len(employee_ids)">

=== modified file 'website_hr_recruitment/views/templates.xml'
--- website_hr_recruitment/views/templates.xml	2014-04-25 10:17:53 +0000
+++ website_hr_recruitment/views/templates.xml	2014-05-06 12:31:51 +0000
@@ -230,7 +230,7 @@
     </t>
 </template>
 
-<template id="job_departments" inherit_option_id="website_hr_recruitment.index" name="Filter by Departments">
+<template id="job_departments" inherit_id="website_hr_recruitment.index" optional="disabled" name="Filter by Departments">
     <xpath expr="//div[@id='jobs_grid_left']" position="inside">
         <ul class="nav nav-pills nav-stacked mb32">
             <li t-att-class=" '' if department_id else 'active' "><a href="/jobs">All Departments</a></li>
@@ -249,7 +249,7 @@
     </xpath>
 </template>
 
-<template id="job_offices" inherit_option_id="website_hr_recruitment.index" name="Filter by Offices">
+<template id="job_offices" inherit_id="website_hr_recruitment.index" optional="disabled" name="Filter by Offices">
     <xpath expr="//div[@id='jobs_grid_left']" position="inside">
         <ul class="nav nav-pills nav-stacked mb32">
             <li t-att-class=" '' if office_id else 'active' "><a href="/jobs">All Offices</a></li>

=== modified file 'website_membership/views/website_membership.xml'
--- website_membership/views/website_membership.xml	2014-03-17 06:14:19 +0000
+++ website_membership/views/website_membership.xml	2014-05-06 12:31:51 +0000
@@ -81,7 +81,7 @@
 </template>
 
 <template id="opt_index_country" name="Location"
-        inherit_option_id="website_membership.index" inherit_id="website_membership.index">
+        optional="enabled" inherit_id="website_membership.index">
     <xpath expr="//div[@id='left_column']/ul[last()]" position="after">
         <ul class="nav nav-pills nav-stacked mt16">
             <li class="nav-header"><h3>Location</h3></li>
@@ -98,7 +98,7 @@
 
 <!-- Option: index: Left Google Map -->
 <template id="opt_index_google_map" name="Left World Map"
-        inherit_option_id="website_membership.index" inherit_id="website_membership.index">
+        optional="enabled" inherit_id="website_membership.index">
     <xpath expr="//div[@id='left_column']/ul[1]" position="before">
         <ul class="nav nav-pills nav-stacked mt16">
             <li class="nav-header"><h3>World Map</h3></li>

=== modified file 'website_quote/views/website_quotation.xml'
--- website_quote/views/website_quotation.xml	2014-01-28 20:50:17 +0000
+++ website_quote/views/website_quotation.xml	2014-05-06 12:31:51 +0000
@@ -92,7 +92,7 @@
       </section>
   </template>
 
-  <template id="change_quantity" inherit_option_id="website_quote.pricing" name="Change Quantity">
+  <template id="change_quantity" inherit_id="website_quote.pricing" optional="disabled" name="Change Quantity">
       <xpath expr="//div[@id='quote_qty']" position="replace">
           <div class="input-group">
               <span class="input-group-addon hidden-print">
@@ -130,7 +130,7 @@
   </template>
 
   <!-- Options:Quotation Chatter: user can reply -->
-  <template id="opt_quotation_chatter_post_complete_comment" name="Allow Comments" inherit_option_id="website_quote.chatter" inherit_id="website_quote.chatter">
+  <template id="opt_quotation_chatter_post_complete_comment" name="Allow Comments" optional="enabled" inherit_id="website_quote.chatter">
       <xpath expr="//h1" position="after">
           <section class="mb32 css_editable_mode_hidden hidden-print">
               <form id="comment" t-attf-action="/quote/#{quotation.id}/#{quotation.access_token}/post" method="POST">
@@ -388,7 +388,7 @@
   </template>
 
   <!-- Options:Quotation Signature -->
-  <template id="opt_quotation_signature" name="Ask Signature" inherit_option_id="website_quote.so_quotation" inherit_id="website_quote.so_quotation">
+  <template id="opt_quotation_signature" name="Ask Signature" optional="enabled" inherit_id="website_quote.so_quotation">
       <xpath expr="//div[@id='sign-dialog']" position="inside">
         <div class="panel panel-default mt16 mb0" id="drawsign">
             <div class="panel-heading">

=== modified file 'website_sale/views/website_sale.xml'
--- website_sale/views/website_sale.xml	2014-04-25 10:17:53 +0000
+++ website_sale/views/website_sale.xml	2014-05-06 12:31:51 +0000
@@ -221,7 +221,7 @@
 
 <!-- Product Description-->
 
-<template id="product_description" inherit_option_id="website_sale.products_cart" name="Product Description">
+<template id="product_description" inherit_id="website_sale.products_cart" optional="disabled" name="Product Description">
   <xpath expr="//div[@class='product_price']" position="before">
       <div class="text-info oe_subdescription" contenteditable="false">
         <div itemprop="description" t-field="product.description_sale"></div>
@@ -231,7 +231,7 @@
 
 <!-- Add to cart button-->
 
-<template id="add_to_basket" inherit_option_id="website_sale.products_cart" name="Add to Cart">
+<template id="add_to_basket" inherit_id="website_sale.products_cart" optional="disabled" name="Add to Cart">
   <xpath expr="//div[@class='product_price']" position="inside">
       <form action="/shop/add_cart" method="post" style="display: inline-block;">
           <input name="product_id" t-att-value="product.product_variant_ids[0].id" type="hidden"/>
@@ -242,7 +242,7 @@
 
 <!-- List view of products -->
 
-<template id="list_view" inherit_option_id="website_sale.products" name="List View">
+<template id="list_view" inherit_id="website_sale.products" optional="disabled" name="List View">
   <xpath expr="//div[@id='products_grid']//table" position="replace">
     <t t-foreach="products" t-as="product">
       <div class="oe_product oe_list oe_product_cart" t-att-data-publish="product.website_published and 'on' or 'off'">
@@ -362,7 +362,7 @@
 </template>
 
 <!-- Product option: related / recommended products -->
-<template id="recommended_products" inherit_id="website_sale.product" inherit_option_id="website_sale.product" name="Recommended Products">
+<template id="recommended_products" inherit_id="website_sale.product" optional="enabled" name="Recommended Products">
   <xpath expr="//div[@id='product_full_description']" position="after">
       <div class="container mt32" t-if="product.recommended_products()">
           <h3>Customers who have bought this product also bought:</h3>
@@ -387,7 +387,7 @@
 </template>
 
 <!-- Product option: attributes -->
-<template id="product_attributes" inherit_id="website_sale.product" inherit_option_id="website_sale.product" name="Product attributes" groups="product.group_product_attributes">
+<template id="product_attributes" inherit_id="website_sale.product" optional="enabled" name="Product attributes" groups="product.group_product_attributes">
 <xpath expr="//p[@t-field='product.description_sale']" position="after">
   <hr t-if="product.attribute_lines"/>
   <p class="text-muted">
@@ -398,7 +398,7 @@
 </template>
 
 <!-- Product options: OpenChatter -->
-<template id="product_option_openchatter" inherit_option_id="website_sale.product" name="Discussion">
+<template id="product_option_openchatter" inherit_id="website_sale.product" optional="disabled" name="Discussion">
     <xpath expr="//div[@t-field='product.website_description']" position="after">
         <hr class="mb32"/>
         <section class="container">
@@ -569,7 +569,7 @@
 </template>
 
 
-<template id="continue_shopping" inherit_id="website_sale.mycart" inherit_option_id="website_sale.mycart" name="Continue Shopping Button">
+<template id="continue_shopping" inherit_id="website_sale.mycart" optional="enabled" name="Continue Shopping Button">
   <xpath expr="//a[@href='/shop/checkout']" position="before">
     <a href="/shop" class="btn btn-default mb32"><span class="fa fa-long-arrow-left"/> Continue Shopping</a>
   </xpath>
@@ -578,7 +578,7 @@
 
 <!-- Page Shop -->
 
-<template id="products_categories" inherit_option_id="website_sale.products" name="Product Categories">
+<template id="products_categories" inherit_id="website_sale.products" optional="disabled" name="Product Categories">
   <xpath expr="//div[@id='products_grid_before']" position="inside">
       <ul class="nav nav-pills nav-stacked mt16">
           <li t-att-class=" '' if category else 'active' "><a href="/shop">All Products</a></li>
@@ -595,7 +595,7 @@
   </xpath>
 </template>
 
-<template id="products_attributes" inherit_id="website_sale.products" inherit_option_id="website_sale.products" name="Product attribute's Filters" groups="product.group_product_attributes">
+<template id="products_attributes" inherit_id="website_sale.products" optional="enabled" name="Product attribute's Filters" groups="product.group_product_attributes">
   <xpath expr="//div[@id='products_grid_before']" position="inside">
       <form t-attf-action="/shop/filters?{{ keep_query('search', category=(category and int(category))) }}" class="attributes" method="post">
           <ul class="nav nav-pills nav-stacked mt16">
@@ -639,7 +639,7 @@
   </xpath>
 </template>
 
-<template id="suggested_products_list" inherit_id="website_sale.mycart" inherit_option_id="website_sale.mycart" name="Suggested Products in my cart">
+<template id="suggested_products_list" inherit_id="website_sale.mycart" optional="enabled" name="Suggested Products in my cart">
   <xpath expr="//table[@id='mycart_products']" position="after">
       <table t-if="suggested_products" class='table table-striped table-condensed'>
           <colgroup>
@@ -695,7 +695,7 @@
   </xpath>
 </template>
 
-<template id="reduction_code" inherit_option_id="website_sale.mycart" name="Reduction Code">
+<template id="reduction_code" inherit_id="website_sale.mycart" optional="disabled" name="Reduction Code">
   <xpath expr="//div[@id='right_column']" position="inside">
       <h4>Coupon Code</h4>
       <p>