From 1f40de27506d7d4a82f5c2a63f50bea8a61619f2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 16 Feb 2010 07:48:51 +0100
Subject: [PATCH] [IMP] improved views

bzr revid: fp@tinyerp.com-20100216064851-6rapc0a0kk1yzwql
---
 addons/crm/crm_lead_view.xml          | 90 ++++++++++++---------------
 addons/hr/hr_department_view.xml      | 29 +++------
 addons/hr/hr_view.xml                 |  8 +--
 addons/hr_expense/hr_expense_view.xml | 66 ++++++++++++--------
 4 files changed, 93 insertions(+), 100 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 0a70799be46..5869751deb5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -4,18 +4,18 @@
 
 
 
-		# ------------------------------------------------------
-	    # Stage
-	    # ------------------------------------------------------
-	    <record id="crm_lead_stage_act" model="ir.actions.act_window">
-	        <field name="name">Lead Stages</field>
-	        <field name="res_model">crm.case.stage</field>
-	        <field name="view_type">form</field>
-		    <field name="view_id" ref="crm.crm_case_stage_tree"/>
-			<field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
-			<field name="context">{'object_id':'crm.lead'}</field>
-	    </record>
-	  <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" parent="crm.menu_crm_case_stage"/>
+        # ------------------------------------------------------
+        # Stage
+        # ------------------------------------------------------
+        <record id="crm_lead_stage_act" model="ir.actions.act_window">
+            <field name="name">Lead Stages</field>
+            <field name="res_model">crm.case.stage</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm.crm_case_stage_tree"/>
+            <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
+            <field name="context">{'object_id':'crm.lead'}</field>
+        </record>
+      <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" parent="crm.menu_crm_case_stage"/>
     # ------------------------------------------------------
     # Leads
     # ------------------------------------------------------
@@ -26,47 +26,40 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Leads Form">
-                
-                    <group colspan="4" col="4">
+                    <group colspan="4" col="6">
                         <field name="partner_name" string="Lead Name" required="1"/>
                         <field name="name" string="Lead Subject"/>
-                        <field name="partner_name2" string="Contact Name"/>                    
-                        <field name="email_from" string="Email"/>  
-                        <newline/>                  
-                        <group colspan="4" col="5">
-                            <label string="" colspan="2"/>
-                            <button string="Create Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"/>                    
-                            <button string="Convert to Partner"
-                                        icon="terp-partner" name="%(wizard_crm_lead_partner_create)d"
-                                        type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
-                                    />
-                        </group>
+                        <button string="Create Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"/>
+                        <field name="partner_name2" string="Contact Name"/>
+                        <field name="email_from" string="Email"/>
+                        <button string="Convert to Partner"
+                                    icon="terp-partner" name="%(wizard_crm_lead_partner_create)d"
+                                    type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
+                                />
                     </group>
-                    
-                    <group colspan="4" col="4">
-                    <notebook>
+                    <notebook colspan="4">
                     <page string="Leads">
                         <separator colspan="4" string="Communication"/>
                         <field name="partner_id" string="Partner"
-                        	on_change="onchange_partner_id(partner_id)" />
+                            on_change="onchange_partner_id(partner_id)" />
                         <field name="partner_address_id"
-                        	string="Contact"
-                        	on_change="onchange_partner_address_id(partner_address_id, email_from)" />
+                            string="Contact"
+                            on_change="onchange_partner_address_id(partner_address_id, email_from)" />
                         <field name="partner_phone"/>
                         <field name="partner_mobile"/>
-                        <separator colspan="4" string="Status and Categarization"/>
+                        <separator colspan="4" string="Status and Categorization"/>
                         <group colspan="4" col="6">
-                            <field name="user_id" select="2"/>                                                        
-                            <field name="stage_id" select="1" string="Status" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>                                
+                            <field name="user_id" select="2"/>
+                            <field name="stage_id" select="1" string="Status" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
                             <field name="categ_id" select="1"
