diff --git a/trytond/ir/actions.xml b/trytond/ir/actions.xml
index f1a4997759..866f3e44fc 100644
--- a/trytond/ir/actions.xml
+++ b/trytond/ir/actions.xml
@@ -7,7 +7,7 @@
             <field name="model">ir.actions.actions</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Action">
                     <field name="name" select="1"/>
                     <field name="type" select="1"/>
@@ -22,7 +22,7 @@
                         </form>
                     </field>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="actions_actions_view_tree">
@@ -30,12 +30,12 @@
             <field name="model">ir.actions.actions</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Action">
                     <field name="name"/>
                     <field name="type"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_actions_actions_form">
@@ -65,7 +65,7 @@
             <field name="model">ir.actions.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Report">
                     <field name="name" select="1"/>
                     <field name="type" select="1"/>
@@ -73,7 +73,7 @@
                     <field name="report_odt"/>
                     <field name="auto"/>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="actions_report_view_tree">
@@ -81,13 +81,13 @@
             <field name="model">ir.actions.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Report xml">
                     <field name="name"/>
                     <field name="type"/>
                     <field name="report_name"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_actions_report_form">
@@ -117,7 +117,7 @@
             <field name="model">ir.actions.act_window</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Open a Window">
                     <field name="name" select="1"/>
                     <field name="type" readonly="1"/>
@@ -145,7 +145,7 @@
                     <field name="view_mode"/>
                     <field name="view_id"/>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="actions_act_window_view_tree">
@@ -153,7 +153,7 @@
             <field name="model">ir.actions.act_window</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Open Window">
                     <field name="name"/>
                     <field name="res_model"/>
@@ -161,7 +161,7 @@
                     <field name="view_id"/>
                     <field name="domain"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_actions_act_window_form">
@@ -189,14 +189,14 @@
             <field name="model">ir.actions.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Wizard">
                     <field name="name" select="1"/>
                     <field name="type" select="1"/>
                     <field name="wiz_name" select="1"/>
                     <field name="multi"/>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="actions_wizard_view_tree">
@@ -204,14 +204,14 @@
             <field name="model">ir.actions.wizard</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Wizard">
                     <field name="name"/>
                     <field name="type"/>
                     <field name="wiz_name"/>
                     <field name="multi"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_actions_wizard_form">
diff --git a/trytond/ir/attachment.xml b/trytond/ir/attachment.xml
index 61c5be3ff3..c0987edc89 100644
--- a/trytond/ir/attachment.xml
+++ b/trytond/ir/attachment.xml
@@ -6,7 +6,7 @@
             <field name="model">ir.attachment</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Attachments">
                     <field name="name" colspan="4" select="1"/>
                     <field name="datas" colspan="4"/>
@@ -17,7 +17,7 @@
                     <separator string="Description" colspan="4"/>
                     <field name="description" colspan="4" nolabel="1"/>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="attachment_view_tree">
@@ -25,13 +25,13 @@
             <field name="model">ir.attachment</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Attachments">
                     <field name="name"/>
                     <field name="res_model"/>
                     <field name="res_id"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_attachment_form">
diff --git a/trytond/ir/cron.xml b/trytond/ir/cron.xml
index 3dd72333b1..61819a90eb 100644
--- a/trytond/ir/cron.xml
+++ b/trytond/ir/cron.xml
@@ -6,7 +6,7 @@
             <field name="model">ir.cron</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Scheduled Actions">
                     <field name="nextcall"/>
                     <field name="name"/>
@@ -14,7 +14,7 @@
                     <field name="interval_type"/>
                     <field name="numbercall"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="cron_view_form">
@@ -22,7 +22,7 @@
             <field name="model">ir.cron</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Scheduled Action">
                     <field name="name" select="1"/>
                     <field name="active" select="1"/>
@@ -41,7 +41,7 @@
                     <field name="function" readonly="1"/>
                     <field name="args" colspan="4" readonly="1"/>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_cron_form">
diff --git a/trytond/ir/exports.xml b/trytond/ir/exports.xml
index 4e8b10c4cc..4ad90c20ff 100644
--- a/trytond/ir/exports.xml
+++ b/trytond/ir/exports.xml
@@ -6,13 +6,13 @@
             <field name="model">ir.exports</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Exports">
                     <field name="name" select="1"/>
                     <field name="resource" select="1"/>
                     <field name="export_fields" colspan="4" nolabel="1"/>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="exports_view_tree">
