Improved search view to remove default values

[odoo/odoo.git] / addons / hr_timesheet_sheet / hr_timesheet_sheet_view.xml

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 5ffa954..d04571f 100644 (file)
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -6,32 +6,13 @@
             <field name="model">hr_timesheet_sheet.sheet</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Timesheets">
+                <tree string="Timesheets"
+                    colors="blue:state == 'draft';grey:state == 'done'">
                     <field name="user_id"/>
-                    <field name="department_id"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
                     <field name="name"/>
-                    <field name="total_attendance" groups="hr_attendance.group_hr_attendance"/>
-                    <field name="total_timesheet"/>
-                    <field name="total_difference" groups="hr_attendance.group_hr_attendance"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
-        <!-- Editable current timesheet used  in dashboard-->
-        <record id="hr_timesheet_sheet_tree" model="ir.ui.view">
-            <field name="name">hr.timesheet.sheet.tree</field>
-            <field name="model">hr_timesheet_sheet.sheet</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Timesheets" editable="top">
-                    <field name="user_id"/>
                     <field name="department_id"/>
-                    <field name="date_from"/>
-                    <field name="date_to"/>
-                    <field name="name"/>
                     <field name="total_attendance" groups="hr_attendance.group_hr_attendance"/>
                     <field name="total_timesheet"/>
                     <field name="total_difference" groups="hr_attendance.group_hr_attendance"/>
@@ -175,9 +156,11 @@
                                     <field name="total_difference" widget="float_time" groups="hr_attendance.group_hr_attendance"/>
                                 </tree>
                             </field>
-                            <field name="total_attendance" widget="float_time"/>
-                            <field name="total_timesheet" widget="float_time"/>
-                            <field name="total_difference" widget="float_time"/>
+                            <group colspan="4" col="6">
+                                <field name="total_attendance" widget="float_time"/>
+                                <field name="total_timesheet" widget="float_time"/>
+                                <field name="total_difference" widget="float_time"/>
+                            </group>
                         </page>
                     </notebook>
                     <field name="state"/>
@@ -197,24 +180,26 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
-                   <group col="10" colspan="4">
-                               <filter icon="terp-partner" string="My Timesheets" domain="[('user_id','=',uid)]" help="My Timesheet"/>
-                                               <separator orientation="vertical"/>
-                                               <filter icon="terp-crm" string="Unvalidated" domain="[('state','&lt;&gt;','done'),('date_to','&lt;',time.strftime('%%Y-%%m-%%d'))]" help="Unvalidated Timesheets"/>
-                               <separator orientation="vertical"/>
-                               <field name="state">
-                           <filter icon="terp-hr" domain="[('state','=','draft')]" help="Draft Timesheets"/>
-                           <filter icon="terp-hr" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
-                                               </field>
-                                               <field name="name" select="1"/>
-                                               <field name="user_id" select="1" widget="selection"/>
-                                               <field name="department_id" widget="selection">
-                                                       <filter icon="terp-crm"
-                                                               domain="[('user_id', 'child_of', [uid])]"
-                                                               help="My Departments Timesheet"/>
-                                               </field>
-                   </group>
-               </search>
+                    <group col="10" colspan="4">
+                        <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My" />
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-crm" string="In Progress" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
+                        <filter icon="terp-crm" string="To Validate" domain="[('state','=','confirmed')]" help="Confirmed Timesheets"/>
+                        <separator orientation="vertical"/>
+                        <field name="user_id" select="1" widget="selection"/>
+                        <field name="date_from"/>
+                        <field name="department_id" widget="selection">
+                            <filter icon="terp-crm"
+                                domain="[('department_id','=',context.get('department_id',False))]"
+                                help="My Departments Timesheet"/>
+                        </field>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="4" col="20">
+                        <filter string="Users" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Department" icon="terp-project" domain="[]" context="{'group_by':'department_id'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
@@ -268,7 +253,7 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
                 <field name="date" position="after">
-                    <field name="sheet_id" select="2"/>
+                    <field name="sheet_id" />
                 </field>
             </field>
         </record>
@@ -276,6 +261,18 @@
             hr.attendance inheritancy
         -->
 
+        <record model="ir.ui.view" id="view_hr_attendance_filter">
+            <field name="name">view_hr_attendance_filter</field>
+            <field name="model">hr.attendance</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="hr_attendance.view_hr_attendance_filter" />
+            <field name="arch" type="xml">
+                <field name="action" position="after">
+                    <field name="sheet_id" select="1" />
+                </field>
+            </field>
+        </record>
+
         <record id="view_attendance_form" model="ir.ui.view">
             <field name="name">hr.attendance.form</field>
             <field name="model">hr.attendance</field>
@@ -293,7 +290,18 @@
             <field name="type">tree</field>
             <field name="inherit_id" ref="hr_attendance.view_attendance_tree"/>
             <field name="arch" type="xml">
-                <field name="action_desc" position="after">
+                <field name="action" position="after">
+                    <field name="sheet_id"/>
+                </field>
+            </field>
+        </record>
+        <record id="view_attendance_tree_who" model="ir.ui.view">
+            <field name="name">hr.attendance.tree</field>
+            <field name="model">hr.attendance</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="hr_attendance.view_attendance_who"/>
+            <field name="arch" type="xml">
+                <field name="action" position="after">
                     <field name="sheet_id"/>
                 </field>
             </field>