From 8626b6d41d7be0ebd7c804110ae7d0ff9067b0f9 Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Fri, 25 Jul 2014 16:26:01 +0200
Subject: [PATCH] [IMP] adapt views to 6.1

---
 account_banking_pain_base/company_view.xml    |  5 +-
 .../view/bank_payment_manual.xml              |  9 +--
 .../view/payment_mode_type.xml                |  5 +-
 .../account_banking_sdd_view.xml              |  8 +-
 .../account_payment_view.xml                  |  2 +-
 .../company_view.xml                          |  1 +
 .../sdd_mandate_view.xml                      | 75 ++++---------------
 .../wizard/export_sdd_view.xml                | 14 ++--
 8 files changed, 38 insertions(+), 81 deletions(-)

diff --git a/account_banking_pain_base/company_view.xml b/account_banking_pain_base/company_view.xml
index a98d9b641..6a2dc2c85 100644
--- a/account_banking_pain_base/company_view.xml
+++ b/account_banking_pain_base/company_view.xml
@@ -10,13 +10,14 @@
 <record id="view_company_form" model="ir.ui.view">
     <field name="name">pain.group.on.res.company.form</field>
     <field name="model">res.company</field>
+    <field name="type">form</field>
     <field name="inherit_id" ref="base.view_company_form"/>
     <field name="arch" type="xml">
-        <group name="account_grp" position="after">
+        <page string="Configuration">
             <group name="pain" string="Payment Initiation">
                 <field name="initiating_party_issuer"/>
             </group>
-        </group>
+        </page>
     </field>
 </record>
 
diff --git a/account_banking_payment_export/view/bank_payment_manual.xml b/account_banking_payment_export/view/bank_payment_manual.xml
index e350c9b6f..572de1d4b 100644
--- a/account_banking_payment_export/view/bank_payment_manual.xml
+++ b/account_banking_payment_export/view/bank_payment_manual.xml
@@ -5,12 +5,11 @@
             <field name="name">Form for manual payment wizard</field>
             <field name="model">payment.manual</field>
             <field name="arch" type="xml">
-                <form string="Manual payment" version="7.0">
+                <form string="Manual payment">
                     <label string="Please execute payment order manually, and click OK when succesfully sent."/>
-                    <footer>
-	                    <button name="button_ok" type="object" string="OK" class="oe_highlight"/>
-	                    <button special="cancel" string="Cancel" class="oe_link"/>
-                    </footer>
+                    <newline />
+	                <button name="button_ok" type="object" string="OK" />
+                    <button special="cancel" string="Cancel" />
                 </form>
             </field>
         </record>
diff --git a/account_banking_payment_export/view/payment_mode_type.xml b/account_banking_payment_export/view/payment_mode_type.xml
index a3bd21c25..17c68c8d6 100644
--- a/account_banking_payment_export/view/payment_mode_type.xml
+++ b/account_banking_payment_export/view/payment_mode_type.xml
@@ -16,10 +16,11 @@
         <!-- basic view for payment mode type -->
         <record model="ir.ui.view" id="view_payment_mode_type_form">
             <field name="name">view.payment.mode.type.form</field>
+            <field name="type">form</field>
             <field name="model">payment.mode.type</field>
             <field name="arch" type="xml">
-                <form string="Payment Type" version="7.0">
-                    <group name="main">
+                <form string="Payment Type">
+                    <group>
                         <field name="name"/>
                         <field name="code"/>
                         <field name="active"/>
diff --git a/account_banking_sepa_direct_debit/account_banking_sdd_view.xml b/account_banking_sepa_direct_debit/account_banking_sdd_view.xml
index f74b60353..ff31ffdfa 100644
--- a/account_banking_sepa_direct_debit/account_banking_sdd_view.xml
+++ b/account_banking_sepa_direct_debit/account_banking_sdd_view.xml
@@ -10,11 +10,10 @@
 <record id="view_banking_export_sdd_form" model="ir.ui.view">
     <field name="name">account.banking.export.sdd.form</field>
     <field name="model">banking.export.sdd</field>
+    <field name="type">form</field>
     <field name="arch" type="xml">
-        <form string="SEPA Direct Debit" version="7.0">
-            <header>
-                <field name="state" widget="statusbar"/>
-            </header>
+        <form string="SEPA Direct Debit" col="1">
+            <field name="state" widget="statusbar"/>
             <notebook>
                 <page string="General Information">
                     <group name="main">
