From 87378aac267b0d22f7bebe3d4d7ba8d26a46fd40 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 12 Jun 2014 13:55:40 +0200
Subject: [PATCH] Convert form views @version="6.1"

---
 .../wizard/base_report_design_view.xml        |  28 ++--
 addons/crm/crm_report_view.xml                |  96 +++++++------
 addons/crm_claim/crm_claim_view.xml           |  12 +-
 addons/crm_profiling/crm_profiling_view.xml   | 128 ++++++++++--------
 .../document/report/document_report_view.xml  |  16 ++-
 addons/hr_contract/hr_contract_view.xml       |   6 +-
 addons/hr_payroll/hr_payroll_view.xml         |   6 +-
 .../hr_timesheet_invoice_report_view.xml      |  48 ++++---
 .../report/report_analytic_view.xml           |  40 +++---
 .../wizard/l10n_be_partner_vat_listing.xml    |  44 +++---
 addons/project/project_view.xml               |   6 +-
 addons/stock/stock_view.xml                   |   8 +-
 openerp/addons/base/ir/ir_model_view.xml      |  34 +++--
 openerp/addons/test_workflow/data.xml         |  12 +-
 14 files changed, 268 insertions(+), 216 deletions(-)

diff --git a/addons/base_report_designer/wizard/base_report_design_view.xml b/addons/base_report_designer/wizard/base_report_design_view.xml
index 0e66850c866..036d48d5c3a 100644
--- a/addons/base_report_designer/wizard/base_report_design_view.xml
+++ b/addons/base_report_designer/wizard/base_report_design_view.xml
@@ -33,15 +33,17 @@
             <field name="name">Base Report File sxw</field>
             <field name="model">base.report.file.sxw</field>
             <field name="arch" type="xml">
-            <form string="Get a report" version="6.1">
-            <separator string="The .SXW report" colspan="4"/>
-            <field name="report_id"/>
-            <newline/>
-            <field name="file_sxw"/>
-            <newline/>
-            <field name="file_sxw_upload"/>
-            <newline/>
-            <label colspan="4" string="This is the template of your requested report.&#10;Save it as a .SXW file and open it with OpenOffice.&#10;Don't forget to install the OpenERP SA OpenOffice package to modify it.&#10;Once it is modified, re-upload it in OpenERP using this wizard." align="0.0"/>
+            <form string="Get a report">
+                <group col="4">
+                    <separator string="The .SXW report" colspan="4"/>
+                    <field name="report_id"/>
+                    <newline/>
+                    <field name="file_sxw"/>
+                    <newline/>
+                    <field name="file_sxw_upload"/>
+                    <newline/>
+                    <label colspan="4" string="This is the template of your requested report.&#10;Save it as a .SXW file and open it with OpenOffice.&#10;Don't forget to install the OpenERP SA OpenOffice package to modify it.&#10;Once it is modified, re-upload it in OpenERP using this wizard." align="0.0"/>
+                </group>
             </form>
             </field>
         </record>
@@ -50,9 +52,11 @@
             <field name="name">Base Report File sxw</field>
             <field name="model">base.report.rml.save</field>
             <field name="arch" type="xml">
-                <form string="Save RML FIle" version="6.1">
-                    <separator string="The RML Report"/>
-                    <field name="file_rml"/>
+                <form string="Save RML FIle">
+                    <group col="4">
+                        <separator string="The RML Report"/>
+                        <field name="file_rml"/>
+                    </group>
                 </form>
             </field>
        </record>
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index cdbc3d31b7b..1312917b59b 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -29,18 +29,20 @@
         <field name="name">CRM Report - Teams and Type(Form)</field>
         <field name="model">report.crm.case.section.categ2</field>
         <field name="arch" type="xml">
-            <form string="Cases by Team and Category2" version="6.1">
-                <field name="name"/>
-                <field name="month"/>
-                <field name="user_id"/>
-                <field name="section_id" widget="selection"
-                        groups="base.group_multi_salesteams"/>
-                <field name="category2_id" />
-                <field name="stage_id"/>
-                <field name="amount_revenue"/>
-                <field name="nbr" />
-                <field name="state" />
-                <field name="delay_close"/>
+            <form string="Cases by Team and Category2">
+                <group col="4">
+                    <field name="name"/>
+                    <field name="month"/>
+                    <field name="user_id"/>
+                    <field name="section_id" widget="selection"
+                            groups="base.group_multi_salesteams"/>
+                    <field name="category2_id" />
+                    <field name="stage_id"/>
+                    <field name="amount_revenue"/>
+                    <field name="nbr" />
+                    <field name="state" />
+                    <field name="delay_close"/>
+                </group>
             </form>
         </field>
     </record>
