From 653a436971cb94dcc0b3f881c70fb8617dc8cdf7 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 7 Jun 2012 15:37:52 +0200
Subject: [PATCH] [IMP] new form view d*

bzr revid: fp@tinyerp.com-20120607133752-7urqbkiqfc7gbx3b
---
 .../decimal_precision_view.xml                |   6 +-
 addons/delivery/delivery_view.xml             |  91 +++++++-------
 addons/document/document_view.xml             | 113 +++++++++---------
 addons/document_webdav/webdav_view.xml        |  82 ++++++-------
 4 files changed, 152 insertions(+), 140 deletions(-)

diff --git a/addons/decimal_precision/decimal_precision_view.xml b/addons/decimal_precision/decimal_precision_view.xml
index 23bfbe429fd..661bf643239 100644
--- a/addons/decimal_precision/decimal_precision_view.xml
+++ b/addons/decimal_precision/decimal_precision_view.xml
@@ -7,8 +7,10 @@
             <field name="model">decimal.precision</field>
             <field name="arch" type="xml">
                 <form string="Decimal Precision">
-                    <field name="name" select="1"/>
-                    <field name="digits"/>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="digits"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 6f6e614e676..421b821002c 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -21,11 +21,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Carrier">
-                    <group colspan="4" col="4" name="general">
-                        <field name="name" select="1"/>
-                        <field name="partner_id" select="1"/>
-                        <field name="product_id" select="1"/>
-                        <field name="active" select="1"/>
+                    <group col="4" name="general">
+                        <field name="name"/>
+                        <field name="partner_id"/>
+                        <field name="product_id"/>
+                        <field name="active"/>
                         <separator string="Pricing Information" colspan="4"/>
                         <group colspan="4" col="4">
                             <field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
@@ -36,26 +36,32 @@
                         <newline/>
                         <field name="use_detailed_pricelist"/>
                     </group>
-                        <field name="pricelist_ids" nolabel="1" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree,form">
+                    <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree,form">
                          <tree string="Delivery grids">
                               <field name="sequence"/>
                               <field name="name"/>
                          </tree>
                         <form string="Delivery grids">
-                             <field name="name" select="1"/>
-                             <field name="active" select="1"/>
-                             <field name="sequence" select="1"/>
-                             <notebook colspan="4">
+                             <group col="4">
+                                 <field name="name"/>
+                                 <field name="active"/>
+                                 <field name="sequence"/>
+                             </group>
+                             <notebook>
                                <page string="Grid definition">
-                                  <field colspan="4" name="line_ids" nolabel="1" select="1"/>
+                                  <field name="line_ids"/>
                                </page>
                                <page string="Destination">
-                                   <separator colspan="4" string="Countries"/>
-                                   <field colspan="4" name="country_ids" nolabel="1"/>
-                                   <separator colspan="4" string="States"/>
-                                   <field colspan="4" name="state_ids" nolabel="1"/>
-                                   <field name="zip_from"/>
-                                   <field name="zip_to"/>
+                                   <group string="Countries">
+                                       <field colspan="2" name="country_ids" nolabel="1"/>
+                                   </group>
+                                   <group string="States">
+                                       <field colspan="2" name="state_ids" nolabel="1"/>
+                                   </group>
+                                   <group col="4">
+                                       <field name="zip_from"/>
+                                       <field name="zip_to"/>
+                                   </group>
                                </page>
                              </notebook>
                        </form>
@@ -94,21 +100,25 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Delivery grids">
-                    <field name="name" select="1"/>
-                    <field name="active" select="1"/>
-                    <field name="carrier_id" select="1"/>
-                    <field name="sequence" select="1"/>
-                    <notebook colspan="4">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="active"/>
+                        <field name="carrier_id"/>
+                        <field name="sequence"/>
+                    </group>
+                    <notebook>
                         <page string="Grid definition">
