From d496a2cb231f4056314f1278f69c69949c74d41e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 11 Jun 2012 18:10:14 +0200
Subject: [PATCH] [FIX] *: Correct @version spec in new-style forms, after FP's
 recent merge

bzr revid: odo@openerp.com-20120611161014-19p6rd5qpkmmijmg
---
 addons/account/account_view.xml               |  2 +-
 addons/account/partner_view.xml               | 18 ++++++-------
 addons/account_budget/account_budget_view.xml | 16 +++++-------
 addons/base_vat/base_vat_view.xml             |  2 +-
 .../wizard/document_configuration_view.xml    |  2 --
 addons/document_webdav/webdav_view.xml        |  2 +-
 addons/hr_payroll/hr_payroll_view.xml         |  6 ++---
 addons/knowledge/res_config_view.xml          |  2 +-
 .../l10n_be_account_vat_declaration_view.xml  |  4 +--
 .../l10n_be_hr_payroll_view.xml               |  3 ---
 addons/mrp_subproduct/mrp_subproduct_view.xml | 12 ++++-----
 .../wizard/project_compute_tasks_view.xml     |  2 +-
 addons/stock_location/stock_location_view.xml | 26 +++++++++----------
 addons/stock_planning/stock_planning_view.xml |  4 +--
 addons/survey/survey_view.xml                 |  2 +-
 15 files changed, 46 insertions(+), 57 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 9138dee0e6c..274a8993dc4 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2371,7 +2371,7 @@
                     <field name ="complete_tax_set" invisible="1"/>
                     <newline/> <!-- extended view because the web UI is not good for one2many -->
                     <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list" groups="account.group_account_user">
-                        <form string="Bank Information" version="7.0">
+                        <form string="Bank Information">
                             <field name="acc_name"/>
                             <field name="account_type"/>
                             <field name="currency_id" widget="selection"/>
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 811cac1624d..5ed15139448 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -19,7 +19,7 @@
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </tree>
-                        <form string="Tax Mapping" version="7.0">
+                        <form string="Tax Mapping">
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </form>
@@ -29,7 +29,7 @@
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
                         </tree>
-                        <form string="Account Mapping" version="7.0">
+                        <form string="Account Mapping">
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
                         </form>
@@ -74,22 +74,22 @@
             <field name="priority">2</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <page string="History" position="before">
-                <page string="Accounting">
-                    <group>
-                        <group string="Customer Accounting Properties">
+                <page string="History" position="before" version="7.0">
+                <page string="Accounting" col="4">
+                    <group col="4">
+                        <group string="Customer Accounting Properties" col="4">
                             <field name="property_account_receivable" groups="account.group_account_invoice" />
                             <field name="property_account_position" widget="selection"/>
                             <field name="property_payment_term" widget="selection"/>
                         </group>
-                        <group string="Supplier Accounting Properties">
+                        <group string="Supplier Accounting Properties" col="4">
                             <field name="property_account_payable" groups="account.group_account_invoice"/>
                         </group>
-                        <group string="Customer Credit">
+                        <group string="Customer Credit" col="4">
                             <field name="credit"/>
                             <field name="credit_limit"/>
                         </group>
-                        <group string="Supplier Debit">
+                        <group string="Supplier Debit" col="4">
                             <field name="debit"/>
                         </group>
                         <field name="bank_ids">
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 1dd4e3a7dc0..363373b3204 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -288,15 +288,13 @@
                                     <field name="theoritical_amount" sum="Theoritical Amount"/>
                                     <field name="percentage"/>
                                 </tree>
-                                <form string="Budget Lines" version="7.0">
-                                    <group col="4">
-                                        <field name="crossovered_budget_id"/>
-                                        <field name="general_budget_id"/>
-                                        <field name="date_from"/>
-                                        <field name="date_to"/>
-                                        <field name="paid_date"/>
-                                        <field name="planned_amount"/>
-                                    </group>
+                                <form string="Budget Lines">
+                                    <field name="crossovered_budget_id"/>
+                                    <field name="general_budget_id"/>
+                                    <field name="date_from"/>
+                                    <field name="date_to"/>
+                                    <field name="paid_date"/>
+                                    <field name="planned_amount"/>
                                 </form>
                                 <graph type="bar" string="Lines">
                                     <field name="general_budget_id" />
