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

[Xavier (Open ERP)]

Builds on https://code.launchpad.net/~openerp-dev/openobject-server/trunk-extended-view-inheritance-xmo/+merge/218256

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://code.launchpad.net/~openerp-dev/openobject-addons/trunk-replace-inherit_option_id-xmo/+merge/218403

[lp:~openerp-dev/openobject-server/trunk-replace-inherit_option_id-xmo]

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

[MERGE] from extended view inheritance, add help for application field

Unmerged revisions

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

[MERGE] from extended view inheritance, add help for application field

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

[IMP] inherit_option_id -> application

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

[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) on 2014-05-06

[ADD] application field & check during inheriting views read

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

[MERGE] from trunk

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

[ADD] support for primary mode in <template>

should probably validate that there's an inherit_id (?)

5203. By Xavier (Open ERP) on 2014-05-02

[ADD] use of explicit primary mode in read_combined

5202. By Xavier (Open ERP) on 2014-05-02

[FIX] default_view should be based on mode=primary, not on inherit_id=False

5201. By Xavier (Open ERP) on 2014-05-02

[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) on 2014-04-30

[IMP] simplify handling of callable _constraint message

=== modified file 'openerp/addons/base/ir/ir_ui_view.py'
--- openerp/addons/base/ir/ir_ui_view.py	2014-05-01 15:26:04 +0000
+++ openerp/addons/base/ir/ir_ui_view.py	2014-05-06 14:57:36 +0000
@@ -117,8 +117,36 @@
         'groups_id': fields.many2many('res.groups', 'ir_ui_view_group_rel', 'view_id', 'group_id',
             string='Groups', help="If this field is empty, the view applies to all users. Otherwise, the view applies to the users of those groups only."),
         'model_ids': fields.one2many('ir.model.data', 'res_id', domain=[('model','=','ir.ui.view')], auto_join=True),
+
+        'mode': fields.selection(
+            [('primary', "Base view"), ('extension', "Extension View")],
+            string="View inheritance mode", required=True,
+            help="""Only applies if this view inherits from an other one (inherit_id is not False/Null).
+
+* if extension (default), if this view is requested the closest primary view
+  is looked up (via inherit_id), then all views inheriting from it with this
+  view's model are applied
+* if primary, the closest primary view is fully resolved (even if it uses a
+  different model than this one), then this view's inheritance specs
+  (<xpath/>) are applied, and the result is used as if it were this view's
+  actual arch.
+"""),
+
+        'application': fields.selection([
+                ('always', "Always applied"),
+                ('enabled', "Optional, enabled"),
+                ('disabled', "Optional, disabled"),
+            ],
+            required=True, string="Application status",
+            help="""If this view is inherited,
+* if always, the view always extends its parent
+* if enabled, the view currently extends its parent but can be disabled
+* if disabled, the view currently does not extend its parent but can be enabled
+             """),
     }
     _defaults = {
+        'mode': 'primary',
+        'application': 'always',
         'priority': 16,
     }
     _order = "priority,name"
@@ -167,8 +195,14 @@
                         return False
         return True
 
+    _sql_constraints = [
+        ('inheritance_mode',
+         "CHECK (mode != 'extension' OR inherit_id IS NOT NULL)",
+         "Invalid inheritance mode: if the mode is 'extension', the view must"
+         " extend an other view"),
+    ]
     _constraints = [
-        (_check_xml, 'Invalid view definition', ['arch'])
+        (_check_xml, 'Invalid view definition', ['arch']),
     ]
 
     def _auto_init(self, cr, context=None):
@@ -177,6 +211,12 @@
         if not cr.fetchone():
             cr.execute('CREATE INDEX ir_ui_view_model_type_inherit_id ON ir_ui_view (model, inherit_id)')
 
+    def _compute_defaults(self, cr, uid, values, context=None):
+        if 'inherit_id' in values:
+            values.setdefault(
+                'mode', 'extension' if values['inherit_id'] else 'primary')
+        return values
+
     def create(self, cr, uid, values, context=None):
         if 'type' not in values:
             if values.get('inherit_id'):