@@ -113,17 +115,19 @@
         <field name="name">CRM Report - Teams and Stage(Form)</field>
         <field name="model">report.crm.case.section.stage</field>
         <field name="arch" type="xml">
-            <form string="Cases by Team and Stage" version="6.1">
-                <field name="name"/>
-                <field name="month"/>
-                <field name="user_id"/>
-                <field name="section_id" widget="selection"
-                        groups="base.group_multi_salesteams"/>
-                <field name="stage_id"/>
-                <field name="amount_revenue"/>
-                <field name="nbr" />
-                <field name="state" />
-                <field name="delay_close"/>
+            <form string="Cases by Team and Stage">
+                <group col="4">
+                    <field name="name"/>
+                    <field name="month"/>
+                    <field name="user_id"/>
+                    <field name="section_id" widget="selection"
+                            groups="base.group_multi_salesteams"/>
+                    <field name="stage_id"/>
+                    <field name="amount_revenue"/>
+                    <field name="nbr" />
+                    <field name="state" />
+                    <field name="delay_close"/>
+                </group>
             </form>
         </field>
     </record>
@@ -194,16 +198,18 @@
         <field name="name">CRM Report - Team, Category and Stage(Form)</field>
         <field name="model">report.crm.case.section.categ.stage</field>
         <field name="arch" type="xml">
-            <form string="Cases by Section, Category and Stage" version="6.1">
-                <field name="name"/>
-                <field name="month"/>
-                <field name="user_id"/>
-                <field name="section_id"  widget="selection" groups="base.group_multi_salesteams"/>
-                <field name="categ_id"/>
-                <field name="stage_id"/>
-                <field name="nbr" />
-                <field name="state" />
-                <field name="delay_close"/>
+            <form string="Cases by Section, Category and Stage">
+                <group col="4">
+                    <field name="name"/>
+                    <field name="month"/>
+                    <field name="user_id"/>
+                    <field name="section_id"  widget="selection" groups="base.group_multi_salesteams"/>
+                    <field name="categ_id"/>
+                    <field name="stage_id"/>
+                    <field name="nbr" />
+                    <field name="state" />
+                    <field name="delay_close"/>
+                </group>
             </form>
         </field>
     </record>
@@ -275,17 +281,19 @@
         <field name="name">CRM Report - Section, Category and Type(Form)</field>
         <field name="model">report.crm.case.section.categ.categ2</field>
         <field name="arch" type="xml">
-            <form string="Cases by Section, Category and Type" version="6.1">
-                <field name="name"/>
-                <field name="month"/>
-                <field name="user_id"/>
-                <field name="section_id"  widget="selection" groups="base.group_multi_salesteams"/>
-                <field name="categ_id"/>
-                <field name="category2_id"/>
-                <field name="stage_id"/>
-                <field name="nbr" />
-                <field name="state" />
-                <field name="delay_close"/>
+            <form string="Cases by Section, Category and Type">
+                <group col="4">
+                    <field name="name"/>
+                    <field name="month"/>
+                    <field name="user_id"/>
+                    <field name="section_id"  widget="selection" groups="base.group_multi_salesteams"/>
+                    <field name="categ_id"/>
+                    <field name="category2_id"/>
+                    <field name="stage_id"/>
+                    <field name="nbr" />
+                    <field name="state" />
+                    <field name="delay_close"/>
+                </group>
             </form>
         </field>
     </record>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index fd14457b42d..429d7e3a670 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -46,11 +46,13 @@
             <field name="name">crm.claim.stage.form</field>
             <field name="model">crm.claim.stage</field>
             <field name="arch" type="xml">
-                <form string="Claim Stage" version="6.1">
-                    <field name="name"/>
-                    <field name="case_default"/>
-                    <field name="sequence"/>
-                    <field name="fold"/>
+                <form string="Claim Stage">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="case_default"/>
+                        <field name="sequence"/>
+                        <field name="fold"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index d876f733da2..0b738a27107 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -43,14 +43,16 @@
         <field name="name">Questionnaires</field>
         <field name="model">crm_profiling.questionnaire</field>
         <field name="arch" type="xml">