@@ -20,12 +20,12 @@
             <field name="model">ir.exports</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Exports">
                     <field name="name"/>
                     <field name="resource"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_exports_form">
diff --git a/trytond/ir/model.xml b/trytond/ir/model.xml
index 5113b193cb..59941a332e 100644
--- a/trytond/ir/model.xml
+++ b/trytond/ir/model.xml
@@ -6,7 +6,7 @@
             <field name="model">ir.model</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Model Description">
                     <field name="name" select="1"/>
                     <field name="model" select="1"/>
@@ -22,7 +22,7 @@
                         </form>
                     </field>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="model_view_tree">
@@ -30,12 +30,12 @@
             <field name="model">ir.model</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Model Description">
                     <field name="name"/>
                     <field name="model"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_model_form">
@@ -64,7 +64,7 @@
             <field name="model">ir.model.fields</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Fields">
                     <field name="name" select="1"/>
                     <field name="model_id" readonly="1"/>
@@ -72,7 +72,7 @@
                     <field name="ttype" select="2"/>
                     <field name="relation" select="2"/>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="model_fields_view_tree">
@@ -80,12 +80,12 @@
             <field name="model">ir.model.fields</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Fields">
                     <field name="name"/>
                     <field name="field_description"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_model_fields_form">
@@ -114,13 +114,13 @@
             <field name="model">ir.model.access</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Access controls">
                     <field name="name"/>
                     <field name="model_id"/>
                     <field name="group_id"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="model_access_view_form">
@@ -128,7 +128,7 @@
             <field name="model">ir.model.access</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Access controls">
                     <field name="name" select="1" colspan="4"/>
                     <field name="model_id" select="1"/>
@@ -139,7 +139,7 @@
                     <field name="perm_create"/>
                     <field name="perm_unlink"/>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_model_access_form">
diff --git a/trytond/ir/module/category.xml b/trytond/ir/module/category.xml
index ef2b9321bf..1700819a0c 100644
--- a/trytond/ir/module/category.xml
+++ b/trytond/ir/module/category.xml
@@ -6,12 +6,12 @@
             <field name="model">ir.module.category</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Module Category">
                     <field name="name" colspan="4"/>
                     <field name="parent_id" colspan="4"/>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="category_view_tree">
@@ -20,11 +20,11 @@
             <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Module Categories">
                     <field name="name"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_category_tree">
diff --git a/trytond/ir/module/module.xml b/trytond/ir/module/module.xml
index 28c4dc64bf..a019c8e528 100644
--- a/trytond/ir/module/module.xml
+++ b/trytond/ir/module/module.xml
@@ -7,7 +7,7 @@
             <field name="model">ir.module.module</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Module">
                     <notebook>
                         <page string="Module">
@@ -51,7 +51,7 @@
                         </page>
                     </notebook>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="module_view_tree">
@@ -59,7 +59,7 @@
             <field name="model">ir.module.module</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Modules"
                     colors="blue:state=='to upgrade' or state=='to install';grey:state=='uninstalled' or state=='uninstallable'">
                     <field name="name"/>
@@ -69,7 +69,7 @@
                     <field name="latest_version"/>
                     <field name="state"/>
                 </tree>
-	      ]]>
+              ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_module_form">
diff --git a/trytond/ir/module/repository.xml b/trytond/ir/module/repository.xml
index a289c8b05b..88339687f0 100644
--- a/trytond/ir/module/repository.xml
+++ b/trytond/ir/module/repository.xml
@@ -6,7 +6,7 @@
             <field name="model">ir.module.repository</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Repository">
                     <field name="name" select="1"/>
                     <field name="sequence"/>
@@ -14,7 +14,7 @@
                     <field name="active" select="1"/>
                     <field name="filter" colspan="4"/>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="repository_view_tree">
@@ -22,14 +22,14 @@
             <field name="model">ir.module.repository</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Repositories">
                     <field name="sequence"/>
                     <field name="active"/>
                     <field name="name"/>
                     <field name="url"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_repository_form">
diff --git a/trytond/ir/rule.xml b/trytond/ir/rule.xml
index d3d224c6af..fc1980d6a8 100644
--- a/trytond/ir/rule.xml
+++ b/trytond/ir/rule.xml
@@ -6,7 +6,7 @@
             <field name="model">ir.rule.group</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Record rules">
                     <field name="model_id"/>
                     <field name="global"/>
@@ -19,7 +19,7 @@
                             colspan="6" align="0.0"/>
                     </group>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="rule_group_view_tree">
