Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-clean-search-hr_evaluation-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_evaluation-tpa/+merge/115944
[IMP] Improved search views of hr_evaluation module.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-search-hr_evaluation-tpa/+merge/115944
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-clean-search.
=== modified file 'hr_evaluation/hr_evaluation_view.xml'
--- hr_evaluation/hr_evaluation_view.xml 2012-07-05 09:29:21 +0000
+++ hr_evaluation/hr_evaluation_view.xml 2012-07-20 10:39:04 +0000
@@ -8,12 +8,8 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Appraisal Plan">
- <group>
- <field name="name" string="Appraisal Plans"/>
- <separator orientation="vertical"/>
- <field name="company_id" widget="selection" groups="base.group_multi_company"/>
- </group>
- <newline/>
+ <field name="name" string="Appraisal Plans"/>
+ <field name="company_id" groups="base.group_multi_company"/>
<group expand="0" string="Group By..." groups="base.group_multi_company">
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
</group>
@@ -234,22 +230,15 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Appraisal">
- <group>
- <field name="date"/>
- <separator orientation="vertical"/>
- <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/>
- <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/>
- <separator orientation="vertical"/>
- <field name="employee_id" />
- <field name="plan_id" widget="selection" />
- </group>
- <newline/>
+ <field name="date"/>
+ <field name="employee_id" />
+ <field name="plan_id"/>
+ <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/>
+ <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/>
<group expand='0' string='Group by...'>
<filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" />
- <separator orientation="vertical"/>
<filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" />
<filter string='Status' icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
- <separator orientation="vertical"/>
<filter string='Date' icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" />
</group>
</search>
@@ -330,20 +319,13 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Appraisal">
- <group>
- <field name="date_deadline"/>
- <separator orientation="vertical"/>
- <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
- <separator orientation="vertical"/>
- <field name="user_to_review_id"/>
- <field name="user_id" string="Interviewer"/>
- </group>
- <newline/>
+ <field name="date_deadline"/>
+ <field name="user_to_review_id"/>
+ <field name="user_id" string="Interviewer"/>
+ <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
<group expand="0" string="Group By...">
<filter string="Interviewer" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
- <separator orientation="vertical"/>
<filter string="Survey" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'survey_id'}"/>
- <separator orientation="vertical"/>
<filter string="Status" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>
=== modified file 'hr_evaluation/report/hr_evaluation_report_view.xml'
--- hr_evaluation/report/hr_evaluation_report_view.xml 2012-07-02 09:13:29 +0000
+++ hr_evaluation/report/hr_evaluation_report_view.xml 2012-07-20 10:39:04 +0000
@@ -45,34 +45,22 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Appraisal Analysis">
- <group>
- <filter string="In Progress" icon="terp-camera_test" domain="[('state', '=' ,'wait')]"
- help = "In progress Evaluations"/>
- <filter string="Final Validation" icon="terp-camera_test" domain="[('state','=','progress')]"
- help = "Final Validation Evaluations"/>
- <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
- <separator orientation="vertical"/>
- <field name="employee_id"/>
- <field name="plan_id" widget="selection"/>
- </group>
- <newline/>
+ <field name="employee_id"/>
+ <field name="plan_id"/>
+ <filter string="In Progress" icon="terp-camera_test" domain="[('state', '=' ,'wait')]" help = "In progress Evaluations"/>
+ <filter string="Final Validation" icon="terp-camera_test" domain="[('state','=','progress')]" help = "Final Validation Evaluations"/>
+ <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
<group expand="0" string="Extended Filters...">
<field name="rating"/>
- <newline/>
<field name="deadline"/>
- <separator orientation="vertical"/>
<field name="state"/>
<field name="create_date"/>
</group>
- <newline/>
<group expand="1" string="Group By...">
<filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
- <separator orientation="vertical"/>
<filter string="Plan" icon="terp-stock_align_left_24" context="{'group_by':'plan_id'}"/>
<filter string="Appreciation" icon="terp-face-plain" context="{'group_by':'rating'}"/>
- <separator orientation="vertical"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
- <separator orientation="vertical"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
<filter string="Month" icon="terp-go-month" context="{'group_by':'create_date'}" help="Creation Date"/>
<filter string="Year" icon="terp-go-month" 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