-                            	on_change="onchange_categ_id(categ_id)"
-                            	string="Lead Source" widget="selection"
-                            	domain="[('object_id.model', '=', 'crm.opportunity')]" />
+                                on_change="onchange_categ_id(categ_id)"
+                                string="Lead Source" widget="selection"
+                                domain="[('object_id.model', '=', 'crm.opportunity')]" />
                             <field name="type_id" string="Campaign" select="1"/>
                             <field name="section_id" colspan="1" widget="selection"/>
                             <field name="priority" string="Priority"/>
                             <field name="date" string="Create Date"/>
-	                    </group>
+                        </group>
                         <separator colspan="4" string="Details"/>
                         <field name="description" nolabel="1" colspan="4"/>
                         <separator colspan="4"/>
@@ -106,12 +99,11 @@
                             </tree>
                         </field>
                         <button colspan="4" string="Send New Email"
-                        	name="%(crm.wizard_crm_new_send_mail)d"
-                        	context="{'mail':'new'}" icon="gtk-go-forward"
-                        	type="action" />
+                            name="%(crm.wizard_crm_new_send_mail)d"
+                            context="{'mail':'new'}" icon="gtk-go-forward"
+                            type="action" />
                      </page>
                     </notebook>
-                    </group>
             </form>
         </field>
     </record>
@@ -120,7 +112,7 @@
         <field name="model">crm.lead</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Leads Tree"  colors="red:state=='open';black:state in ('draft', 'pending');grey: state in ('cancel','done')">                
+            <tree string="Leads Tree"  colors="red:state=='open';black:state in ('draft', 'pending');grey: state in ('cancel','done')">
                 <field name="partner_name" string="Lead Name"/>
                 <field name="stage_id" string="Status"/>
                 <field name="date" string="Create Date"/>
@@ -181,22 +173,22 @@
                            <filter icon="gtk-new" domain="[('state','in',('draft', 'open'))]" help="Current Leads" default="1"/>
                            <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Leads"/>
                        </field>
-					    <field name="section_id" select="1" default="context.get('section_id', False)" widget="selection" string="Section">
-     						<filter icon="terp-crm"
+                        <field name="section_id" select="1" default="context.get('section_id', False)" widget="selection" string="Section">
+                             <filter icon="terp-crm"
                                    domain="[('section_id','=',context.get('section_id',False))]"
                                    help="My section"
                                />
-					    </field>
+                        </field>
                    </group>
                 </group>
                 <newline/>
                <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="By Status" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>                        
+                        <filter string="By Status" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="By Lead Source" icon="terp-crm" domain="[]"  context="{'group_by':'categ_id'}"/>
                         <filter string="By Responsible" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="By Create Date" icon="terp-crm" domain="[]" context="{'group_by':'date'}"/>
-                        
-                </group> 
+
+                </group>
            </search>
         </field>
     </record>
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index a8e05a92fab..80d13dec797 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -13,10 +13,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="department">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
-                    <field name="parent_id" select="2"/>
-                    <field colspan="4" name="manager_id" select="1"/>
+                    <group col="6" colspan="4">
+                        <field colspan="4" name="name" select="1"/>
+                        <field name="parent_id" select="2"/>
+                        <field colspan="4" name="manager_id" select="1"/>
+                        <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                    </group>
                     <notebook colspan="4" >
                         <page string="Members">
                             <field colspan="4" name="member_ids" nolabel="1"/>
@@ -55,25 +57,8 @@
             <field name="view_type">form</field>
         </record>
 
-        <menuitem action="open_module_tree_department" id="menu_department_def" parent="hr.menu_department_tree"/>
+       <menuitem action="open_module_tree_department" id="menu_department_def" parent="hr.menu_department_tree"/>
        <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="menu_hr_human_resources"/>
-        <!-- res.users inherit -->
-        <record model="ir.ui.view" id="view_users_form_inherit">
-            <field name="name">res.users.form</field>
-            <field name="type">form</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form"/>
-            <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Departements Informations">
-                        <separator string="Managers" colspan="4"/>
-                        <field name="parent_id" nolabel="1" colspan="4"/>
-                        <separator string="Subordinates" colspan="4"/>
-                        <field name="child_ids" nolabel="1" colspan="4"/>
-                    </page>
-                </notebook>
-            </field>
-        </record>
 
     </data>
 </openerp>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 66d9ee88dce..0e348e9c754 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -30,11 +30,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee">