@@ -27,13 +27,13 @@
             <field name="model">ir.rule.group</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Record rules">
                     <field name="model_id"/>
                     <field name="name"/>
                     <field name="global"/>
                 </tree>
-	      ]]>
+              ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_rule_group_form">
@@ -62,7 +62,7 @@
             <field name="model">ir.rule</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Test">
                     <group colspan="4" col="6">
                         <field name="field_id"/>
@@ -70,7 +70,7 @@
                         <field name="operand"/>
                     </group>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="rule_view_tree">
@@ -78,13 +78,13 @@
             <field name="model">ir.rule</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Test">
                     <field name="field_id"/>
                     <field name="operator"/>
                     <field name="operand"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
     </data>
diff --git a/trytond/ir/sequence.xml b/trytond/ir/sequence.xml
index 8ce92a0d04..3927633977 100644
--- a/trytond/ir/sequence.xml
+++ b/trytond/ir/sequence.xml
@@ -7,7 +7,7 @@
             <field name="model">ir.sequence</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Sequences">
                     <separator string="Configuration" colspan="4"/>
                     <field name="name" colspan="4" select="1"/>
@@ -23,8 +23,8 @@
                     <label string="Month: %%(month)s" colspan="4"/>
                     <label string="Day: %%(day)s" colspan="4"/>
                 </form>
-		]]>
-	    </field>
+                ]]>
+            </field>
 
         </record>
         <record model="ir.ui.view" id="sequence_view_tree">
@@ -32,13 +32,13 @@
             <field name="model">ir.sequence</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Sequences">
                     <field name="name"/>
                     <field name="code"/>
                     <field name="active"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_sequence_form">
@@ -69,12 +69,12 @@
             <field name="model">ir.sequence.type</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Sequence Type">
                     <field name="name" select="1"/>
                     <field name="code" readonly="1"/>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="sequence_type_view_tree">
@@ -82,12 +82,12 @@
             <field name="model">ir.sequence.type</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Sequence Type">
                     <field name="name"/>
                     <field name="code"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window"
diff --git a/trytond/ir/translation.xml b/trytond/ir/translation.xml
index 9dfb973638..df5f58262c 100644
--- a/trytond/ir/translation.xml
+++ b/trytond/ir/translation.xml
@@ -6,7 +6,7 @@
             <field name="model">ir.translation</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Translations">
                     <field name="name" select="2"/>
                     <field name="res_id" select="2"/>
@@ -15,7 +15,7 @@
                     <field name="src" select="1"/>
                     <field name="value" select="1"/>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="translation_view_tree">
@@ -23,7 +23,7 @@
             <field name="model">ir.translation</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Translations" editable="bottom">
                     <field name="src"/>
                     <field name="value"/>
@@ -31,7 +31,7 @@
                     <field name="lang"/>
                     <field name="type"/>
                 </tree>
-	      ]]>
+              ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_translation_form">
diff --git a/trytond/ir/values.xml b/trytond/ir/values.xml
index de99bd3c13..7db70eb195 100644
--- a/trytond/ir/values.xml
+++ b/trytond/ir/values.xml
@@ -6,7 +6,7 @@
             <field name="model">ir.values</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Values">
                     <field name="name" select="1"/>
                     <field name="model" select="1"/>
@@ -18,7 +18,7 @@
                     <field name="value_unpickle"/>
                     <field name="meta_unpickle"/>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="values_view_tree">
@@ -26,7 +26,7 @@
             <field name="model">ir.values</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Values">
                     <field name="name"/>
                     <field name="model"/>
@@ -34,7 +34,7 @@
                     <field name="key2"/>
                     <field name="user_id"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_values_form">
diff --git a/trytond/res/lang.xml b/trytond/res/lang.xml
index 0a4bda68a6..b2b5a67dcf 100644
--- a/trytond/res/lang.xml
+++ b/trytond/res/lang.xml
@@ -10,7 +10,7 @@
             <field name="model">res.lang</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Languages" editable="bottom">
                     <field name="name"/>
                     <field name="code"/>
@@ -18,7 +18,7 @@
                     <field name="translatable"/>
                     <field name="active"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_lang_form">
diff --git a/trytond/res/request.xml b/trytond/res/request.xml
index 9c72d63d2e..0fb25201ea 100644
--- a/trytond/res/request.xml
+++ b/trytond/res/request.xml
@@ -6,7 +6,7 @@
             <field name="model">res.request</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Requests">
                     <field name="create_date"/>
                     <field name="act_from"/>
