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

[Merge]

Browse Source 
bzr revid: hmo@tinyerp.com-20091030133334-n27o65awdb1os9rj
This commit is contained in:
Harry (Open ERP)
2009-10-30 19:03:34 +05:30
parent 63e75466e1 cba619bb37
commit bd8f4ee41e
6 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/crm_view.xml
+7 -4
View File
@@ -449,11 +449,14 @@
<field name="arch" type="xml">
<search string="Search Case">
<group col='6' colspan='4'>
<filter icon="gtk-execute" string="My Cases" domain="[('user_id','=',uid)]" separator="1" help="Cases Related to Current User"/>
<filter icon="terp-partner" string="My Cases"
domain="[('user_id','=',uid)]" separator="1"
default="1" help="Cases Related to Current User"
/>
<field name="state" select="1">
<filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Cases"/>
<filter icon="terp-crm" domain="[('state','=','open')]" help="Open Cases"/>
<filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Cases"/>
<filter icon="gtk-new" domain="[('state','=','draft')]" help="Draft Cases"/>
<filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Cases"/>
<filter icon="gtk-media-pause" domain="[('state','=','pending')]" help="Pending Cases"/>
</field>
<separator orientation="vertical"/>
<field name="name" select='1'/>
addons/crm_configuration/crm_bugs_view.xml
+4 -3
View File
@@ -169,11 +169,12 @@
<separator orientation="vertical"/>
<filter icon="gtk-home" string=" Today "
separator="1"
domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]"
domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
help="Todays's bugs"
/>
<filter icon="gtk-media-rewind" string=" 7 Days "
separator="1" domain="[]"
<filter icon="gtk-media-rewind"
string=" 7 Days " separator="1"
domain="[('date::date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date::date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
help="Bugs during last 7 days"
/>
</group>
addons/crm_configuration/crm_jobs_view.xml
+5 -4
View File
@@ -168,12 +168,13 @@
<group col="7" colspan="1">
<filter icon="gtk-home" string=" Today "
separator="1"
domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]"
help="Todays's Jobs Requests"
domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
help="Todays's Jobs"
/>
<filter icon="gtk-media-rewind"
string=" 7 Days " separator="1" domain="[]"
help="Jobs Requests during last 7 days"
string=" 7 Days " separator="1"
domain="[('date::date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date::date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
help="Jobs during last 7 days"
/>
<separator orientation="vertical"/>
<filter icon="gtk-new" string="New Jobs"
addons/crm_configuration/crm_lead_view.xml
+3 -3
View File
@@ -182,12 +182,12 @@
<group col="3" colspan="1">
<filter icon="gtk-home" string=" Today "
separator="1"
domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]"
domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
help="Todays's Prospects"
/>
<filter icon="gtk-media-rewind" string=" 7 Days "
separator="1" domain="[]"
help="Prospects during last 7 days"
separator="1" help="Prospects during last 7 days"
domain="[('date::date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date::date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
/>
</group>
<separator orientation="vertical"/>
addons/crm_configuration/crm_opportunity_view.xml
+3 -3
View File
@@ -168,12 +168,12 @@
<group col="3" colspan="1">
<filter icon="gtk-home" string=" Today "
separator="1"
domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]"
domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
help="Todays's Opportunities"
/>
<filter icon="gtk-media-rewind" string=" 7 Days "
separator="1" domain="[]"
help="Opportunities during last 7 days"
separator="1" help="Opportunities during last 7 days"
domain="[('date::date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date::date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
/>
</group>
<separator orientation="vertical"/>
addons/crm_configuration/crm_phonecall_view.xml
+4 -3
View File
@@ -115,12 +115,13 @@
<separator orientation="vertical"/>
<filter icon="gtk-home" string=" Today "
separator="1"
domain="[('create_date::date','=',time.strftime('%%Y-%%m-%%d'))]"
domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
help="Todays's Phonecalls"
/>
<filter icon="gtk-media-rewind" string=" 7 Days "
separator="1" domain="[]"
<filter icon="gtk-media-rewind"
string=" 7 Days " separator="1"
help="Phonecalls during last 7 days"
domain="[('date::date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date::date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
/>
</group>
<separator orientation="vertical"/>