-                            <field colspan="4" name="line_ids" nolabel="1" select="1"/>
+                            <field name="line_ids"/>
                         </page>
                         <page string="Destination">
-                            <separator colspan="4" string="Countries"/>
-                            <field colspan="4" name="country_ids" nolabel="1"/>
-                            <separator colspan="4" string="States"/>
-                            <field colspan="4" name="state_ids" nolabel="1"/>
-                            <field name="zip_from"/>
-                            <field name="zip_to"/>
+                            <group string="Countries">
+                                <field name="country_ids"/>
+                            </group>
+                            <group string="States">
+                                <field colspan="2" name="state_ids" nolabel="1"/>
+                                <field name="zip_from"/>
+                                <field name="zip_to"/>
+                            </group>
                         </page>
                     </notebook>
                 </form>
@@ -130,18 +140,19 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Grid Lines">
-                    <group colspan="5" col="5">
-                        <field colspan="4" name="name" select="1"/>
-                        <newline/>
-                        <field name="type" string="Condition"/>
-                        <field name="operator" nolabel="1"/>
-                        <field name="max_value" nolabel="1"/>
+                    <field colspan="4" name="name" select="1"/>
+                    <div>
+                        <label string="condition" for="type"/>
+                        <field name="type" class="oe_form_inline"/>
+                        <field name="operator" class="oe_form_inline"/>
+                        <field name="max_value" class="oe_form_inline"/>
+                    </div>
+                    <group col="4">
+                        <field name="list_price"/>
+                        <field name="standard_price"/>
+                        <field name="price_type"/>
+                        <field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}"/>
                     </group>
-                    <newline/>
-                    <field name="list_price"/>
-                    <field name="standard_price"/>
-                    <field name="price_type"/>
-                    <field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}"/>
                 </form>
             </field>
         </record>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index f774dd2f3c9..6a329d53170 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -8,15 +8,14 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Storage Media">
-                <group colspan="4" col="6">
-                    <field name="name" select="1" colspan="4"/>
+                <group col="4">
+                    <field name="name" colspan="4"/>
                     <field name="type"/>
-                    <newline/>
                     <field name="user_id"/>
                     <field name="online"/>
                     <field name="readonly"/>
                 </group>
-                <group colspan="2" attrs="{'invisible':[('type','in',['db', 'db64'])]}">
+                <group attrs="{'invisible':[('type','in',['db', 'db64'])]}">
                     <field name="path"/>
                 </group>
             </form>
@@ -71,16 +70,19 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Directories" col="4">
-                <field name="name" select="1" colspan="4"/>
-                <field name="parent_id"/>
-                <field name="storage_id" widget="selection" />
-                <field name="user_id"/>
-                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                <group col="4">
+                    <field name="name"/>
+                    <field name="parent_id"/>
+                    <field name="storage_id"/>
+                    <field name="user_id"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </group>
                 <notebook colspan="4">
                 <page string="Definition">
-                    <separator string="Directory Type" colspan="4"/>
-                    <field name="type"/>
-                    <group colspan="4" col="4" attrs="{'invisible': [('type','!=','ressource')]}">
+                    <group string="Directory Type" colspan="4"/>
+                        <field name="type"/>
+                    </group>
+                    <group col="4" attrs="{'invisible': [('type','!=','ressource')]}">
                         <field name="ressource_type_id"  on_change="onchange_content_id(ressource_type_id)"
                             attrs="{'required': [('type','=','ressource')] }"/>
                         <newline/>
@@ -89,11 +91,11 @@
                         <newline/>
                         <field name="domain" attrs="{'required': [('type','=','ressource')], 'readonly': [('type','=','static')]}"/>
                     </group>
-                    <group colspan="4" col="4">
+                    <group col="4">
                         <field name="ressource_parent_type_id"/>
                         <field name="ressource_id" select="2" readonly="1"/>
                     </group>
