subh_pal_org
/
cor
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cor_cr' into 'master' 

End date filter removed in filter/groupby

See merge request prakash.jain/cor-odoo!265
This commit is contained in:
prakash.jain 2022-10-21 15:33:04 +05:30
parent aa41d29a36 0e104978c3
commit ab479520e1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
project_report/report/project_revenue_custom_report3_views.xml
View File

@ -76,7 +76,7 @@
<filter string="Hours are budgeted according to a consultant" name="cons" domain="[('pricing_type','=','employee_rate'),('project_type','=','hours_in_consultant')]"/>
<filter string="Total hours are budgeted without division to consultant" name="limit" domain="[('pricing_type','=','employee_rate'),('project_type','=','hours_no_limit')]"/>
<filter string="Start Date" name="filter_start_date" date="start_date"/>
<filter string="End Date" name="filter_end_date" date="end_date"/>
<!-- <filter string="End Date" name="filter_end_date" date="end_date"/> -->
<filter string="Active" name="active_project" domain="[('project_active','=',True)]"/>
<filter string="Archived" name="active_project" domain="[('project_active','=',False)]"/>
<!-- <filter string="Is Sub Project" name="subproject" domain="[('is_sub_project','=',True)]"/> -->
@ -86,7 +86,7 @@
<filter string="Project" name="group_project" context="{'group_by':'project_id'}"/>
<filter string="Sub Project" name="group_sub_project" context="{'group_by':'sub_project'}"/>
<filter string="Consultant" name="group_employee" context="{'group_by':'employee_id'}"/>
<filter string="End Date" name="group_enddate" domain="[]" context="{'group_by':'end_date:month'}"/>
<!-- <filter string="End Date" name="group_enddate" domain="[]" context="{'group_by':'end_date:month'}"/>-->
<filter string="Role" name="group_role" domain="[]" context="{'group_by':'role'}"/>
<filter string="Tags" name="group_tags" context="{'group_by':'tag_name'}"/>
<filter string="Parent Project" name="group_parent_project" context="{'group_by':'parent_project'}"/>
@ -95,8 +95,8 @@
domain="[('timesheet_sdatetime','&lt;=', time.strftime('%%Y-12-31')),('timesheet_sdatetime','&gt;=',time.strftime('%%Y-01-01'))]"/>
<filter string="Current Year (Start date)" name="currentyear"
domain="[('start_date','&lt;=', time.strftime('%%Y-12-31')),('start_date','&gt;=',time.strftime('%%Y-01-01'))]"/>
<filter string="Current Year (End date)" name="currentyear"
domain="[('end_date','&lt;=', time.strftime('%%Y-12-31')),('end_date','&gt;=',time.strftime('%%Y-01-01'))]"/>
<!--<filter string="Current Year (End date)" name="currentyear"
domain="[('end_date','&lt;=', time.strftime('%%Y-12-31')),('end_date','&gt;=',time.strftime('%%Y-01-01'))]"/>-->
<filter string="Last Year" name="lyear" domain="[('timesheet_sdatetime','&gt;=',(context_today()-relativedelta(years=1)).strftime('%%Y-01-01')),('timesheet_sdatetime','&lt;', time.strftime('%%Y-01-01'))]"/>
</group>
</search>