-          <form string="Questionnaires" version="6.1">
-            <field name="name"/>
-            <newline/>
-            <separator string="Questions List" colspan="4"/>
-            <field name="questions_ids" colspan="4" nolabel="1"/>
-            <newline/>
-            <separator string="Description" colspan="4"/>
-            <field name="description" colspan="4" nolabel="1"/>
+          <form string="Questionnaires">
+            <group col="4">
+              <field name="name"/>
+              <newline/>
+              <separator string="Questions List" colspan="4"/>
+              <field name="questions_ids" colspan="4" nolabel="1"/>
+              <newline/>
+              <separator string="Description" colspan="4"/>
+              <field name="description" colspan="4" nolabel="1"/>
+            </group>
           </form>
         </field>
     </record>
@@ -74,9 +76,11 @@
         <field name="name">Answers</field>
         <field name="model">crm_profiling.answer</field>
         <field name="arch" type="xml">
-          <form string="Answers" version="6.1">
-            <field name="question_id"/>
-            <field name="name"/>
+          <form string="Answers">
+            <group col="4">
+              <field name="question_id"/>
+              <field name="name"/>
+            </group>
           </form>
         </field>
     </record>
@@ -100,19 +104,21 @@
         <field name="name">Questions</field>
         <field name="model">crm_profiling.question</field>
         <field name="arch" type="xml">
-          <form string="Questions" version="6.1">
-            <newline/>
-            <field name="name"/>
-            <newline/>
-            <separator string="Avalaible Answers" colspan="4"/>
-            <field name="answers_ids" colspan="4" nolabel="1">
-              <tree string="Answers" editable="bottom">
-                <field name="name"/>
-              </tree>
-              <form string="Answers">
-                <field name="name"/>
-              </form>
-            </field>
+          <form string="Questions">
+            <group col="4">
+              <newline/>
+              <field name="name"/>
+              <newline/>
+              <separator string="Avalaible Answers" colspan="4"/>
+              <field name="answers_ids" colspan="4" nolabel="1">
+                <tree string="Answers" editable="bottom">
+                  <field name="name"/>
+                </tree>
+                <form string="Answers">
+                  <field name="name"/>
+                </form>
+              </field>
+            </group>
           </form>
         </field>
     </record>
@@ -141,42 +147,44 @@
         <field name="name">crm.segmentation.form</field>
         <field name="model">crm.segmentation</field>
         <field name="arch" type="xml">