@@ -185,10 +225,13 @@
                 values['type'] = etree.fromstring(values['arch']).tag
 
         if not values.get('name'):
-            values['name'] = "%s %s" % (values['model'], values['type'])
+            values['name'] = "%s %s" % (values.get('model'), values['type'])
 
         self.read_template.clear_cache(self)
-        return super(view, self).create(cr, uid, values, context)
+        return super(view, self).create(
+            cr, uid,
+            self._compute_defaults(cr, uid, values, context=context),
+            context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
         if not isinstance(ids, (list, tuple)):
@@ -202,17 +245,43 @@
         if custom_view_ids:
             self.pool.get('ir.ui.view.custom').unlink(cr, uid, custom_view_ids)
 
+        if vals.get('application') == 'disabled':
+            from_always = self.search(
+                cr, uid, [('id', 'in', ids), ('application', '=', 'always')], context=context)
+            if from_always:
+                raise ValueError(
+                    "Can't disable views %s marked as always applied" % (
+                        ', '.join(map(str, from_always))))
+
         self.read_template.clear_cache(self)
-        ret = super(view, self).write(cr, uid, ids, vals, context)
+        ret = super(view, self).write(
+            cr, uid, ids,
+            self._compute_defaults(cr, uid, vals, context=context),
+            context)
 
         # if arch is modified views become noupdatable
-        if 'arch' in vals and not context.get('install_mode', False):
+        if 'arch' in vals and not context.get('install_mode'):
             # TODO: should be doable in a read and a write
             for view_ in self.browse(cr, uid, ids, context=context):
                 if view_.model_data_id:
                     self.pool.get('ir.model.data').write(cr, openerp.SUPERUSER_ID, view_.model_data_id.id, {'noupdate': True})
         return ret
 
+    def toggle(self, cr, uid, ids, context=None):
+        """ Switches between enabled and disabled application statuses
+        """
+        for view in self.browse(cr, uid, ids, context=context):
+            if view.application == 'enabled':
+                view.write({'application': 'disabled'})
+            elif view.application == 'disabled':
+                view.write({'application': 'enabled'})
+            else:
+                raise ValueError(_("Can't toggle view %d with application %r") % (
+                    view.id,
+                    view.application,
+                ))
+
+
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
@@ -224,7 +293,7 @@
     # default view selection
     def default_view(self, cr, uid, model, view_type, context=None):
         """ Fetches the default view for the provided (model, view_type) pair:
-         view with no parent (inherit_id=Fase) with the lowest priority.
+         primary view with the lowest priority.
 
         :param str model:
         :param int view_type:
@@ -234,7 +303,7 @@
         domain = [
             ['model', '=', model],
             ['type', '=', view_type],
-            ['inherit_id', '=', False],
+            ['mode', '=', 'primary'],
         ]
         ids = self.search(cr, uid, domain, limit=1, order='priority', context=context)
         if not ids:
@@ -260,15 +329,19 @@
 
         user_groups = frozenset(self.pool.get('res.users').browse(cr, 1, uid, context).groups_id)
 
-        check_view_ids = context and context.get('check_view_ids') or (0,)
-        conditions = [['inherit_id', '=', view_id], ['model', '=', model]]
+        conditions = [
+            ['inherit_id', '=', view_id],
+            ['model', '=', model],
+            ['mode', '=', 'extension'],
+            ['application', 'in', ['always', 'enabled']],
+        ]
         if self.pool._init:
             # Module init currently in progress, only consider views from
             # modules whose code is already loaded
             conditions.extend([
                 '|',
                 ['model_ids.module', 'in', tuple(self.pool._init_modules)],
-                ['id', 'in', check_view_ids],
+                ['id', 'in', context and context.get('check_view_ids') or (0,)],
             ])
         view_ids = self.search(cr, uid, conditions, context=context)
 
@@ -424,7 +497,7 @@
         if context is None: context = {}
         if root_id is None:
             root_id = source_id
-        sql_inherit = self.pool.get('ir.ui.view').get_inheriting_views_arch(cr, uid, source_id, model, context=context)
+        sql_inherit = self.pool['ir.ui.view'].get_inheriting_views_arch(cr, uid, source_id, model, context=context)
         for (specs, view_id) in sql_inherit:
             specs_tree = etree.fromstring(specs.encode('utf-8'))
             if context.get('inherit_branding'):
@@ -447,7 +520,7 @@
 
         # if view_id is not a root view, climb back to the top.
         base = v = self.browse(cr, uid, view_id, context=context)
-        while v.inherit_id:
+        while v.mode != 'primary':
             v = v.inherit_id
         root_id = v.id
 
@@ -457,7 +530,16 @@
 
         # read the view arch
         [view] = self.read(cr, uid, [root_id], fields=fields, context=context)
-        arch_tree = etree.fromstring(view['arch'].encode('utf-8'))
+        view_arch = etree.fromstring(view['arch'].encode('utf-8'))
+        if not v.inherit_id:
+            arch_tree = view_arch
+        else:
+            parent_view = self.read_combined(
+                cr, uid, v.inherit_id.id, fields=fields, context=context)
+            arch_tree = etree.fromstring(parent_view['arch'])
+            self.apply_inheritance_specs(
+                cr, uid, arch_tree, view_arch, parent_view['id'], context=context)
+
 
         if context.get('inherit_branding'):
             arch_tree.attrib.update({
 
=== modified file 'openerp/addons/base/tests/test_views.py'
--- openerp/addons/base/tests/test_views.py	2014-04-08 11:49:36 +0000
+++ openerp/addons/base/tests/test_views.py	2014-05-06 14:57:36 +0000
@@ -1,12 +1,16 @@
 # -*- encoding: utf-8 -*-
 from functools import partial
+import itertools
 
 import unittest2
 
 from lxml import etree as ET
 from lxml.builder import E
 
+from psycopg2 import IntegrityError
+
 from openerp.tests import common
+import openerp.tools
 
 Field = E.field
 
@@ -14,9 +18,22 @@
     def setUp(self):
         super(ViewCase, self).setUp()
         self.addTypeEqualityFunc(ET._Element, self.assertTreesEqual)
+        self.Views = self.registry('ir.ui.view')
+
+    def browse(self, id, context=None):
+        return self.Views.browse(self.cr, self.uid, id, context=context)
+    def create(self, value, context=None):
+        return self.Views.create(self.cr, self.uid, value, context=context)
+
+    def read_combined(self, id):
+        return self.Views.read_combined(
+            self.cr, self.uid,
+            id, ['arch'],
+            context={'check_view_ids': self.Views.search(self.cr, self.uid, [])}
+        )
 
     def assertTreesEqual(self, n1, n2, msg=None):
-        self.assertEqual(n1.tag, n2.tag)
+        self.assertEqual(n1.tag, n2.tag, msg)
         self.assertEqual((n1.text or '').strip(), (n2.text or '').strip(), msg)
         self.assertEqual((n1.tail or '').strip(), (n2.tail or '').strip(), msg)
 
@@ -24,8 +41,8 @@
         # equality (!?!?!?!)
         self.assertEqual(dict(n1.attrib), dict(n2.attrib), msg)
 
-        for c1, c2 in zip(n1, n2):
-            self.assertTreesEqual(c1, c2, msg)
+        for c1, c2 in itertools.izip_longest(n1, n2):
+            self.assertEqual(c1, c2, msg)
 
 
 class TestNodeLocator(common.TransactionCase):
@@ -374,13 +391,6 @@
     """ Applies a sequence of modificator archs to a base view
     """
 
-class TestViewCombined(ViewCase):
-    """
-    Test fallback operations of View.read_combined:
-    * defaults mapping
-    * ?
-    """
-
 class TestNoModel(ViewCase):
     def test_create_view_nomodel(self):
         View = self.registry('ir.ui.view')
@@ -628,6 +638,8 @@
     def _insert_view(self, **kw):
         """Insert view into database via a query to passtrough validation"""
         kw.pop('id', None)
+        kw.setdefault('mode', 'extension' if kw.get('inherit_id') else 'primary')
+        kw.setdefault('application', 'always')
 
         keys = sorted(kw.keys())
         fields = ','.join('"%s"' % (k.replace('"', r'\"'),) for k in keys)
@@ -804,3 +816,351 @@
                     E.button(name="action_next", type="object", string="New button")),
                 string="Replacement title", version="7.0"
             ))
+
+class ViewModeField(ViewCase):
+    """
+    This should probably, eventually, be folded back into other test case
+    classes, integrating the test (or not) of the mode field to regular cases
+    """
+
+    def testModeImplicitValue(self):
+        """ mode is auto-generated from inherit_id:
+        * inherit_id -> mode=extension
+        * not inherit_id -> mode=primary
+        """
+        view = self.browse(self.create({
+            'inherit_id': None,
+            'arch': '<qweb/>'
+        }))
+        self.assertEqual(view.mode, 'primary')
+
+        view2 = self.browse(self.create({
+            'inherit_id': view.id,
+            'arch': '<qweb/>'
+        }))
+        self.assertEqual(view2.mode, 'extension')
+
+    @openerp.tools.mute_logger('openerp.sql_db')
+    def testModeExplicit(self):
+        view = self.browse(self.create({
+            'inherit_id': None,
+            'arch': '<qweb/>'
+        }))
+        view2 = self.browse(self.create({
+            'inherit_id': view.id,
+            'mode': 'primary',
+            'arch': '<qweb/>'
+        }))
+        self.assertEqual(view.mode, 'primary')
+
+        with self.assertRaises(IntegrityError):
+            self.create({
+                'inherit_id': None,
+                'mode': 'extension',
+                'arch': '<qweb/>'
+            })
+
+    @openerp.tools.mute_logger('openerp.sql_db')
+    def testPurePrimaryToExtension(self):
+        """
+        A primary view with inherit_id=None can't be converted to extension
+        """
+        view_pure_primary = self.browse(self.create({
+            'inherit_id': None,
+            'arch': '<qweb/>'
+        }))
+        with self.assertRaises(IntegrityError):
+            view_pure_primary.write({'mode': 'extension'})
+
+    def testInheritPrimaryToExtension(self):
+        """
+        A primary view with an inherit_id can be converted to extension
+        """
+        base = self.create({'inherit_id': None, 'arch': '<qweb/>'})
+        view = self.browse(self.create({
+            'inherit_id': base,
+            'mode': 'primary',
+            'arch': '<qweb/>'
+        }))
+
+        view.write({'mode': 'extension'})
+
+    def testDefaultExtensionToPrimary(self):
+        """
+        An extension view can be converted to primary
+        """
+        base = self.create({'inherit_id': None, 'arch': '<qweb/>'})
+        view = self.browse(self.create({
+            'inherit_id': base,
+            'arch': '<qweb/>'
+        }))
+
+        view.write({'mode': 'primary'})
+
+class TestDefaultView(ViewCase):
+    def testDefaultViewBase(self):
+        self.create({
+            'inherit_id': False,
+            'priority': 10,
+            'mode': 'primary',
+            'arch': '<qweb/>',
+        })
+        v2 = self.create({
+            'inherit_id': False,
+            'priority': 1,
+            'mode': 'primary',
+            'arch': '<qweb/>',
+        })
+
+        default = self.Views.default_view(self.cr, self.uid, False, 'qweb')
+        self.assertEqual(
+            default, v2,
+            "default_view should get the view with the lowest priority for "
+            "a (model, view_type) pair"
+        )
+
+    def testDefaultViewPrimary(self):
+        v1 = self.create({
+            'inherit_id': False,
+            'priority': 10,
+            'mode': 'primary',
+            'arch': '<qweb/>',
+        })
+        self.create({
+            'inherit_id': False,
+            'priority': 5,
+            'mode': 'primary',
+            'arch': '<qweb/>',
+        })
+        v3 = self.create({
+            'inherit_id': v1,
+            'priority': 1,
+            'mode': 'primary',
+            'arch': '<qweb/>',
+        })
+
+        default = self.Views.default_view(self.cr, self.uid, False, 'qweb')
+        self.assertEqual(
+            default, v3,
+            "default_view should get the view with the lowest priority for "
+            "a (model, view_type) pair in all the primary tables"
+        )
+
+class TestViewCombined(ViewCase):
+    """
+    * When asked for a view, instead of looking for the closest parent with
+      inherit_id=False look for mode=primary
+    * If root.inherit_id, resolve the arch for root.inherit_id (?using which
+      model?), then apply root's inheritance specs to it
+    * Apply inheriting views on top
+    """
+
+    def setUp(self):
+        super(TestViewCombined, self).setUp()
+
+        self.a1 = self.create({
+            'model': 'a',
+            'arch': '<qweb><a1/></qweb>'
+        })
+        self.a2 = self.create({
+            'model': 'a',
+            'inherit_id': self.a1,
+            'priority': 5,
+            'arch': '<xpath expr="//a1" position="after"><a2/></xpath>'
+        })
+        self.a3 = self.create({
+            'model': 'a',
+            'inherit_id': self.a1,
+            'arch': '<xpath expr="//a1" position="after"><a3/></xpath>'
+        })
+        # mode=primary should be an inheritance boundary in both direction,
+        # even within a model it should not extend the parent
+        self.a4 = self.create({
+            'model': 'a',
+            'inherit_id': self.a1,
+            'mode': 'primary',
+            'arch': '<xpath expr="//a1" position="after"><a4/></xpath>',
+        })
+
+        self.b1 = self.create({
+            'model': 'b',
+            'inherit_id': self.a3,
+            'mode': 'primary',
+            'arch': '<xpath expr="//a1" position="after"><b1/></xpath>'
+        })
+        self.b2 = self.create({
+            'model': 'b',
+            'inherit_id': self.b1,
+            'arch': '<xpath expr="//a1" position="after"><b2/></xpath>'
+        })
+
+        self.c1 = self.create({
+            'model': 'c',
+            'inherit_id': self.a1,
+            'mode': 'primary',
+            'arch': '<xpath expr="//a1" position="after"><c1/></xpath>'
+        })
+        self.c2 = self.create({
+            'model': 'c',
+            'inherit_id': self.c1,
+            'priority': 5,
+            'arch': '<xpath expr="//a1" position="after"><c2/></xpath>'
+        })
+        self.c3 = self.create({
+            'model': 'c',
+            'inherit_id': self.c2,
+            'priority': 10,
+            'arch': '<xpath expr="//a1" position="after"><c3/></xpath>'
+        })
+
+        self.d1 = self.create({
+            'model': 'd',
+            'inherit_id': self.b1,
+            'mode': 'primary',
+            'arch': '<xpath expr="//a1" position="after"><d1/></xpath>'
+        })
+
+    def test_basic_read(self):
+        arch = self.read_combined(self.a1)['arch']
+        self.assertEqual(
+            ET.fromstring(arch),
+            E.qweb(
+                E.a1(),
+                E.a3(),
+                E.a2(),
+            ), arch)
+
+    def test_read_from_child(self):
+        arch = self.read_combined(self.a3)['arch']
+        self.assertEqual(
+            ET.fromstring(arch),
+            E.qweb(
+                E.a1(),
+                E.a3(),
+                E.a2(),
+            ), arch)
+
+    def test_read_from_child_primary(self):
+        arch = self.read_combined(self.a4)['arch']
+        self.assertEqual(
+            ET.fromstring(arch),
+            E.qweb(
+                E.a1(),
+                E.a4(),
+                E.a3(),
+                E.a2(),
+            ), arch)
+
+    def test_cross_model_simple(self):
+        arch = self.read_combined(self.c2)['arch']
+        self.assertEqual(
+            ET.fromstring(arch),
+            E.qweb(
+                E.a1(),
+                E.c3(),
+                E.c2(),
+                E.c1(),
+                E.a3(),
+                E.a2(),
+            ), arch)
+
+    def test_cross_model_double(self):
+        arch = self.read_combined(self.d1)['arch']
+        self.assertEqual(
+            ET.fromstring(arch),
+            E.qweb(
+                E.a1(),
+                E.d1(),
+                E.b2(),
+                E.b1(),
+                E.a3(),
+                E.a2(),
+            ), arch)
+
+class TestOptionalViews(ViewCase):
+    """
+    Tests ability to enable/disable inherited views, formerly known as
+    inherit_option_id
+    """
+
+    def setUp(self):
+        super(TestOptionalViews, self).setUp()
+        self.v0 = self.create({
+            'model': 'a',
+            'arch': '<qweb><base/></qweb>',
+        })
+        self.v1 = self.create({
+            'model': 'a',
+            'inherit_id': self.v0,
+            'application': 'always',
+            'priority': 10,
+            'arch': '<xpath expr="//base" position="after"><v1/></xpath>',
+        })
+        self.v2 = self.create({
+            'model': 'a',
+            'inherit_id': self.v0,
+            'application': 'enabled',
+            'priority': 9,
+            'arch': '<xpath expr="//base" position="after"><v2/></xpath>',
+        })
+        self.v3 = self.create({
+            'model': 'a',
+            'inherit_id': self.v0,
+            'application': 'disabled',
+            'priority': 8,
+            'arch': '<xpath expr="//base" position="after"><v3/></xpath>'
+        })
+
+    def test_applied(self):
+        """ mandatory and enabled views should be applied
+        """
+        arch = self.read_combined(self.v0)['arch']
+        self.assertEqual(
+            ET.fromstring(arch),
+            E.qweb(
+                E.base(),
+                E.v1(),
+                E.v2(),
+            )
+        )
+
+    def test_applied_state_toggle(self):
+        """ Change application states of v2 and v3, check that the results
+        are as expected
+        """
+        self.browse(self.v2).write({'application': 'disabled'})
+        arch = self.read_combined(self.v0)['arch']
+        self.assertEqual(
+            ET.fromstring(arch),
+            E.qweb(
+                E.base(),
+                E.v1(),
+            )
+        )
+
+        self.browse(self.v3).write({'application': 'enabled'})
+        arch = self.read_combined(self.v0)['arch']
+        self.assertEqual(
+            ET.fromstring(arch),
+            E.qweb(
+                E.base(),
+                E.v1(),
+                E.v3(),
+            )
+        )
+
+        self.browse(self.v2).write({'application': 'enabled'})
+        arch = self.read_combined(self.v0)['arch']
+        self.assertEqual(
+            ET.fromstring(arch),
+            E.qweb(
+                E.base(),
+                E.v1(),
+                E.v2(),
+                E.v3(),
+            )
+        )
+
+    def test_mandatory_no_disabled(self):
+        with self.assertRaises(Exception):
+            self.browse(self.v1).write({'application': 'disabled'})
 
=== modified file 'openerp/import_xml.rng'
--- openerp/import_xml.rng	2014-01-16 09:17:16 +0000
+++ openerp/import_xml.rng	2014-05-06 14:57:36 +0000
@@ -217,9 +217,23 @@
             <rng:optional><rng:attribute name="priority"/></rng:optional>
             <rng:choice>
                 <rng:group>
-                    <rng:optional><rng:attribute name="inherit_id"/></rng:optional>
-                    <rng:optional><rng:attribute name="inherit_option_id"/></rng:optional>
+                    <rng:optional>
+                        <rng:attribute name="inherit_id"/>
+                        <rng:optional>
+                            <rng:attribute name="primary">
+                                <rng:value>True</rng:value>
+                            </rng:attribute>
+                        </rng:optional>
+                    </rng:optional>
                     <rng:optional><rng:attribute name="groups"/></rng:optional>
+                    <rng:optional>
+                        <rng:attribute name="optional">
+                            <rng:choice>
+                                <rng:value>enabled</rng:value>
+                                <rng:value>disabled</rng:value>
+                            </rng:choice>
+                        </rng:attribute>
+                    </rng:optional>
                 </rng:group>
                 <rng:optional>
                     <rng:attribute name="page"><rng:value>True</rng:value></rng:attribute>
 
=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py	2014-04-16 14:34:31 +0000
+++ openerp/osv/orm.py	2014-05-06 14:57:36 +0000
@@ -729,7 +729,6 @@
     _all_columns = {}
 
     _table = None
-    _invalids = set()
     _log_create = False
     _sql_constraints = []
     _protected = ['read', 'write', 'create', 'default_get', 'perm_read', 'unlink', 'fields_get', 'fields_view_get', 'search', 'name_get', 'distinct_field_get', 'name_search', 'copy', 'import_data', 'search_count', 'exists']
@@ -1543,9 +1542,6 @@
 
             yield dbid, xid, converted, dict(extras, record=stream.index)
 
-    def get_invalid_fields(self, cr, uid):
-        return list(self._invalids)
-
     def _validate(self, cr, uid, ids, context=None):
         context = context or {}
         lng = context.get('lang')
@@ -1566,12 +1562,9 @@
                 # Check presence of __call__ directly instead of using
                 # callable() because it will be deprecated as of Python 3.0
                 if hasattr(msg, '__call__'):
-                    tmp_msg = msg(self, cr, uid, ids, context=context)
-                    if isinstance(tmp_msg, tuple):
-                        tmp_msg, params = tmp_msg
-                        translated_msg = tmp_msg % params
-                    else:
-                        translated_msg = tmp_msg
+                    translated_msg = msg(self, cr, uid, ids, context=context)
+                    if isinstance(translated_msg, tuple):
+                        translated_msg = translated_msg[0] % translated_msg[1]
                 else:
                     translated_msg = trans._get_source(cr, uid, self._name, 'constraint', lng, msg)
                 if extra_error:
@@ -1579,11 +1572,8 @@
                 error_msgs.append(
                         _("The field(s) `%s` failed against a constraint: %s") % (', '.join(fields), translated_msg)
                 )
-                self._invalids.update(fields)
         if error_msgs:
             raise except_orm('ValidateError', '\n'.join(error_msgs))
-        else:
-            self._invalids.clear()
 
     def default_get(self, cr, uid, fields_list, context=None):
         """
 
=== modified file 'openerp/tools/convert.py'
--- openerp/tools/convert.py	2014-04-24 13:14:05 +0000
+++ openerp/tools/convert.py	2014-05-06 14:57:36 +0000
@@ -861,7 +861,7 @@
         if '.' not in full_tpl_id:
             full_tpl_id = '%s.%s' % (self.module, tpl_id)
         # set the full template name for qweb <module>.<id>
-        if not (el.get('inherit_id') or el.get('inherit_option_id')):
+        if not el.get('inherit_id'):
             el.set('t-name', full_tpl_id)
             el.tag = 't'
         else:
@@ -884,15 +884,18 @@
         record.append(Field("qweb", name='type'))
         record.append(Field(el.get('priority', "16"), name='priority'))
         record.append(Field(el, name="arch", type="xml"))
-        for field_name in ('inherit_id','inherit_option_id'):
-            value = el.attrib.pop(field_name, None)
-            if value: record.append(Field(name=field_name, ref=value))
+        if 'inherit_id' in el.attrib:
+            record.append(Field(name='inherit_id', ref=el.get('inherit_id')))
         groups = el.attrib.pop('groups', None)
         if groups:
             grp_lst = map(lambda x: "ref('%s')" % x, groups.split(','))
             record.append(Field(name="groups_id", eval="[(6, 0, ["+', '.join(grp_lst)+"])]"))
         if el.attrib.pop('page', None) == 'True':
             record.append(Field(name="page", eval="True"))
+        if el.get('primary') == 'True':
+            record.append(Field('primary', name='mode'))
+        if el.get('optional'):
+            record.append(Field(el.get('optional'), name='application'))
 
         return self._tag_record(cr, record, data_node)