[IMP] better views

bzr revid: fp@tinyerp.com-20120911084215-1er8vwxc9zadiksf

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 5a3fd6b..8c0de73 100644 (file)
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2369,22 +2369,15 @@
                 <group string="res_config_contents" position="replace">
                     <field name="only_one_chart_template" invisible="1"/>
                     <field name="complete_tax_set" invisible="1"/>
-                    <div groups="base.group_multi_company">
-                        <label for="company_id"/>
-                        <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
-                    </div>
-                    <label for="currency_id"/>
-                    <field name="currency_id" />
-                    <group>
-                        <div attrs="{'invisible': [('only_one_chart_template','=',True)]}">
-                            <label for="chart_template_id"/>
+                    <group col="1">
+                        <group attrs="{'invisible': [('only_one_chart_template','=',True)]}">
                             <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
-                        </div>
-                        <newline/>
-                        <group groups="account.group_account_user">
-                            <field name="code_digits"/>
+                        </group>
+                        <group groups="base.group_multi_company">
+                            <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                         </group>
                         <group>
+                            <field name="currency_id" class="oe_inline"/>
                             <field name="sale_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
                             <label for="sale_tax_rate" string="Sale Tax" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
                             <div attrs="{'invisible': [('complete_tax_set', '=', True)]}">
@@ -2396,17 +2389,10 @@
                                 <field name="purchase_tax_rate" class="oe_inline"/> %%
                             </div>
                         </group>
+                        <group groups="account.group_account_user">
+                            <field name="code_digits"/>
+                        </group>
                     </group>
-                    <div groups="account.group_account_user">
-                        <label for="bank_accounts_id" string="Bank Information"/>
-                        <field name="bank_accounts_id">
-                            <tree editable="bottom">
-                                <field name="acc_name"/>
-                                <field name="account_type"/>
-                                <field name="currency_id" widget="selection" groups="base.group_multi_currency"/>
-                            </tree>
-                        </field>
-                    </div>
                 </group>
             </field>
         </record>

diff --git a/addons/procurement/board_mrp_procurement_view.xml b/addons/procurement/board_mrp_procurement_view.xml
index a01ec16..f30ea62 100644 (file)
--- a/addons/procurement/board_mrp_procurement_view.xml
+++ b/addons/procurement/board_mrp_procurement_view.xml
@@ -15,9 +15,9 @@
             <field name="model">board.board</field>
             <field name="inherit_id" ref="stock.board_warehouse_form"/>
             <field name="arch" type="xml">
-              <xpath expr="/form/board/column/action[@string='Incoming Shipments']" position="before">
+              <xpath expr="//column" position="inside">
                 <action name="%(procurement_action_board)d" string="Procurements in Exception"/>
-            </xpath>
+              </xpath>
             </field>
         </record>
     </data>