@@ -16,7 +16,7 @@
                     <field name="trigger_date"/>
                     <field name="state"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="request_view_form">
@@ -24,7 +24,7 @@
             <field name="model">res.request</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Requests">
                     <notebook>
                         <page string="Request">
@@ -60,7 +60,7 @@
                         </page>
                     </notebook>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_request_form">
@@ -90,13 +90,13 @@
             <field name="model">res.request.link</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Request Link">
                     <field name="name" select="1"/>
                     <field name="object" select="1"/>
                     <field name="priority"/>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="request_link_view_tree">
@@ -104,12 +104,12 @@
             <field name="model">res.request.link</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Request Link">
                     <field name="name"/>
                     <field name="object"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="request_history_view_tree">
@@ -117,14 +117,14 @@
             <field name="model">res.request.history</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Request History">
                     <field name="act_from"/>
                     <field name="act_to"/>
                     <field name="date_sent"/>
                     <field name="name"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="request_history_view_form">
@@ -132,7 +132,7 @@
             <field name="model">res.request.history</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Request History">
                     <field name="act_from"/>
                     <field name="act_to"/>
@@ -140,7 +140,7 @@
                     <newline/>
                     <field name="body" colspan="4"/>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
     </data>
diff --git a/trytond/res/users.xml b/trytond/res/users.xml
index 42bf3c8f18..96de8437f5 100644
--- a/trytond/res/users.xml
+++ b/trytond/res/users.xml
@@ -9,16 +9,16 @@
             <field name="password">admin</field>
             <field name="name">Administrator</field>
             <field name="signature">Administrator</field>
-            <field name="action_id" ref="ir.actions_act_window_view_tree"/>
-            <field name="menu_id" ref="ir.actions_act_window_view_tree"/>
-            <field name="groups_id" eval="[(6, 0, [group_admin])]"/>
+            <field name="action_id" ref="ir.act_menu_tree"/>
+            <field name="menu_id" ref="ir.act_menu_tree"/>
+            <field name="groups_id" eval="[(6, 0, [ref('group_admin')])]"/>
         </record>
         <record model="ir.ui.view" id="user_view_form">
             <field name="name">res.user.form</field>
             <field name="model">res.user</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="User">
                     <notebook>
                         <page string="User">
@@ -41,7 +41,7 @@
                         </page>
                     </notebook>
                 </form>
-	      ]]>
+              ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="user_view_tree">
@@ -49,12 +49,12 @@
             <field name="model">res.user</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Users">
                     <field name="name"/>
                     <field name="login"/>
                 </tree>
-	      ]]>
+              ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_user_form">
@@ -84,7 +84,7 @@
             <field name="model">res.group</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Group">
                     <notebook>
                         <page string="Group">
@@ -98,7 +98,7 @@
                         </page>
                     </notebook>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="group_view_tree">
@@ -106,11 +106,11 @@
             <field name="model">res.group</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Groups">
                     <field name="name"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_group_form">
@@ -140,12 +140,12 @@
             <field name="model">res.role</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Role">
                     <field name="name" select="1"/>
                     <field name="parent_id"/>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="role_view_tree">
@@ -154,11 +154,11 @@
             <field name="type">tree</field>
             <field name="field_parent">parent_id</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Roles">
                     <field name="name"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_role_form">
diff --git a/trytond/tools/convert.py b/trytond/tools/convert.py
index 36c3f71ea6..739c22b76a 100644
--- a/trytond/tools/convert.py
+++ b/trytond/tools/convert.py
@@ -10,8 +10,6 @@ from trytond.config import CONFIG
 from trytond.version import VERSION
 import logging
 
-
-
 CDATA_START = re.compile('^\s*\<\!\[cdata\[', re.IGNORECASE)
 CDATA_END = re.compile('\]\]\>\s*$', re.IGNORECASE)
                        
@@ -882,9 +880,24 @@ class RecordTagHandler:
                 self.values[field_name] = self.mh.get_id(ref_attr)
 
             elif eval_attr:
-                print "NOT IMPLEMENTED : eval"                
-                pass
 
+                import time
+                context = {}
+                context['time'] = time
+                context['version'] = VERSION.rsplit('.', 1)[0]
+                context['ref'] = self.mh.get_id
+                context['obj'] = lambda *a: 1
+                try:
+                    import pytz
+                except:
+                    Logger().notify_channel("init", LOG_INFO,
+                            'could not find pytz library')
+                    class Pytz(object):
+                        all_timezones = []
+
+                    pytz = Pytz()
+                    context['pytz'] = pytz
+                self.values[field_name] = eval(eval_attr, context)
 
         else:
             raise Exception("Tags '%s' not supported inside tag record."% (name,))
