[Merge]

bzr revid: hmo@tinyerp.com-20091030133334-n27o65awdb1os9rj

6 files changed, 26 insertions, 20 deletions

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 7c054364583..4a30c27f5f8 100755
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -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'/>
diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
index f20b4761ab0..39ff98deb3b 100755
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -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>
diff --git a/addons/crm_configuration/crm_jobs_view.xml b/addons/crm_configuration/crm_jobs_view.xml
index b2b57e06c93..db1452c3cef 100755
--- a/addons/crm_configuration/crm_jobs_view.xml
+++ b/addons/crm_configuration/crm_jobs_view.xml
@@ -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"
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index d5da665a399..fa8e73f4aea 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -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"/>
diff --git a/addons/crm_configuration/crm_opportunity_view.xml b/addons/crm_configuration/crm_opportunity_view.xml
index 5a920ad1df2..f42facb6bd7 100644
--- a/addons/crm_configuration/crm_opportunity_view.xml
+++ b/addons/crm_configuration/crm_opportunity_view.xml
@@ -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"/>
diff --git a/addons/crm_configuration/crm_phonecall_view.xml b/addons/crm_configuration/crm_phonecall_view.xml
index 1a70b69ccf7..54e8c6ae724 100644
--- a/addons/crm_configuration/crm_phonecall_view.xml
+++ b/addons/crm_configuration/crm_phonecall_view.xml
@@ -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"/>