From ba57edc36a7a2535d35b3de7450868d074ed5922 Mon Sep 17 00:00:00 2001
From: Bertrand Chenal <bch@b2ck.com>
Date: Mon, 22 Dec 2008 16:09:27 +0100
Subject: [PATCH 1/5] Add handling of active attribute on manuitem tag

---
 trytond/tools/convert.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/trytond/tools/convert.py b/trytond/tools/convert.py
index ed9262526e..950e9f4bb5 100644
--- a/trytond/tools/convert.py
+++ b/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'])

From af298a607d1c9ecdcfea88e91ef5492282593bc6 Mon Sep 17 00:00:00 2001
From: Bertrand Chenal <bch@b2ck.com>
Date: Mon, 22 Dec 2008 16:09:52 +0100
Subject: [PATCH 2/5] Removed wrong comment

---
 trytond/tools/convert.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/trytond/tools/convert.py b/trytond/tools/convert.py
index 950e9f4bb5..5be1ae9200 100644
--- a/trytond/tools/convert.py
+++ b/trytond/tools/convert.py
@@ -578,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))

From 5cd83b23e40f1fa05da0f02932100a9488b585ca Mon Sep 17 00:00:00 2001
From: Bertrand Chenal <bch@b2ck.com>
Date: Mon, 22 Dec 2008 16:13:21 +0100
Subject: [PATCH 3/5] Added doc for active on menuitem

---
 doc/modules.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/modules.rst b/doc/modules.rst
index 5dd8871115..53e60badf0 100644
--- a/doc/modules.rst
+++ b/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.

From bfb737febdb557e4e353e114abd19bc3f8dca704 Mon Sep 17 00:00:00 2001
From: Mathias Behrle <mathiasb@behrle.dyndns.org>
Date: Tue, 23 Dec 2008 00:38:59 +0100
Subject: [PATCH 4/5] Unifying dialogs Name available replacement values
 placeholders

---
 trytond/ir/sequence.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trytond/ir/sequence.xml b/trytond/ir/sequence.xml
index 2c8e8b9db5..6b4f9ea033 100644
--- a/trytond/ir/sequence.xml
+++ b/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"/>

From 9cdc6da9c7f9cbf2f851399d8b462609b8675abc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Tue, 23 Dec 2008 10:48:26 +0100
Subject: [PATCH 5/5] Fix typo for issue696

---
 trytond/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trytond/osv/orm.py b/trytond/osv/orm.py
index 8c69bb0126..3d125007fc 100644
--- a/trytond/osv/orm.py
+++ b/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):