Jigar Amin (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-search_views-hr-jam into
lp:~openerp-dev/openobject-addons/trunk-search_views.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-search_views-hr-jam/+merge/76328
Search Improvements - Human Resources :
- Recruitment/Applicants : remove the current
- Recruitment/Job Positions : In Position In recruitment
- Expenses/Expenses : New (rename draft) To Approve To Pay | This Month
- Leaves/Leave Requests : To Confirm To Approve Validated | This Month
- Leaves/ Allocation Requests : To Confirm To Approve Validated | This Month
- Leaves Summary : To Confirm To Approve Validated | This Month
- Evaluations/Evaluations : Pending In Progress | 7 Days | Late
- Reporting/Holidays/Leaves Analysis : To Confirm To Approve Validated | This
Month
Kindly review this,
Thank You
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-search_views-hr-jam/+merge/76328
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-search_views.
=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml 2011-08-28 01:03:41 +0000
+++ hr/hr_view.xml 2011-09-21 05:15:21 +0000
@@ -346,9 +346,10 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Jobs">
- <filter icon="terp-check" domain="[('state','in',('open','recruit'))]" string="Current"
- name="Current" help="Open and in recruitment positions"/>
- <separator orientation="vertical"/>
+ <filter icon="terp-camera_test"
+ domain="[('state','=','open')]"
+ string="In Position"
+ help="In Position"/>
<filter icon="terp-personal+" domain="[('state','=','recruit')]" string="In Recruitment"
help="In Recruitment"/>
<separator orientation="vertical"/>
=== modified file 'hr_evaluation/hr_evaluation_view.xml'
--- hr_evaluation/hr_evaluation_view.xml 2011-09-17 11:03:17 +0000
+++ hr_evaluation/hr_evaluation_view.xml 2011-09-21 05:15:21 +0000
@@ -252,8 +252,8 @@
<field name="arch" type="xml">
<search string="Search Evaluation">
<group>
- <filter icon="terp-check" string="Current" domain="[('state','=','wait')]" help="Evaluations that are in waiting state"/>
- <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Evaluations that are in progress state"/>
+ <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Evaluations that are in Plan In Progress state"/>
+ <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Evaluations that are in waiting appreciation state"/>
<separator orientation="vertical"/>
<filter icon="terp-go-week" string="7 Days" help="Evaluations to close within the next 7 days"
domain="[('date', '>=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" />
=== modified file 'hr_expense/hr_expense_view.xml'
--- hr_expense/hr_expense_view.xml 2011-09-17 11:03:17 +0000
+++ hr_expense/hr_expense_view.xml 2011-09-21 05:15:21 +0000
@@ -136,8 +136,7 @@
<field name="arch" type="xml">
<search string="Expense">
<group>
- <filter icon="terp-document-new" domain="[('state','=','draft')]" string="Draft" help="Draft Expense"/>
- <separator orientation="vertical"/>
+ <filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/>
<filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"
help="Confirmed Expense"/>
<filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay"
=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml 2011-09-17 11:03:17 +0000
+++ hr_holidays/hr_holidays_view.xml 2011-09-21 05:15:21 +0000
@@ -8,10 +8,9 @@
<field name="arch" type="xml">
<search string="Search Leave">
<group>
- <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated"/>
- <separator orientation="vertical"/>
<filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
<filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"/>
+ <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated"/>
<separator orientation="vertical"/>
<filter string="This Month" icon="terp-go-month" name="This Month" domain="[('date_from','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
<separator orientation="vertical"/>
=== modified file 'hr_recruitment/hr_recruitment_view.xml'
--- hr_recruitment/hr_recruitment_view.xml 2011-09-17 15:37:40 +0000
+++ hr_recruitment/hr_recruitment_view.xml 2011-09-21 05:15:21 +0000
@@ -217,12 +217,6 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Jobs">
- <filter icon="terp-check" string="Current"
- domain="[('state','in',('draft','open'))]"
- help="All new and in progress jobs"
- name="current"
- />
- <separator orientation="vertical"/>
<filter icon="terp-document-new" string="New"
domain="[('state','=','draft')]"
help="All Initial Jobs"
_______________________________________________
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