-            <form string="Partner Segmentation" version="6.1">
-                <notebook>
-                <page string="Segmentation">
-                    <separator string="Segmentation Description" colspan="4"/>
-                    <field name="name"/>
-                    <field name="exclusif"/>
-                    <newline/>
-                    <field name="categ_id" colspan="2"/>
-                    <newline/>
-                    <field name="description" colspan="4"/>
-                    <field name="state"/>
-                    <group col="3" colspan="2">
-                        <button name="process_start"
-                            states="not running" string="Compute Segmentation" type="object"
-                            icon="gtk-apply" />
-                        <button name="process_stop" states="running"
-                            string="Stop Process" type="object" icon="gtk-stop" />
-                        <button name="process_continue" states="running"
-                            string="Continue Process" type="object" icon="gtk-go-forward" />
-                    </group>
-                </page>
-                <page string="Sales Purchase">
-                    <field name="sales_purchase_active"/>
-                    <separator string="Segmentation Test" colspan="4"/>
-                    <field name="segmentation_line" widget="one2many_list" colspan="4"/>
-                </page>
-                <page string="Profiling">
-                    <field name="profiling_active" colspan="2"/>
-                    <separator string="Profiling Options" colspan="4"/>
-                    <field name="parent_id" colspan="2"/><newline/>
-                    <separator string="Included Answers :" colspan="2" />
-                    <separator string="Excluded Answers :" colspan="2"/>
-                    <field name="answer_yes" nolabel="1" colspan="2"/>
-                    <field name="answer_no" nolabel="1" colspan="2"/>
-                </page>
-                </notebook>
+            <form string="Partner Segmentation">
+                <group col="4">
+                    <notebook>
+                    <page string="Segmentation">
+                        <separator string="Segmentation Description" colspan="4"/>
+                        <field name="name"/>
+                        <field name="exclusif"/>
+                        <newline/>
+                        <field name="categ_id" colspan="2"/>
+                        <newline/>
+                        <field name="description" colspan="4"/>
+                        <field name="state"/>
+                        <group col="3" colspan="2">
+                            <button name="process_start"
+                                states="not running" string="Compute Segmentation" type="object"
+                                icon="gtk-apply" />
+                            <button name="process_stop" states="running"
+                                string="Stop Process" type="object" icon="gtk-stop" />
+                            <button name="process_continue" states="running"
+                                string="Continue Process" type="object" icon="gtk-go-forward" />
+                        </group>
+                    </page>
+                    <page string="Sales Purchase">
+                        <field name="sales_purchase_active"/>
+                        <separator string="Segmentation Test" colspan="4"/>
+                        <field name="segmentation_line" widget="one2many_list" colspan="4"/>
+                    </page>
+                    <page string="Profiling">
+                        <field name="profiling_active" colspan="2"/>
+                        <separator string="Profiling Options" colspan="4"/>
+                        <field name="parent_id" colspan="2"/><newline/>
+                        <separator string="Included Answers :" colspan="2" />
+                        <separator string="Excluded Answers :" colspan="2"/>
+                        <field name="answer_yes" nolabel="1" colspan="2"/>
+                        <field name="answer_no" nolabel="1" colspan="2"/>
+                    </page>
+                    </notebook>
+                </group>
             </form>
         </field>
     </record>
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index 102ad3e2a21..f6af9ad199a 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -5,13 +5,15 @@
             <field name="name">report.document.user.form</field>
             <field name="model">report.document.user</field>
             <field name="arch" type="xml">
-                <form string="Files" version="6.1">
-                    <field name="name"/>
-                    <field name="user"/>
-                    <field name="directory"/>
-                    <field name="datas_fname"/>
-                    <field name="file_size"/>
-                    <field name="create_date"/>
+                <form string="Files">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="user"/>
+                        <field name="directory"/>
+                        <field name="datas_fname"/>
+                        <field name="file_size"/>
+                        <field name="create_date"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index e602d3db595..01b2842f30b 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -159,8 +159,10 @@
             <field name="name">hr.contract.type.view.form</field>
             <field name="model">hr.contract.type</field>
             <field name="arch" type="xml">
-                <form string="Contract Type" version="6.1">
-                    <field colspan="4" name="name"/>
+                <form string="Contract Type">
+                    <group col="4">
+                        <field colspan="4" name="name"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index a3d5e0df4a1..80cfd7f34e0 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -408,14 +408,14 @@
             <field name="name">hr.salary.rule.category.form</field>
             <field name="model">hr.salary.rule.category</field>
             <field name="arch" type="xml">
-                <form string="Salary Categories" version="6.1">
+                <form string="Salary Categories">
                     <group col="4">
                         <field name="name"/>
                         <field name="code"/>
                         <field name="parent_id"/>
+                        <separator string="Notes"/>
+                        <field name="note"/>
                     </group>
-                    <separator string="Notes"/>
-                    <field name="note"/>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 2afc7dd8de1..fa48dc7b136 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -92,10 +92,12 @@
             <field name="name">report_timesheet.timesheet.user.form</field>
             <field name="model">report_timesheet.user</field>
             <field name="arch" type="xml">
-                <form string="Timesheet by user" version="6.1">
-                    <field name="name"/>
-                    <field name="month"/>
-                    <field name="user_id"/>
+                <form string="Timesheet by user">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="month"/>
+                        <field name="user_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -164,10 +166,12 @@
             <field name="name">report_timesheet.timesheet.invoice.form</field>
             <field name="model">report_timesheet.invoice</field>
             <field name="arch" type="xml">
-                <form string="Timesheet by invoice" version="6.1">
-                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="manager_id"/>
-                    <field name="user_id"/>
+                <form string="Timesheet by invoice">
+                    <group col="4">
+                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="manager_id"/>
+                        <field name="user_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -237,12 +241,14 @@
             <field name="name">report_timesheet.timesheet.account.date.form</field>
             <field name="model">report_timesheet.account.date</field>
             <field name="arch" type="xml">
