pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] project : Added missing filter string and removed all filters related to a date field and added the related date field in the search view.

Browse Source 
bzr revid: mdi@tinyerp.com-20120528071222-0kupd9u5nqxe2rnl
This commit is contained in:
Divyesh Makwana (Open ERP)
2012-05-28 12:42:22 +05:30
parent ce6d03c66a
commit 6a47ac151c
3 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/project_view.xml
+1 -1
View File
@@ -124,7 +124,7 @@
<separator orientation="vertical"/>
<field name="name" string="Project Name"/>
<field name="user_id" string="Project Manager">
<filter domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
<filter string="Projects in which I am a manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
</field>
<field name="partner_id" string="Partner"/>
</group>
addons/project/report/project_cumulative.xml
+4 -10
View File
@@ -58,20 +58,14 @@
<filter name="kanban_blocked" string="Blocked" domain="[('kanban_state','=','blocked')]" icon="terp-gtk-media-pause"/>
<filter name="kanban_ready" string="Ready" domain="[('kanban_state','=','done')]" icon="terp-camera_test"/>
<separator orientation="vertical"/>
<filter string="Month" icon="terp-go-month" name="this_month"
domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
<filter icon="terp-go-month" string="Month-1" name="month1"
domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"/>
<filter icon="terp-go-month" string="Month-2" name="month2"
domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=2)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=2)).strftime('%%Y-%%m-%%d'))]"/>
<separator orientation="vertical"/>
<field name="project_id">
<filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
<filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
</field>
<field name="user_id">
<filter domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal" />
<filter domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="terp-personal-" />
<filter string="My Tasks" domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal" />
<filter string="Unassigned Tasks" domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="terp-personal-" />
</field>
<field name="date"/>
</group>
</search>
</field>
addons/project/report/project_report_view.xml
-14
View File
@@ -62,20 +62,6 @@
<field name="arch" type="xml">
<search string="Tasks Analysis">
<group>
<filter icon="terp-go-year" string="Year"
name="year"
domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;=',time.strftime('%%Y-01-01'))]"
help="Current Year"/>
<separator orientation="vertical"/>
<filter icon="terp-go-month" string="Month"
name="month"
domain="[('date_start','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
help="Current Month"/>
<filter icon="terp-go-week"
string="Month-1"
domain="[('date_start','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
help="Previous Month"/>
<separator orientation="vertical"/>
<filter string="New"
icon="terp-document-new"
domain="[('state','=','draft')]"