diff --git a/addons/base_vat/base_vat_view.xml b/addons/base_vat/base_vat_view.xml
index f7c8aa12b87..d05abe38b4b 100644
--- a/addons/base_vat/base_vat_view.xml
+++ b/addons/base_vat/base_vat_view.xml
@@ -7,7 +7,7 @@
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="account.view_partner_property_form"/>
             <field name="arch" type="xml">
-                <field name="property_account_payable" position="after">
+                <field name="property_account_payable" position="after" version="7.0">
                     <label for="vat"/>
                     <div>
                         <field name="vat" on_change="vat_change(vat)" placeholder="BE0477472702" class="oe_form_inline"/>
diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index 4f4c441b362..4a2f131d42a 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -10,8 +10,6 @@
             <form position="attributes">
                 <attribute name="string">Knowledge Application Configuration</attribute>
             </form>
-            <group string="res_config_contents" position="attributes">
-            </group>
             <group string="res_config_contents" position="replace">
                 <group string="Configure Directories">
                     <label string="OpenERP's Document Management System supports mapping virtual folders with documents. The virtual folder of a document can be used to manage the files attached to the document, or to print and download any report. This tool will create directories automatically according to modules installed."/>
diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml
index 881db073ae9..b0101c01574 100644
--- a/addons/document_webdav/webdav_view.xml
+++ b/addons/document_webdav/webdav_view.xml
@@ -77,7 +77,7 @@
         <field name="inherit_id" ref="document.view_document_directory_form" />
         <field name="type">form</field>
         <field name="arch" type="xml">
-        <page string="Dynamic context" position="after">
+        <page string="Dynamic context" position="after" version="7.0">
         <page string="WebDAV properties">
             <label string="These properties will be added to WebDAV requests" colspan="4" />
 
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index a16cef8c1d8..a8bb5ea83c8 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -256,7 +256,7 @@
             <field name="model">hr.payslip</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payslip">
+                <form string="Payslip" version="7.0">
                 <header>
                     <button string="Confirm" name="hr_verify_sheet" states="draft"/>
                     <button string="Refund" name="refund_sheet" states="confirm,done" type='object'/>
@@ -587,7 +587,7 @@
             <field name="model">hr.salary.rule</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Salary Rules">
+                <form string="Salary Rules" version="7.0">
                     <label for="name" class="oe_form_readonly_hidden"/>
                     <h1><field name="name"/></h1>
                     <label for="category_id" class="oe_form_readonly_hidden"/>
@@ -719,7 +719,7 @@
             <field name="model">hr.payslip.run</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payslips Batches">
+                <form string="Payslips Batches" version="7.0">
                 <header>
                     <button name="close_payslip_run" type="object" string="Close" states="draft"/>
                     <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" string="Generate Payslips" />
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 8f3c5cca7e7..2e5e6785438 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -6,7 +6,7 @@
             <field name="model">knowledge.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Knowledge">
+                <form string="Configure Knowledge" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index ac91f56a508..9b3a48725b9 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -7,7 +7,7 @@
             <field name="model">l1on_be.vat.declaration</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Periodical VAT Declaration">
+                <form string="Periodical VAT Declaration" version="7.0">
                     <header>
                         <button icon="gtk-execute"  name="create_xml" string="Create XML" type="object" default_focus="1" />
                         <button special="cancel" string="Close" icon="gtk-cancel"/>
@@ -34,7 +34,7 @@
             <field name="model">l1on_be.vat.declaration</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Save xml">
+                <form string="Save xml" version="7.0">
                     <header>
                         <button special="cancel" string="Ok" icon="gtk-ok"/>
                     </header>
diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
index 6d2ff13121c..46caa9f6478 100644
--- a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
@@ -50,9 +50,6 @@
             <field name="priority">30</field>
             <field name="arch" type="xml">
             <data>
