[MERGE] lp:~xrg/openobject-addons/trunk-patch18

[odoo/odoo.git] / addons / base_iban / base_iban_data.xml

diff --git a/addons/base_iban/base_iban_data.xml b/addons/base_iban/base_iban_data.xml
index 6e05a54..dae3999 100644 (file)
--- a/addons/base_iban/base_iban_data.xml
+++ b/addons/base_iban/base_iban_data.xml
@@ -1,71 +1,43 @@
-<?xml version="1.0"?>
-<terp>
-       <data>
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
 
-               <record model="ir.ui.view" id="view_partner_bank_iban_form">
-                       <field name="name">res.partner.bank.form.iban.inherit</field>
-                       <field name="model">res.partner.bank</field>
-                       <field name="inherit_id" ref="base.view_partner_bank_form"/>
-                       <field name="type">form</field>
-                       <field name="arch" type="xml">
-                               <field name="acc_number" position="after">
-                                       <newline/>
-                                       <field name="iban"/>
-                                       <newline/>
-                               </field>
-                       </field>
-               </record>
-
-               <record model="ir.ui.view" id="view_partner_iban_form">
-                       <field name="name">res.partner.form.iban.inherit</field>
-                       <field name="model">res.partner</field>
-                       <field name="inherit_id" ref="base.view_partner_form"/>
-                       <field name="type">form</field>
-                       <field name="arch" type="xml">
-                               <field name="acc_number" position="after">
-                                       <newline/>
-                                       <field name="iban"/>
-                                       <newline/>
-                               </field>
-                       </field>
-               </record>
-
-               <!--
-               Default bank account description
-               -->
-               <record model="res.partner.bank.type" id="bank_iban">
-                       <field name="name">IBAN Account</field>
-                       <field name="code">iban</field>
-               </record>
-               <record model="res.partner.bank.type.field" id="bank_iban_field">
-                       <field name="name">iban</field>
-                       <field name="bank_type_id" ref="bank_iban"/>
-                       <field name="required" eval="True"/>
-                       <field name="readonly" eval="False"/>
-               </record>
-               <record model="res.partner.bank.type.field" id="bank_swift_field">
-                       <field name="name">bic</field>
-                       <field name="bank_type_id" ref="bank_iban"/>
-                       <field name="required" eval="True"/>
-                       <field name="readonly" eval="False"/>
-               </record>
-               <record model="res.partner.bank.type.field" id="bank_country_field">
-                       <field name="name">country_id</field>
-                       <field name="bank_type_id" ref="bank_iban"/>
-                       <field name="required" eval="False"/>
-                       <field name="readonly" eval="False"/>
-               </record>
-               <record model="res.partner.bank.type.field" id="bank_zip_field">
-                       <field name="name">zip</field>
-                       <field name="bank_type_id" ref="bank_iban"/>
-                       <field name="required" eval="False"/>
-                       <field name="readonly" eval="False"/>
-               </record>
-               <record model="res.partner.bank.type.field" id="bank_acc_number_field">
-                       <field name="name">acc_number</field>
-                       <field name="bank_type_id" ref="bank_iban"/>
-                       <field name="required" eval="False"/>
-                       <field name="readonly" eval="True"/>
-               </record>
-       </data>
-</terp>
+        <!--
+        Default bank account description
+        -->
+        <record id="bank_iban" model="res.partner.bank.type">
+            <field name="name">IBAN Account</field>
+            <field name="code">iban</field>
+        </record>
+        <record id="bank_iban_field" model="res.partner.bank.type.field">
+            <field name="name">iban</field>
+            <field name="bank_type_id" ref="bank_iban"/>
+            <field eval="True" name="required"/>
+            <field eval="False" name="readonly"/>
+        </record>
+        <record id="bank_swift_field" model="res.partner.bank.type.field">
+            <field name="name">bic</field>
+            <field name="bank_type_id" ref="bank_iban"/>
+            <field eval="True" name="required"/>
+            <field eval="False" name="readonly"/>
+        </record>
+        <record id="bank_country_field" model="res.partner.bank.type.field">
+            <field name="name">country_id</field>
+            <field name="bank_type_id" ref="bank_iban"/>
+            <field eval="False" name="required"/>
+            <field eval="False" name="readonly"/>
+        </record>
+        <record id="bank_zip_field" model="res.partner.bank.type.field">
+            <field name="name">zip</field>
+            <field name="bank_type_id" ref="bank_iban"/>
+            <field eval="False" name="required"/>
+            <field eval="False" name="readonly"/>
+        </record>
+        <record id="bank_acc_number_field" model="res.partner.bank.type.field">
+            <field name="name">acc_number</field>
+            <field name="bank_type_id" ref="bank_iban"/>
+            <field eval="False" name="required"/>
+            <field eval="True" name="readonly"/>
+        </record>
+    </data>
+</openerp>