@@ -38,6 +37,7 @@
 
 <record id="view_banking_export_sdd_tree" model="ir.ui.view">
     <field name="name">account.banking.export.sdd.tree</field>
+    <field name="type">tree</field>
     <field name="model">banking.export.sdd</field>
     <field name="arch" type="xml">
         <tree string="SEPA Direct Debit">
diff --git a/account_banking_sepa_direct_debit/account_payment_view.xml b/account_banking_sepa_direct_debit/account_payment_view.xml
index 74098c44e..0e66dca8e 100644
--- a/account_banking_sepa_direct_debit/account_payment_view.xml
+++ b/account_banking_sepa_direct_debit/account_payment_view.xml
@@ -12,7 +12,7 @@
     <field name="model">payment.order</field>
     <field name="inherit_id" ref="account_payment.view_payment_order_form"/>
     <field name="arch" type="xml">
-        <xpath expr="//field[@name='line_ids']/form/notebook/page/group/field[@name='bank_id']" position="after">
+        <xpath expr="//field[@name='line_ids']//form//field[@name='bank_id']" position="after">
             <field name="sdd_mandate_id" domain="[('partner_bank_id', '=', bank_id), ('state', '=', 'valid')]" invisible="context.get('default_payment_order_type')!='debit'" context="{'default_partner_bank_id': bank_id}"/>
             <newline />
         </xpath>
diff --git a/account_banking_sepa_direct_debit/company_view.xml b/account_banking_sepa_direct_debit/company_view.xml
index e4c9e0b93..141c0266e 100644
--- a/account_banking_sepa_direct_debit/company_view.xml
+++ b/account_banking_sepa_direct_debit/company_view.xml
@@ -9,6 +9,7 @@
 
 <record id="sdd_res_company_form" model="ir.ui.view">
     <field name="name">sepa_direct_debit.res.company.form</field>
+    <field name="type">form</field>
     <field name="model">res.company</field>
     <field name="inherit_id" ref="account_banking_pain_base.view_company_form"/>
     <field name="arch" type="xml">
diff --git a/account_banking_sepa_direct_debit/sdd_mandate_view.xml b/account_banking_sepa_direct_debit/sdd_mandate_view.xml
index bd1dd6e79..c42a534f5 100644
--- a/account_banking_sepa_direct_debit/sdd_mandate_view.xml
+++ b/account_banking_sepa_direct_debit/sdd_mandate_view.xml
@@ -9,24 +9,21 @@
 
 <record id="sdd_mandate_form" model="ir.ui.view">
     <field name="name">sdd.mandate.form</field>
+    <field name="type">form</field>
     <field name="model">sdd.mandate</field>
     <field name="arch" type="xml">
-        <form string="SEPA Direct Debit Mandate" version="7.0">
-            <header>
-                <button name="validate" type="object" string="Validate" states="draft" class="oe_highlight"/>
+        <form string="SEPA Direct Debit Mandate" col="1">
+            <group>
+                <button name="validate" type="object" string="Validate" states="draft" />
                 <button name="cancel" type="object" string="Cancel" states="draft,valid"/>
                 <button name="back2draft" type="object" string="Back to Draft"
                     states="cancel" groups="account.group_account_manager"
                     confirm="You should set a mandate back to draft only if you cancelled it by mistake. Do you want to continue ?"/>
                 <field name="state" widget="statusbar"/>
-            </header>
-            <sheet>
-                <div class="oe_title">
-                    <h1>
-                        <field name="unique_mandate_reference" class="oe_inline"/>
-                    </h1>
-                </div>
-                <group name="main">
+            </group>
+            <group col="1">
+                <field name="unique_mandate_reference" />
+                <group>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="partner_bank_id"
                         on_change="mandate_partner_bank_change(partner_bank_id, type, recurrent_sequence_type, last_debit_date, state)"
@@ -41,20 +38,20 @@
                     <field name="sepa_migrated" groups="account_banking_sepa_direct_debit.group_original_mandate_required"/>
                     <field name="original_mandate_identification" attrs="{'invisible': [('sepa_migrated', '=', True)], 'required': [('sepa_migrated', '=', False)]}" groups="account_banking_sepa_direct_debit.group_original_mandate_required"/>
                 </group>
-                <group name="payment_lines" string="Related Payment Lines">
+                <group string="Related Payment Lines">
                     <field name="payment_line_ids" nolabel="1"/>
                 </group>