-                    <group colspan="4" col="2" attrs="{'invisible': [('type','!=','ressource'),('ressource_parent_type_id','=',False)]}">
+                    <group col="2" attrs="{'invisible': [('type','!=','ressource'),('ressource_parent_type_id','=',False)]}">
                         <field name="resource_find_all"/>
                     </group>
 
@@ -102,14 +104,16 @@
                     <label colspan="4" string="For each entry here, virtual files will appear in this folder." />
                     <field name="content_ids" nolabel="1" colspan="4" >
                         <form string="Contents">
-                            <field name="name"/>
-                            <field name="sequence"/>
-                            <field name="prefix"/>
-                            <field name="suffix"/>
-                            <field name="extension"/>
-                            <field name="include_name"/>
-                            <separator string="PDF Report" colspan="4"/>
-                            <field name="report_id" domain="[('model_id','=',parent.ressource_type_id)]"/>
+                            <group col="4">
+                                <field name="name"/>
+                                <field name="sequence"/>
+                                <field name="prefix"/>
+                                <field name="suffix"/>
+                                <field name="extension"/>
+                                <field name="include_name"/>
+                                <separator string="PDF Report" colspan="4"/>
+                                <field name="report_id" domain="[('model_id','=',parent.ressource_type_id)]"/>
+                            </group>
                         </form>
                         <tree string="Contents">
                             <field name="sequence" string="Seq."/>
@@ -127,8 +131,10 @@
                             <field name="expr"/>
                         </tree>
                         <form string="Fields">
-                            <field name="field"/>
-                            <field name="expr"/>
+                            <group col="4">
+                                <field name="field"/>
+                                <field name="expr"/>
+                            </group>
                         </form>
                     </field>
                 </page>
@@ -233,53 +239,44 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Documents">
-                <group colspan="4" col="6">
-                    <field name="name" select="1" colspan="4" />
+                <group col="4">
+                    <field name="name"/>
                     <field name="parent_id"/>
-                    <newline/>
                     <field name="user_id"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
                 <notebook colspan="4">
                 <page string="Attachment">
-                    <group col="2" colspan="2">
-                        <separator string="Data" colspan="2"/>
-                        <field name="type"/>
-                        <newline />
-                        <group col="2" colspan="2" attrs="{'invisible':[('type','=','url')]}">
-                            <field name="datas" filename="datas_fname"/>
-                            <field name="datas_fname" select="1"/>
+                    <group>
+                        <group string="Data">
+                            <field name="type"/>
+                            <newline />
+                            <field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
+                            <field name="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
+                            <field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}"/>
                         </group>
-                        <group col="2" colspan="2" attrs="{'invisible':[('type','=','binary')]}">
-                            <field name="url" widget="url"/>
-                        </group>
-                    </group>
-                    <group col="2" colspan="2">
-                    <field name="res_id" invisible="True"/>
-                        <group col="2" colspan="2" attrs="{'invisible': [('res_id','=',0)]}">
-                            <separator string="Attached to" colspan="2"/>
-                            <field name="res_model" readonly="True" invisible="True"/>
-                            <field name="res_name" readonly="1"/>
-                        </group>
-                        <separator string="Related to" colspan="2"/>
+                        <group>
+                            <field name="res_id" invisible="True"/>
+                            <field name="res_model" readonly="True" invisible="True" attrs="{'invisible': [('res_id','=',0)]}"/>
+                            <field name="res_name" readonly="1" attrs="{'invisible': [('res_id','=',0)]}"/>
+                            <separator string="Related to" colspan="2"/>
                             <field name="partner_id"/>
