Turkesh Patel (openERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-clean-search-hr_recruitment-tpa into 
lp:~openerp-dev/openobject-addons/trunk-clean-search.

Requested reviews:
  Jigar Amin  (OpenERP) (jam-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-search-hr_recruitment-tpa/+merge/115952

[IMP] Improved search views of hr_recruitment module.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-search-hr_recruitment-tpa/+merge/115952
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-clean-search.
=== modified file 'hr_recruitment/hr_recruitment_view.xml'
--- hr_recruitment/hr_recruitment_view.xml	2012-07-14 16:22:03 +0000
+++ hr_recruitment/hr_recruitment_view.xml	2012-07-20 11:09:33 +0000
@@ -216,45 +216,29 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Jobs">
-               <filter icon="terp-mail-message-new"
-                   string="Inbox" help="Unread messages"
-                   name="needaction_pending"
-                   domain="[('needaction_pending','=',True)]"/>
-               <separator orientation="vertical"/>
-               <filter icon="terp-document-new" string="New" name="filter_new"/>
-               <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
-               <separator orientation="vertical"/>
-               <filter icon="terp-document-new" string="New" 
-                   domain="[('state','=','draft')]"
-                   help="All Initial Jobs"/>
-               <filter icon="terp-camera_test" string="In Progress" 
-                   domain="[('state','=','open')]"
-                   help="Open Jobs"/>
-               <filter icon="terp-gtk-media-pause" string="Pending"
-                   domain="[('state','=','pending')]"
-                   help="Pending Jobs"/>
-               <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-"/>
-               <filter icon="terp-gtk-jump-to-ltr" string="Next Actions"
-                    context="{'invisible_next_action':False, 'invisible_next_date':False}"
-                    domain="[('date_action','&lt;&gt;',False)]"
-                    help="Filter and view on next actions and date"/>
-               <separator orientation="vertical"/>
-               <field name="job_id" widget="selection"/>
-               <field name="user_id"/>
-               <newline/>
+                <field name="job_id"/>
+                <field name="user_id"/>
+                <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
+                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                <separator/>
+                <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]" help="All Initial Jobs"/>
+                <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','open')]" help="Open Jobs"/>
+                <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Jobs"/>
+                <separator/>
+                <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-"/>
+                <separator/>
+                <filter icon="terp-gtk-jump-to-ltr" string="Next Actions" context="{'invisible_next_action':False, 'invisible_next_date':False}"
+                    domain="[('date_action','&lt;&gt;',False)]" help="Filter and view on next actions and date"/>
                 <group expand="0" string="Group By...">
                     <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                     <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
                     <filter string="Degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
                     <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'availability'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Appreciation" icon="terp-face-plain" domain="[]" context="{'group_by':'priority'}"/>
                     <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Source" icon="terp-face-plain" domain="[]" context="{'group_by':'source_id'}"/>
-                    <separator orientation="vertical" groups="base.group_no_one"/>
                     <filter string="Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                 </group>
            </search>

=== modified file 'hr_recruitment/report/hr_recruitment_report_view.xml'
--- hr_recruitment/report/hr_recruitment_report_view.xml	2012-06-27 11:56:13 +0000
+++ hr_recruitment/report/hr_recruitment_report_view.xml	2012-07-20 11:09:33 +0000
@@ -49,38 +49,20 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Recruitment Analysis">
-                <group>
-                    <filter string="New"
-                        icon="terp-document-new"
-                        domain="[('state','=','draft')]"
-                        help = "Draft recruitment"/>
-                    <filter string="In progress"
-                        icon="terp-camera_test"
-                        domain="[('state', '=' ,'open')]"
-                        help = "In progress recruitment"/>
-                    <filter string="Pending"
-                        icon="terp-gtk-media-pause"
-                        domain="[('state','=','pending')]"
-                        help = "Pending recruitment"/>
-                    <filter string="Hired"
-                        icon="terp-camera_test"
-                        domain="[('state','=','done')]"
-                        help = "Hired employees"/>
-                    <filter icon="terp-personal"
-                        string="My Recruitment"
-                        help="My Recruitment"
-                        domain="[('user_id','=',uid)]"/>
-                    <separator orientation="vertical"/>
-                    <field name="job_id"/>
-                    <field name="department_id" widget="selection"/>
-                    <field name="user_id" string="Responsible"/>
-                </group>
-                <newline/>
+                <field name="job_id"/>
+                <field name="department_id"/>
+                <field name="user_id" string="Responsible"/>
+                <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft recruitment"/>
+                <filter string="In progress" icon="terp-camera_test" domain="[('state', '=' ,'open')]" help = "In progress recruitment"/>
+                <filter string="Pending" icon="terp-gtk-media-pause" domain="[('state','=','pending')]" help = "Pending recruitment"/>
+                <filter string="Hired" icon="terp-camera_test" domain="[('state','=','done')]" help = "Hired employees"/>
+                <separator/>
+                <filter icon="terp-personal" string="My Recruitment" help="My Recruitment" domain="[('user_id','=',uid)]"/>
                 <group expand="0" string="Extended Filters...">
                     <!--field name="job_id"/-->
                     <field name="priority"/>
-                    <field name="stage_id" widget="selection"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <field name="stage_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="date" string="Creation Date"/>
                     <field name="date_closed"/>
                 </group>
@@ -89,15 +71,11 @@
                    <filter string="Responsible" name='User' icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                    <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                    <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
-                   <separator orientation="vertical"/>
-                    <filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                   <filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
                    <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                   <separator orientation="vertical"/>
                    <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
-                   <separator orientation="vertical"/>
                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                   <separator orientation="vertical"/>
                    <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
                    <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
                    <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>

_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

Reply via email to