[MERGE] lp:~openerp-dev/openobject-addons/trunk-search_views-tools-jam

bzr revid: dbr@tinyerp.com-20110923131721-ep5gssib4ttol1np

addons/idea/idea_view.xml

@@ -289,8 +289,9 @@
         <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-camera_test" string="Accepted"
+                    <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="New Ideas"/>
+                    <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"/>

addons/idea/report/report_vote_view.xml

@@ -40,17 +40,10 @@
                              domain="[('date','<=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','>=',(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"

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-camera_test" string="Open" domain="[('state','=','open')]" help="All Open Survey"/>
                         <separator orientation="vertical"/>
                         <field name="title"/>
                         <field name="type" widget="selection"/>