@@ -995,9 +1008,8 @@ class TrytondXmlHandler(sax.handler.ContentHandler):
                 pass
 
             else:
-                # TODO logger, logger, logger, ... 
-                print "Tag", name , "not supported"
-                raise 
+                Logger().notify_channel("init", LOG_INFO,
+                            "Tag", name , "not supported")
                 return
         else:
             self.taghandler.startElement(name, attributes)
@@ -1043,4 +1055,4 @@ def convert_xml_import_sax(cursor, module, xmlstream, idref=None, mode='init',
 
 
 # use  convert_xml_import_sax or convert_xml_import_dom 
-convert_xml_import = convert_xml_import_dom
+convert_xml_import = convert_xml_import_sax
diff --git a/trytond/workflow/workflow.xml b/trytond/workflow/workflow.xml
index df5323bffa..07178f7c94 100644
--- a/trytond/workflow/workflow.xml
+++ b/trytond/workflow/workflow.xml
@@ -7,7 +7,7 @@
             <field name="model">workflow</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Workflow">
                     <field name="name" select="1"/>
                     <field name="osv" select="1"/>
@@ -15,7 +15,7 @@
                     <separator string="Activities" colspan="4"/>
                     <field name="activities" colspan="4" nolabel="1"/>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="workflow_view_tree">
@@ -23,13 +23,13 @@
             <field name="model">workflow</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Workflow">
                     <field name="name"/>
                     <field name="osv"/>
                     <field name="on_create"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_workflow_form">
@@ -58,7 +58,7 @@
             <field name="model">workflow.activity</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Activity">
                     <field name="name" colspan="4" select="1"/>
                     <field name="wkf_id" select="1"/>
@@ -94,7 +94,7 @@
                         </tree>
                     </field>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="activity_view_tree">
@@ -102,7 +102,7 @@
             <field name="model">workflow.activity</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Activity">
                     <field name="name"/>
                     <field name="wkf_id"/>
@@ -111,7 +111,7 @@
                     <field name="flow_start"/>
                     <field name="flow_stop"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_activity_form">
@@ -140,7 +140,7 @@
             <field name="model">workflow.transition</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Transition">
                     <field name="act_from" select="1"/>
                     <field name="act_to" select="1"/>
@@ -150,7 +150,7 @@
                     <field name="trigger_model"/>
                     <field name="trigger_expr_id"/>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="transition_view_tree">
@@ -158,7 +158,7 @@
             <field name="model">workflow.transition</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Transitions">
                     <field name="act_from"/>
                     <field name="act_to"/>
@@ -168,7 +168,7 @@
                     <field name="trigger_model"/>
                     <field name="trigger_expr_id"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_transition_form">
@@ -197,7 +197,7 @@
             <field name="model">workflow.instance</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Instance">
                     <field name="wkf_id" select="1"/>
                     <field name="uid" select="2"/>
@@ -205,7 +205,7 @@
                     <field name="res_type"  select="1"/>
                     <field name="state" select="2"/>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="instance_view_tree">
@@ -213,7 +213,7 @@
             <field name="model">workflow.instance</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Instances">
                     <field name="wkf_id"/>
                     <field name="uid"/>
@@ -221,7 +221,7 @@
                     <field name="res_type"/>
                     <field name="state"/>
                 </tree>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_instance_form">
@@ -243,14 +243,14 @@
             <field name="model">workflow.workitem</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <form string="Workitem">
                     <field name="act_id" select="1"/>
                     <field name="subflow_id" select="1"/>
                     <field name="inst_id"  select="1"/>
                     <field name="state" select="2"/>
                 </form>
-		]]>
+                ]]>
             </field>
         </record>
         <record model="ir.ui.view" id="workitem_view_tree">
@@ -258,14 +258,14 @@
             <field name="model">workflow.workitem</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-	      <![CDATA[
+              <![CDATA[
                 <tree string="Workitems">
                     <field name="act_id"/>
                     <field name="subflow_id"/>
                     <field name="inst_id"/>
                     <field name="state"/>
                 </tree>
-	      ]]>
+              ]]>
             </field>
         </record>
         <record model="ir.actions.act_window" id="act_workitem_form">