From 9511ec1138d031b0a659e5fe2f476f58ae5d1068 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 20 Sep 2011 15:54:22 +0530
Subject: [PATCH 1/3] [IMP] Survey - Added new Filter button for the new Survey
 and rOpen Surbey and Removed Current button

bzr revid: jam@tinyerp.com-20110920102422-tqj1qwbekytsogpg
---
 addons/survey/survey_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 00ac7620be7..d3708d6099d 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -261,7 +261,8 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                    <group>
-                        <filter icon="terp-check" string="Current" domain="[('state','in', ('draft', 'open'))]"/>
+                        <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="All New Survey"/>
+                        <filter icon="terp-gtk-go-back-rtl" string="Open" domain="[('state','=','open')]" help="All Open Survey"/>
                         <separator orientation="vertical"/>
                         <field name="title"/>
                         <field name="type" widget="selection"/>

From 4c86752e1e649c6251b2558bdbd1f1f256230a33 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 20 Sep 2011 15:58:57 +0530
Subject: [PATCH 2/3] [IMP] Idea Rearraned three button New, Open and Accepted

bzr revid: jam@tinyerp.com-20110920102857-f8yg12kbu8yzzter
---
 addons/idea/idea_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 59111a11d04..4b1c7ecab93 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -289,7 +289,8 @@
         <field name="arch" type="xml">
             <search string="Ideas">
                 <group>
-                    <filter icon="terp-check" string="Current" domain="[('state','in', ('draft', 'open'))]" help="Draft and Open Ideas"/>
+                    <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="New Ideas"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="In Progress" domain="[('state','=', 'open')]" help="Open Ideas"/>
                     <filter icon="terp-camera_test" string="Accepted"
                         domain="[('state','=','close')]" help="Accepted Ideas" />
                     <separator orientation="vertical"/>

From 9efb9c7d0d663516bfab21d9ef5b75229fd6dcf5 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 20 Sep 2011 16:05:43 +0530
Subject: [PATCH 3/3] [IMP] Idea Survey Anaysis Search View Rearranged the
 Filteres and Survey Renamed the button icons

bzr revid: jam@tinyerp.com-20110920103543-u52qciy5o84nw5fl
---
 addons/idea/idea_view.xml               |  4 ++--
 addons/idea/report/report_vote_view.xml | 11 ++---------
 addons/survey/survey_view.xml           |  2 +-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 4b1c7ecab93..38817f10e0c 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -290,8 +290,8 @@
             <search string="Ideas">
                 <group>
                     <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="New Ideas"/>
-                    <filter icon="terp-gtk-go-back-rtl" string="In Progress" domain="[('state','=', 'open')]" help="Open Ideas"/>
-                    <filter icon="terp-camera_test" string="Accepted"
+                    <filter icon="terp-camera_test" string="In Progress" domain="[('state','=', 'open')]" help="Open Ideas"/>
+                    <filter icon="terp-check" string="Accepted"
                         domain="[('state','=','close')]" help="Accepted Ideas" />
                     <separator orientation="vertical"/>
                     <field name="name"/>
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index eb5cfe3c28b..8e4a8ae2abb 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -40,17 +40,10 @@
                              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'))]"
                              help="Idea Vote created last month"/>
                          <separator orientation="vertical"/>
-                         <filter icon="terp-go-today"
-                             string="    Today    "
-                             name="today"
-                             domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d'))]"
-                             help="Idea Vote created by today"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-camera_test"
-                            string="Open"
+                            string="In Progress"
                             domain="[('idea_state','=',('open'))]"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-camera_test"
+                        <filter icon="terp-check"
                             string="Accepted"
                             domain="[('idea_state','=',('close'))]"/>
                         <filter icon="terp-gtk-stop"
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index d3708d6099d..2345aaa8542 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -262,7 +262,7 @@
                 <search string="Search Survey">
                    <group>
                         <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="All New Survey"/>
-                        <filter icon="terp-gtk-go-back-rtl" string="Open" domain="[('state','=','open')]" help="All Open Survey"/>
+                        <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="All Open Survey"/>
                         <separator orientation="vertical"/>
                         <field name="title"/>
                         <field name="type" widget="selection"/>