Jagdish Panchal (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-polish2-improvement_analysis_view_hr-jap
into lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-polish2-improvement_analysis_view_hr-jap/+merge/81959
In HR module Following changes
1) hr_evaluation_report_view.xml
Year|Month Month-1| and also change
Default_search_year:1 in this file.
2) hr_expense_report_view.xml
Year|Month Month-1| and also change
Default_search_year:1 in this file.
3) hr_recruitment_report_view.xml
Year|Month Month-1| and also change
Default_search_year:1 in this file.
4) hr_timesheet_report_view.xml
Year|Month Month-1| and also change
Default_search_year:1 in this file.
5) timesheet_report_view.xml
Year|Month Month-1| and also change
Default_search_year:1 in this file.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-polish2-improvement_analysis_view_hr-jap/+merge/81959
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-polish2-improvement_analysis_view_hr-jap.
=== modified file 'hr_evaluation/report/hr_evaluation_report_view.xml'
--- hr_evaluation/report/hr_evaluation_report_view.xml 2011-09-17 11:03:17 +0000
+++ hr_evaluation/report/hr_evaluation_report_view.xml 2011-11-11 10:56:25 +0000
@@ -48,7 +48,9 @@
<search string="Evaluations Analysis">
<group>
<filter icon="terp-go-year" string=" Year "
+ name="year"
domain="[('create_date','<=', time.strftime('%%Y-%%m-%%d')),('create_date','>=',time.strftime('%%Y-01-01'))]" help="Evaluation done in current year"/>
+ <separator orientation="vertical"/>
<filter icon="terp-go-month" string=" Month " name="month"
domain="[('create_date','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
help="Evaluation done in current month"/>
@@ -95,7 +97,7 @@
<field name="res_model">hr.evaluation.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
- <field name="context">{'search_default_month':1,'search_default_employee':1,'group_by_no_leaf':1,'group_by':[]}</field>
+ <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_employee':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="search_view_id" ref="view_evaluation_report_search"/>
</record>
=== modified file 'hr_expense/report/hr_expense_report_view.xml'
--- hr_expense/report/hr_expense_report_view.xml 2011-09-17 11:03:17 +0000
+++ hr_expense/report/hr_expense_report_view.xml 2011-11-11 10:56:25 +0000
@@ -53,9 +53,10 @@
<field name="arch" type="xml">
<search string="Expenses Analysis">
<group>
- <filter icon="terp-go-year" string=" Year "
+ <filter icon="terp-go-year" string=" Year " name="year"
domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>=',time.strftime('%%Y-01-01'))]"
help="Expenses during current year"/>
+ <separator orientation="vertical"/>
<filter icon="terp-go-month" string=" Month "
name="month"
domain="[('date','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
@@ -113,7 +114,7 @@
<field name="res_model">hr.expense.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
- <field name="context">{'search_default_month':1,'search_default_employee':1,'group_by_no_leaf':1,'group_by':[]}</field>
+ <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_employee':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="search_view_id" ref="view_hr_expense_report_search"/>
</record>
=== modified file 'hr_recruitment/report/hr_recruitment_report_view.xml'
--- hr_recruitment/report/hr_recruitment_report_view.xml 2011-09-17 11:03:17 +0000
+++ hr_recruitment/report/hr_recruitment_report_view.xml 2011-11-11 10:56:25 +0000
@@ -50,9 +50,10 @@
<field name="arch" type="xml">
<search string="Recruitment Analysis">
<group>
- <filter icon="terp-go-year" string="Year"
+ <filter icon="terp-go-year" string="Year" name="year"
domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>=',time.strftime('%%Y-01-01'))]"
help="Recruitment performed in current year"/>
+ <separator orientation="vertical"/>
<filter icon="terp-go-month" string="Month"
name="month"
domain="[('date','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
@@ -126,7 +127,7 @@
<field name="res_model">hr.recruitment.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
- <field name="context">{'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]}</field>
+ <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="search_view_id" ref="view_hr_recruitment_report_search"/>
</record>
<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10" groups="base.group_hr_manager,base.group_hr_user"/>
=== modified file 'hr_timesheet_sheet/report/hr_timesheet_report_view.xml'
--- hr_timesheet_sheet/report/hr_timesheet_report_view.xml 2011-09-17 11:03:17 +0000
+++ hr_timesheet_sheet/report/hr_timesheet_report_view.xml 2011-11-11 10:56:25 +0000
@@ -45,6 +45,7 @@
name="year"
domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>=',time.strftime('%%Y-01-01'))]"
help="Timesheet in current year"/>
+ <separator orientation="vertical"/>
<filter icon="terp-go-month" string=" Month "
name="month"
domain="[('date','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
@@ -90,7 +91,7 @@
<field name="res_model">hr.timesheet.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
- <field name="context">{'search_default_month':1,'search_default_group_user_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
+ <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_group_user_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="help">This report performs analysis on timesheets created by your human resources in the system. It allows you to have a full overview of entries done by your employees. You can group them by specific selection criteria thanks to the search tool.</field>
</record>
<menuitem
=== modified file 'hr_timesheet_sheet/report/timesheet_report_view.xml'
--- hr_timesheet_sheet/report/timesheet_report_view.xml 2011-09-17 11:03:17 +0000
+++ hr_timesheet_sheet/report/timesheet_report_view.xml 2011-11-11 10:56:25 +0000
@@ -50,8 +50,10 @@
<search string="Timesheet">
<group>
<filter icon="terp-go-year" string=" Year "
+ name="year"
domain="[('date_current','<=', time.strftime('%%Y-%%m-%%d')),('date_current','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Timesheet in current year"/>
+ <separator orientation="vertical"/>
<filter icon="terp-go-month" string=" Month "
name="month"
domain="[('date_current','<=', time.strftime('%%Y-%%m-%%d')), ('date_current','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
@@ -117,7 +119,7 @@
<field name="res_model">timesheet.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
- <field name="context">{'search_default_month':1,'search_default_User_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
+ <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_User_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="search_view_id" ref="view_timesheet_report_search"/>
</record>
<menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all"
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