-            </sheet>
-            <div class="oe_chatter">
-                <field name="message_follower_ids" widget="mail_followers"/>
-                <field name="message_ids" widget="mail_thread"/>
-            </div>
+            </group>
+            <group>
+                <field name="message_ids" widget="mail_thread" nolabel="1" />
+            </group>
         </form>
     </field>
 </record>
 
 <record id="sdd_mandate_tree" model="ir.ui.view">
     <field name="name">sdd.mandate.tree</field>
+    <field name="type">tree</field>
     <field name="model">sdd.mandate</field>
     <field name="arch" type="xml">
         <tree string="SEPA Direct Debit Mandate" colors="blue:state=='draft';black:state in ('expired', 'cancel')">
@@ -71,6 +68,7 @@
 
 <record id="sdd_mandate_search" model="ir.ui.view">
     <field name="name">sdd.mandate.search</field>
+    <field name="type">search</field>
     <field name="model">sdd.mandate</field>
     <field name="arch" type="xml">
         <search string="Search SEPA Direct Debit Mandates">
@@ -105,48 +103,5 @@
           sequence="20"
           />
 
-<!-- notifications in the chatter -->
-<record id="mandate_valid" model="mail.message.subtype">
-    <field name="name">Mandate Validated</field>
-    <field name="res_model">sdd.mandate</field>
-    <field name="default" eval="False"/>
-    <field name="description">SEPA Direct Debit Mandate Validated</field>
-</record>
-
-<record id="mandate_expired" model="mail.message.subtype">
-    <field name="name">Mandate Expired</field>
-    <field name="res_model">sdd.mandate</field>
-    <field name="default" eval="False"/>
-    <field name="description">SEPA Direct Debit Mandate has Expired</field>
-</record>
-
-<record id="mandate_cancel" model="mail.message.subtype">
-    <field name="name">Mandate Cancelled</field>
-    <field name="res_model">sdd.mandate</field>
-    <field name="default" eval="False"/>
-    <field name="description">SEPA Direct Debit Mandate Cancelled</field>
-</record>
-
-<record id="recurrent_sequence_type_first" model="mail.message.subtype">
-    <field name="name">Sequence Type set to First</field>
-    <field name="res_model">sdd.mandate</field>
-    <field name="default" eval="False"/>
-    <field name="description">Sequence Type set to First</field>
-</record>
-
-<record id="recurrent_sequence_type_recurring" model="mail.message.subtype">
-    <field name="name">Sequence Type set to Recurring</field>
-    <field name="res_model">sdd.mandate</field>
-    <field name="default" eval="False"/>
-    <field name="description">Sequence Type set to Recurring</field>
-</record>
-
-<record id="recurrent_sequence_type_final" model="mail.message.subtype">
-    <field name="name">Sequence Type set to Final</field>
-    <field name="res_model">sdd.mandate</field>
-    <field name="default" eval="False"/>
-    <field name="description">Sequence Type set to Final</field>
-</record>
-
 </data>
 </openerp>
diff --git a/account_banking_sepa_direct_debit/wizard/export_sdd_view.xml b/account_banking_sepa_direct_debit/wizard/export_sdd_view.xml
index 3699de91c..1f5a533f0 100644
--- a/account_banking_sepa_direct_debit/wizard/export_sdd_view.xml
+++ b/account_banking_sepa_direct_debit/wizard/export_sdd_view.xml
@@ -11,7 +11,7 @@
     <field name="name">banking.export.sdd.wizard.view</field>
     <field name="model">banking.export.sdd.wizard</field>
     <field name="arch" type="xml">
-        <form string="SEPA Direct Debit XML file generation" version="7.0">
+        <form string="SEPA Direct Debit XML file generation">
             <field name="state" invisible="True"/>
             <group states="create">
                 <field name="batch_booking" />
@@ -23,12 +23,12 @@
                 <field name="file" filename="filename" />
                 <field name="filename" invisible="True"/>
             </group>
-            <footer>
-                <button string="Generate" name="create_sepa" type="object" class="oe_highlight" states="create"/>
-                <button string="Cancel" special="cancel" class="oe_link" states="create"/>
-                <button string="Validate" name="save_sepa" type="object" class="oe_highlight" states="finish"/>
-                <button string="Cancel" name="cancel_sepa" type="object" class="oe_link" states="finish"/>
-            </footer>
+            <group>
+                <button string="Generate" name="create_sepa" type="object" states="create"/>
+                <button string="Cancel" special="cancel" states="create"/>
+                <button string="Validate" name="save_sepa" type="object" states="finish"/>
+                <button string="Cancel" name="cancel_sepa" type="object" states="finish"/>
+            </group>
         </form>
     </field>
 </record>