-                <form string="Daily timesheet by account" version="6.1">
-                    <field name="name"/>
-                    <field name="month"/>
-                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="user_id"/>
-                    <field name="quantity"/>
+                <form string="Daily timesheet by account">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="month"/>
+                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="user_id"/>
+                        <field name="quantity"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -299,12 +305,14 @@
             <field name="name">report_timesheet.timesheet.account.form</field>
             <field name="model">report_timesheet.account</field>
             <field name="arch" type="xml">
-                <form string="Timesheet by account" version="6.1">
-                    <field name="name"/>
-                    <field name="month"/>
-                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="user_id"/>
-                    <field name="quantity"/>
+                <form string="Timesheet by account">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="month"/>
+                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="user_id"/>
+                        <field name="quantity"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index 9cdd6d64013..db04bd927f2 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -6,14 +6,16 @@
             <field name="name">report.analytic.account.close.form</field>
             <field name="model">report.analytic.account.close</field>
             <field name="arch" type="xml">
-                <form string="Expired analytic accounts" version="6.1">
-                    <field name="name" groups="analytic.group_analytic_accounting"/>
-                    <field name="partner_id"/>
-                    <field name="quantity"/>
-                    <field name="state"/>
-                    <field name="quantity_max"/>
-                    <field name="date_deadline"/>
-                    <field name="balance"/>
+                <form string="Expired analytic accounts">
+                    <group col="4">
+                        <field name="name" groups="analytic.group_analytic_accounting"/>
+                        <field name="partner_id"/>
+                        <field name="quantity"/>
+                        <field name="state"/>
+                        <field name="quantity_max"/>
+                        <field name="date_deadline"/>
+                        <field name="balance"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -59,16 +61,18 @@
             <field name="name">report.account.analytic.line.to.invoice</field>
             <field name="model">report.account.analytic.line.to.invoice</field>
             <field name="arch" type="xml">
-                <form string="Analytic Lines to Invoice" version="6.1">
-                    <field name="name"/>
-                    <field name="month"/>
-                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                    <newline/>
-                    <field name="product_id"/>
-                    <field name="product_uom_id"/>
-                    <newline/>
-                    <field colspan="1" name="amount"/>
-                    <field colspan="1" name="unit_amount"/>
+                <form string="Analytic Lines to Invoice">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="month"/>
+                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                        <newline/>
+                        <field name="product_id"/>
+                        <field name="product_uom_id"/>
+                        <newline/>
+                        <field colspan="1" name="amount"/>
+                        <field colspan="1" name="unit_amount"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
index d080e856123..fb2add87f34 100644
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
@@ -38,21 +38,23 @@
       <field name="name">Vat Listing</field>
       <field name="model">partner.vat.list</field>
       <field name="arch" type="xml">
-        <form string="Annual Listing of VAT-Subjected Customers" version="6.1">
-          <notebook colspan="4">
-            <page string="Customer List">
-              <separator string="Customers" colspan="4"/>
-              <field name="partner_ids" colspan="4" nolabel="1" default_focus="1" height="300" width="500" readonly="1"/>
-            </page>
-            <page string="Comments">
-              <separator string="Free Comments to be Added to the Declaration" colspan="4"/>
-              <field name="comments" colspan="4" nolabel="1"/>
-            </page>
-          </notebook>
-          <separator colspan="4"/>
-          <group colspan="4">
-            <button colspan="2" name="create_xml" string="Create XML" type="object" icon="gtk-execute"/>
-            <button colspan="2" name="print_vatlist" string="Print" type="object"  icon="gtk-print"/>
+        <form string="Annual Listing of VAT-Subjected Customers">
+          <group col="4">
+              <notebook colspan="4">
+                <page string="Customer List">
+                  <separator string="Customers" colspan="4"/>
+                  <field name="partner_ids" colspan="4" nolabel="1" default_focus="1" height="300" width="500" readonly="1"/>
+                </page>
+                <page string="Comments">
+                  <separator string="Free Comments to be Added to the Declaration" colspan="4"/>
+                  <field name="comments" colspan="4" nolabel="1"/>
+                </page>
+              </notebook>
+              <separator colspan="4"/>
+              <group colspan="4">
+                <button colspan="2" name="create_xml" string="Create XML" type="object" icon="gtk-execute"/>
+                <button colspan="2" name="print_vatlist" string="Print" type="object"  icon="gtk-print"/>
+              </group>
           </group>
         </form>
       </field>