-                    <group colspan="4" col="4">
+                    <group colspan="4" col="6">
                         <field name="name" select="1"/>
-                        <field name="active" select="1"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="user_id"/>
+                        <field name="active"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Personal Information">
@@ -119,7 +119,7 @@
             parent="menu_open_view_employee_list"/>-->
 
        <record id="open_view_employee_list_my" model="ir.actions.act_window">
-            <field name="name">All Employees</field>
+            <field name="name">Employees</field>
             <field name="res_model">hr.employee</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 3743b557a08..5427aa23063 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -118,46 +118,62 @@
             <field name="model">hr.expense.expense</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Expense">
-                       <group col='6' colspan='4'>
-                           <filter icon="gtk-execute" string="My Expense" domain="[('user_id','=',uid)]" separator="1" help="Expenses Related to Current User"/>
-                          <field name="state" select="1">
-                              <filter icon="terp-hr" domain="[('state','=','confirm')]" help="Confirmed Expense"/>
-                              <filter icon="terp-hr" domain="[('state','=','accepted')]" help="Accepted Expense"/>
-                              <filter icon="terp-hr" domain="[('state','=','invoiced')]" help="Invoiced Expense"/>
-                          </field>
-                          <separator orientation="vertical"/>
-                          <field name="name" select='1'/>
-                          <field name="user_id" select="1" widget="selection"/>
-                      </group>
+                <search string="Expense">
+                <group col="20" colspan="4">
+                      <filter
+                        icon="terp-hr"
+                        domain="[('state','=','draft')]"
+                        string="Draft"
+                        help="Draft Expense"/>
+                      <filter
+                        icon="terp-hr"
+                        domain="[('state','=','confirm')]"
+                        string="To Validate"
+                        help="Confirmed Expense"/>
+                      <filter
+                        icon="terp-hr"
+                        domain="[('state','=','accepted')]"
+                        string="To Pay"
+                        help="Expenses to Invoice"/>
+                      <separator orientation="vertical"/>
+                      <field name="name" select='1'/>
+                      <field name="user_id" select="1" widget="selection">
+                          <filter
+                            icon="gtk-execute"
+                            help="My Expenses"
+                            default="1"
+                            domain="[('user_id','=',uid)]"/>
+                      </field>
+                      <field name="state" select="1"/>
+                 </group>
                  </search>
             </field>
         </record>
 
         <record id="expense_all" model="ir.actions.act_window">
-            <field name="name">All expenses</field>
+            <field name="name">Expenses</field>
             <field name="res_model">hr.expense.expense</field>
             <field name="view_type">form</field>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
 
         <menuitem id="next_id_49" name="Expenses" sequence="6"
-        	parent="hr.menu_hr_root"/>
+           parent="hr.menu_hr_root"/>
 
         <menuitem action="expense_all" id="menu_expense_all" name="Expenses"
-        	parent="next_id_49" groups="hr.group_hr_manager"/>
+           parent="next_id_49" groups="hr.group_hr_manager"/>
 
         <record id="view_product_hr_expense_form" model="ir.ui.view">
-			<field name="name">product.product.expense.form</field>
-			<field name="model">product.product</field>
-			<field name="inherit_id" ref="product.product_normal_form_view"/>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<field groups="base.group_extended" name="rental" position="after">
-					<field name="hr_expense_ok"/>
-				</field>
-			</field>
-		</record>
+         <field name="name">product.product.expense.form</field>
+         <field name="model">product.product</field>
+         <field name="inherit_id" ref="product.product_normal_form_view"/>
+         <field name="type">form</field>
+         <field name="arch" type="xml">
+            <field groups="base.group_extended" name="rental" position="after">
+               <field name="hr_expense_ok"/>
+            </field>
+         </field>
+      </record>
 
     </data>
 </openerp>