merge

doc/modules.rst

@@ -174,3 +174,5 @@ Here is the list of the tags:
         * ``action``: The xml id of the action linked to the menu.
 
         * ``groups``: A list of xml id of group, that have access to the menu, separated by commas.
+
+        * ``active``: A boolean telling if the menu is active or not.

trytond/ir/sequence.xml

@@ -28,7 +28,7 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="number_increment"/>
                     <label name="number_next"/>
                     <field name="number_next"/>
-                    <separator string="Legend (for prefix, suffix)" colspan="4"
+                    <separator string="Legend (Placeholders for prefix, suffix)" colspan="4"
                         id="legend"/>
                     <label string="Year:" id="label_year"/>
                     <label string="${year}" colspan="3" align="0.0" id="year"/>

trytond/osv/orm.py

@@ -2466,7 +2466,7 @@ class ORM(object):
         for arg in args:
             if arg[1] not in OPERATORS:
                 raise Exception('ValidateError', 'Argument "%s" not supported' \
-                        % args[i][1])
+                        % arg[1])
         i = 0
         joins = []
         while i < len(args):

trytond/tools/convert.py

@@ -53,6 +53,8 @@ class MenuitemTagHandler:
             if attributes.get(attr):
                 values[attr] = attributes.get(attr)
 
+        if attributes.get('active'):
+            values['active'] = bool(eval(attributes['active']))
 
         if values.get('parent'):
             values['parent'] = self.mh.get_id(values['parent'])
@@ -576,8 +578,6 @@ class TrytondXmlHandler(sax.handler.ContentHandler):
                     # Fix for migration to unicode
                     old_values[key] = old_values[key].decode('utf-8')
 
-            # Check if values for this record has been modified in the
-            # db, if not it's ok to overwrite them.
             if model != db_model:
                 raise Exception("This record try to overwrite " \
                 "data with the wrong model: %s (module: %s)" % (fs_id, module))