@@ -82,11 +84,13 @@
       <field name="name">step.vat.listing</field>
       <field name="model">vat.listing.clients</field>
       <field name="arch" type="xml">
-        <form string="VAT listing" version="6.1">
-          <field name="name"/>
-          <field name="vat"/>
-          <field name="turnover"/>
-          <field name="vat_amount"/>
+        <form string="VAT listing">
+          <group col="4">
+            <field name="name"/>
+            <field name="vat"/>
+            <field name="turnover"/>
+            <field name="vat_amount"/>
+          </group>
         </form>
       </field>
     </record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f6cb53df11a..f0f13fb41b1 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -770,8 +770,10 @@
             <field name="name">Tags</field>
             <field name="model">project.category</field>
             <field name="arch" type="xml">
-                <form string="Tags" version="6.1">
-                    <field name="name"/>
+                <form string="Tags">
+                    <group col="4">
+                        <field name="name"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a797f9bf1c5..2242c0dc2db 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -454,9 +454,11 @@
             <field name="name">product.removal.form</field>
             <field name="model">product.removal</field>
             <field name="arch" type="xml">
-                <form string="Removal" version="6.1">
-                   <field name="name"/>
-                   <field name="method"/>
+                <form string="Removal">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="method"/>
+                    </group>
                </form>
             </field>
         </record>
diff --git a/openerp/addons/base/ir/ir_model_view.xml b/openerp/addons/base/ir/ir_model_view.xml
index 10115ab184f..9b10de37b3c 100644
--- a/openerp/addons/base/ir/ir_model_view.xml
+++ b/openerp/addons/base/ir/ir_model_view.xml
@@ -304,14 +304,16 @@
         <record model="ir.ui.view" id="view_model_constraint_form">
             <field name="model">ir.model.constraint</field>
             <field name="arch" type="xml">
-                <form string="Model Constraints" version="6.1">
-                    <field name="type"/>
-                    <field name="name"/>
-                    <field name="module"/>
-                    <field name="model"/>
-                    <newline/>
-                    <field name="date_update" />
-                    <field name="date_init" />
+                <form string="Model Constraints">
+                    <group col="4">
+                        <field name="type"/>
+                        <field name="name"/>
+                        <field name="module"/>
+                        <field name="model"/>
+                        <newline/>
+                        <field name="date_update" />
+                        <field name="date_init" />
+                    </group>
                 </form>
             </field>
         </record>
@@ -339,13 +341,15 @@
         <record model="ir.ui.view" id="view_model_relation_form">
             <field name="model">ir.model.relation</field>
             <field name="arch" type="xml">
-                <form string="ManyToMany Relations" version="6.1">
-                    <field name="name"/>
-                    <field name="module"/>
-                    <field name="model"/>
-                    <newline/>
-                    <field name="date_update" />
-                    <field name="date_init" />
+                <form string="ManyToMany Relations">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="module"/>
+                        <field name="model"/>
+                        <newline/>
+                        <field name="date_update" />
+                        <field name="date_init" />
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/test_workflow/data.xml b/openerp/addons/test_workflow/data.xml
index 437224f7ba3..6e8b882d6fa 100644
--- a/openerp/addons/test_workflow/data.xml
+++ b/openerp/addons/test_workflow/data.xml
@@ -6,11 +6,13 @@
             <field name="name">Test workflow</field>
             <field name="model">test.workflow.model</field>
             <field name="arch" type="xml">
-                <form string="Test workflow" version="6.1">
-                          <button name="a-b" string="a-b" type="workflow" icon="gtk-ok" colspan="1"/>
-                          <label string="a-b"/>
-                          <button name="trigger" string="trigger" type="object" icon="gtk-ok" colspan="1"/>
-                          <label string="trigger"/>
+                <form string="Test workflow">
+                    <group col="4">
+                        <button name="a-b" string="a-b" type="workflow" icon="gtk-ok" colspan="1"/>
+                        <label string="a-b"/>
+                        <button name="trigger" string="trigger" type="object" icon="gtk-ok" colspan="1"/>
+                        <label string="trigger"/>
+                    </group>
                 </form>
            </field>
         </record>