[MERGE] base: raise an exception if the format of the bank account is wrong

[odoo/odoo.git] / openerp / addons / base / res / res_currency_view.xml

diff --git a/openerp/addons/base/res/res_currency_view.xml b/openerp/addons/base/res/res_currency_view.xml
index 8d747c8..907eec8 100644 (file)
--- a/openerp/addons/base/res/res_currency_view.xml
+++ b/openerp/addons/base/res/res_currency_view.xml
@@ -2,19 +2,30 @@
 <openerp>
     <data>
 
+        <record id="view_currency_search" model="ir.ui.view">
+            <field name="name">res.currency.search</field>
+            <field name="model">res.currency</field>
+            <field name="arch" type="xml">
+                <search string="Currencies">
+                    <field name="name" string="Currency"/>
+                    <field name="active"/>
+                </search>
+            </field>
+        </record>
+
         <record id="view_currency_tree" model="ir.ui.view">
             <field name="name">res.currency.tree</field>
             <field name="model">res.currency</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Currencies">
                     <field name="name"/>
-                    <field name="company_id" select="2" />
+                    <field name="company_id" groups="base.group_multi_company"/>
                      <field name="rate_ids" invisible="1"/>
                     <field name="date"/>
                     <field name="rate"/>
                     <field name="rounding"/>
                     <field name="accuracy"/>
+                    <field name="position"/>
                     <field name="active"/>
                 </tree>
             </field>
@@ -22,34 +33,33 @@
         <record id="view_currency_form" model="ir.ui.view">
             <field name="name">res.currency.form</field>
             <field name="model">res.currency</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Currency">
-                    <group col="6" colspan="6">
-                        <field name="name" select="1"/>
+                <form string="Currency" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
                         <field name="rate"/>
-                        <field name="company_id" select="2" groups="base.group_multi_company" />
-                        <field name="symbol"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
                     </group>
 
-                    <group col="2" colspan="2">
-                        <separator string="Price Accuracy" colspan="2"/>
-                        <field name="rounding"/>
-                        <field name="accuracy"/>
-                    </group>
+                    <group>
+                        <group string="Price Accuracy">
+                            <field name="rounding"/>
+                            <field name="accuracy"/>
+                        </group>
+
+                        <group string="Display">
+                            <field name="symbol"/>
+                            <field name="position"/>
+                        </group>
 
-                    <group col="2" colspan="2">
-                        <separator string="Miscelleanous" colspan="2"/>
-                        <field name="base"/>
-                        <field name="active" select="1"/>
+                        <group string="Miscellaneous">
+                            <field name="base"/>
+                            <field name="active"/>
+                        </group>
                     </group>
 
-                    <field colspan="4" mode="tree,form" name="rate_ids" nolabel="1" attrs="{'readonly':[('base','=',True)]}">
-                        <form string="Rates">
-                            <field name="name"/>
-                            <field name="rate"/>
-                        </form>
-                        <tree string="Rates">
+                    <field mode="tree" name="rate_ids" attrs="{'readonly':[('base','=',True)]}">
+                        <tree string="Rates" editable="bottom">
                             <field name="name"/>
                             <field name="rate"/>
                         </tree>
@@ -62,9 +72,10 @@
             <field name="res_model">res.currency</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_currency_search"/>
         </record>
 
-        <menuitem action="action_currency_form" id="menu_action_currency_form" parent="menu_localisation" sequence="3"/>
+        <menuitem action="action_currency_form" id="menu_action_currency_form" parent="menu_localisation" sequence="3" groups="base.group_multi_currency"/>
 
         <!-- 
             Currency Rate Type
@@ -72,10 +83,11 @@
         <record id="view_currency_rate_type_form" model="ir.ui.view">
             <field name="name">res.currency.rate.type.form</field>
             <field name="model">res.currency.rate.type</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Currency Rate Type">
-                    <field name="name"/>
+                <form string="Currency Rate Type" version="7.0">
+                    <group>
+                        <field name="name"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -90,10 +102,9 @@
         <record id="view_currency_rate_type_search" model="ir.ui.view">
             <field name="name">res.currency.rate.type.search</field>
             <field name="model">res.currency.rate.type</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Currency Rate Type">
-                    <field name="name"/>
+                    <field name="name" string="Name"/>
                 </search>
             </field>
         </record>