-                    </group>
-                    <group col="2" colspan="2" groups="base.group_no_one">
-                        <separator string="Created" colspan="2"/>
-                        <field name="create_uid" readonly="1"/>
-                        <field name="create_date" readonly="1"/>
-                    </group>
-                    <group col="2" colspan="2" groups="base.group_no_one">
-                        <separator string="Modified" colspan="2"/>
-                        <field name="write_uid" readonly="1"/>
-                        <field name="write_date" readonly="1"/>
+                        </group>
+                        <group groups="base.group_no_one" string="Created">
+                            <field name="create_uid" readonly="1"/>
+                            <field name="create_date" readonly="1"/>
+                        </group>
+                        <group groups="base.group_no_one" string="Modified">
+                            <field name="write_uid" readonly="1"/>
+                            <field name="write_date" readonly="1"/>
+                        </group>
                     </group>
                 </page>
                 <page string="Indexed Content - experimental" groups="base.group_no_one">
-                    <field name="index_content" colspan="4" nolabel="1"/>
+                    <field name="index_content"/>
                 </page>
                 <page string="Notes">
-                    <field colspan="4" name="description" nolabel="1"/>
+                    <field name="description"/>
                 </page>
                 </notebook>
             </form>
diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml
index a17595323a5..d1d633b1052 100644
--- a/addons/document_webdav/webdav_view.xml
+++ b/addons/document_webdav/webdav_view.xml
@@ -8,13 +8,13 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Properties">
-		<field name="namespace"/>
-		<field name="name"/>
-		<newline />
-		<field name="dir_id" />
-		<field name="do_subst" />
-		<newline />
-		<field name="value" colspan="4" />
+                <group col="4">
+                    <field name="namespace"/>
+                    <field name="name"/>
+                    <field name="dir_id" />
+                    <field name="do_subst" />
+                </group>
+                <field name="value" colspan="4" />
             </form>
         </field>
     </record>
@@ -25,9 +25,9 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Properties" toolbar="1">
-		<field name="dir_id" />
-		<field name="namespace"/>
-		<field name="name"/>
+                <field name="dir_id" />
+                <field name="namespace"/>
+                <field name="name"/>
             </tree>
         </field>
     </record>
@@ -77,27 +77,28 @@
         <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="WebDAV properties">
-		    <label string="These properties will be added to WebDAV requests" colspan="4" />
+        <page string="Dynamic context" position="after">
+        <page string="WebDAV properties">
+            <label string="These properties will be added to WebDAV requests" colspan="4" />
 
-		    <field name="dav_prop_ids" nolabel="1" colspan="4">
-			<tree string="Properties">
-			    <field name="namespace"/>
-			    <field name="name"/>
-			</tree>
-			<form string="Properties">
-			    <field name="namespace"/>
-			    <field name="name"/>
-			    <newline />
-			    <field name="do_subst" />
-			    <newline />
-			    <field name="value" colspan="4" />
-			</form>
-		    </field>
-		</page>
-	    </page>
-	</field>
+            <field name="dav_prop_ids" nolabel="1" colspan="4">
+                <tree string="Properties">
+                    <field name="namespace"/>
+                    <field name="name"/>
+                </tree>
+                <form string="Properties">
+                    <group col="4">
+                        <field name="namespace"/>
+                        <field name="name"/>
+                        <newline />
+                        <field name="do_subst" />
+                    </group>
+                    <field name="value"/>
+                </form>
+            </field>
+        </page>
+        </page>
+    </field>
     </record>
 
     <!-- File properties -->
@@ -107,13 +108,14 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Properties">
-		<field name="namespace"/>
-		<field name="name"/>
-		<newline />
-		<field name="file_id" />
-		<field name="do_subst" />
-		<newline />
-		<field name="value" colspan="4" />
+                <group col="4">
+                    <field name="namespace"/>
+                    <field name="name"/>
+                    <newline />
+                    <field name="file_id" />
+                    <field name="do_subst" />
+                </group>
+                <field name="value"/>
             </form>
         </field>
     </record>
@@ -124,9 +126,9 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Properties" toolbar="1">
-		<field name="file_id" />
-		<field name="namespace"/>
-		<field name="name"/>
+        <field name="file_id" />
+        <field name="namespace"/>
+        <field name="name"/>
             </tree>
         </field>
     </record>