-                <!-- <xpath expr="/form/notebook/page/group/field[@name='birthday']" position="after">
-                    <field name="marital" required="True"/>
-                </xpath> -->
                 <xpath expr="//field[@name='gender']" position="before">
                     <field name="resident_bool" eval="False"/> 
                 </xpath>
diff --git a/addons/mrp_subproduct/mrp_subproduct_view.xml b/addons/mrp_subproduct/mrp_subproduct_view.xml
index 652490685e0..814e4e46391 100644
--- a/addons/mrp_subproduct/mrp_subproduct_view.xml
+++ b/addons/mrp_subproduct/mrp_subproduct_view.xml
@@ -16,13 +16,11 @@
                              <field name="product_qty"/>
                              <field name="subproduct_type"/>
                          </tree>
-                         <form string="Sub Products" version="7.0">
-                             <group col="4">
-                                 <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                                 <field name="product_uom"/>
-                                 <field name="product_qty"/>
-                                 <field name="subproduct_type"/>
-                             </group>
+                         <form string="Sub Products">
+                             <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                             <field name="product_uom"/>
+                             <field name="product_qty"/>
+                             <field name="subproduct_type"/>
                          </form>
                     </field>
                 </page>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index 2e494166464..ac30a3aa6d9 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -7,7 +7,7 @@
             <field name="model">project.compute.tasks</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                 <form string="Schedule Tasks">
+                 <form string="Schedule Tasks" version="7.0">
                      <header>
                          <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
                          <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml
index b37c18cc876..6d1314209e3 100644
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@@ -51,7 +51,7 @@
                                 <field name="journal_id"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
                             </tree>
-                            <form string="Pulled Paths" version="7.0">
+                            <form string="Pulled Paths">
                                 <group>
                                     <group string="Conditions">
                                         <field name="name" placeholder="Fulfill needs on location X from location Y "/>
@@ -62,7 +62,7 @@
                                         <field name="company_id"/>
                                     </group>
                                 </group>
-                                <group col="4" attrs="{'invisible':[('type_proc','!=','move')]}">
+                                <group attrs="{'invisible':[('type_proc','!=','move')]}">
                                     <field name="location_src_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
                                     <field name="picking_type"/>
                                     <field name="partner_address_id"/>
@@ -83,18 +83,16 @@
                                 <field name="invoice_state"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
                             </tree>
-                            <form string="Pushed flows" version="7.0">
-                                <group col="4">
-                                    <field name="name" placeholder="When receiving at location X, move to location Y"/>
-                                    <field name="location_from_id"/>
-                                    <field name="location_dest_id"/>
-                                    <field name="auto"/>
-                                    <field name="delay"/>
-                                    <field name="journal_id"/>
-                                    <field name="picking_type"/>
-                                    <field name="invoice_state"/>
-                                    <field name="company_id" groups="base.group_multi_company"/>
-                                </group>
+                            <form string="Pushed flows">
+                                <field name="name" placeholder="When receiving at location X, move to location Y"/>
+                                <field name="location_from_id"/>
+                                <field name="location_dest_id"/>
+                                <field name="auto"/>
+                                <field name="delay"/>
+                                <field name="journal_id"/>
+                                <field name="picking_type"/>
+                                <field name="invoice_state"/>
+                                <field name="company_id" groups="base.group_multi_company"/>
                             </form>
                         </field>
                     </page>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 2d77d6c661a..0ae33cec3af 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -12,7 +12,7 @@
             <field name="model">stock.period</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                     <header>
                         <button name="button_open" string="Open" states="draft" type="object"/>
                         <button name="button_close" string="Close" states="open" type="object"/>
@@ -81,7 +81,7 @@
             <field name="model">stock.sale.forecast</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="action_validate" string="Approve" states="draft" type="object" />
                     <field name="state" widget="statusbar"/>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 09b31304687..cc9158aa23c 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -18,7 +18,7 @@
             <field name="model">survey</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Survey">
+                <form string="Survey" version="7.0">
                 <header>
                     <button name="survey_open" string="Open" states="cancel,close" type="object"/>
                     <button name="survey_close" string="Close" states="open" type="object"/>