From 3d9e53939fcb81c521d12fb9044e81c50a5f4af6 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 7 Jun 2010 14:34:11 +0530
Subject: [PATCH] [IMP] account_* , document : In view icons are improved

bzr revid: vir@tinyerp.com-20100607090411-w238imu82cz79hza
---
 addons/account/account_invoice_view.xml       | 22 ++++-----
 addons/account/account_view.xml               |  8 ++--
 addons/account/project/project_view.xml       |  8 ++--
 .../report/account_account_report_view.xml    | 16 +++----
 .../account_analytic_entries_report_view.xml  | 30 ++++++------
 .../report/account_analytic_report_view.xml   | 38 +++++++--------
 .../report/account_entries_report_view.xml    | 40 ++++++++--------
 .../report/account_invoice_report_view.xml    | 48 +++++++++----------
 addons/account/report/account_report_view.xml |  8 ++--
 .../crossovered_budget_view.xml               |  4 +-
 addons/account_voucher/voucher_view.xml       | 30 ++++++------
 addons/document/document_view.xml             | 10 ++--
 .../document/report/document_report_view.xml  |  4 +-
 .../mrp/report/mrp_production_order_view.xml  |  2 +-
 14 files changed, 134 insertions(+), 134 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 4c4a3f3a9ef..aa4ccfc74ff 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -346,9 +346,9 @@
             <field name="arch" type="xml">
                 <search string="Search Invoice">
                    <group col="10" colspan="4">
-                        <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
-                        <filter icon="terp-account" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
-                        <filter icon="terp-account" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
+                        <filter icon="terp-check" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
+                        <filter icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                         <separator orientation="vertical"/>
                         <field name="number"/>
                         <field name="partner_id"/>
@@ -357,16 +357,16 @@
                         <field name="amount_total"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By...">
-                        <filter string="Journal" icon="terp-account" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Period" icon="terp-account" domain="[]" context="{'group_by':'period_id'}"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Partner" icon="terp-account" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Salesman" icon="terp-account" domain="[]"  context="{'group_by':'user_id'}"/>
-                        <filter string="State" icon="terp-account" domain="[]"  context="{'group_by':'state'}"/>
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Salesman" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Invoice Date" icon="terp-account" domain="[]"  context="{'group_by':'date_invoice'}"/>
-                        <filter string="Due Date" icon="terp-account" domain="[]"  context="{'group_by':'date_due'}"/>
+                        <filter string="Invoice Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date_invoice'}"/>
+                        <filter string="Due Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date_due'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 5e8edd306e3..ca777ea61ae 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -836,8 +836,8 @@
             <field name="arch" type="xml">
                 <search string="Search Entry Lines">
                     <group col='10' colspan='4'>
-                        <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Entry Lines"/>
-                        <filter icon="terp-account" string="Posted" domain="[('state','=','valid')]" help="Posted Entry Lines"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Entry Lines"/>
+                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','valid')]" help="Posted Entry Lines"/>
                         <separator orientation="vertical"/>
                         <field name="date" select='1'/>
                         <field name="account_id" select='1'/>
@@ -979,8 +979,8 @@
             <field name="arch" type="xml">
                 <search string="Search Move">
                     <group col='8' colspan='4'>
-                        <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
-                        <filter icon="terp-account" string="Posted" domain="[('state','=','posted')]" help="Posted Move Lines"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
+                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Move Lines"/>
                         <separator orientation="vertical"/>
                         <field name="date" select='1'/>
                         <field name="name" select='1'/>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index b4a7b67a05a..363eeec138b 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -25,8 +25,8 @@
             <field name="arch" type="xml">
             	<search string="Analytic Account">
             		<group col="8" colspan="4">
-	            		<filter icon="gtk-execute" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
-	            		<filter icon="gtk-execute" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
+	            		<filter icon="terp-check" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
+	            		<filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
 						<separator orientation="vertical"/>
 						<field name="name" select="1"/>
 						<field name="code" select="1"/>
@@ -396,8 +396,8 @@
             <field name="arch" type="xml">
                 <search string="Analytic Entries Stats">
                 	<group col="8" colspan="4">
-	                	<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>
-		               	<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>
+	                	<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>
+		               	<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>
 		               	<separator orientation="vertical"/>
 	                    <field name="name" select="1"/>
 	               		<field name="month" select="1"/>
diff --git a/addons/account/report/account_account_report_view.xml b/addons/account/report/account_account_report_view.xml
index 137fa0c69ae..f233d0e905b 100644
--- a/addons/account/report/account_account_report_view.xml
+++ b/addons/account/report/account_account_report_view.xml
@@ -56,15 +56,15 @@
             	<field name="code"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="Account" name="Account" icon="terp-account" context="{'group_by':'name'}"/>
-                    <filter string="Code"  icon="terp-account" context="{'group_by':'code'}"/>
-                    <filter string="Company"  icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                <group expand="0" string="Group By...">
+                    <filter string="Account" name="Account" icon="terp-folder-orange" context="{'group_by':'name'}"/>
+                    <filter string="Code"  icon="terp-stock_format-scientific" context="{'group_by':'code'}"/>
+                    <filter string="Company"  icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
-                    <filter string="Currencies Rate" icon="terp-account" context="{'group_by':'currency_mode'}"/>
-                    <filter string="Internal Type" icon="terp-account" context="{'group_by':'type'}"/>
-                    <filter string="Account Type" icon="terp-account" context="{'group_by':'user_type'}"/>
-                    <filter string="Parent Account" icon="terp-account" context="{'group_by':'parent_account_id'}"/>
+                    <filter string="Currencies Rate" icon="terp-dolar" context="{'group_by':'currency_mode'}"/>
+                    <filter string="Internal Type" icon="terp-go-home" context="{'group_by':'type'}"/>
+                    <filter string="Account Type" icon="terp-stock_symbol-selection" context="{'group_by':'user_type'}"/>
+                    <filter string="Parent Account" icon="terp-folder-orange" context="{'group_by':'parent_account_id'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 82a063256c1..8344abf4628 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -35,14 +35,14 @@
         <field name="arch" type="xml">
             <search string="Analytic Entries Analysis">
               <group col="10" colspan="12">
-	            	<filter icon="gtk-media-rewind" string="  365 Days  "
+	            	<filter icon="terp-go-year" string="  365 Days  "
 		                    domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 		                    help="Analytic Entries of last 365 days"/>
-	                <filter icon="gtk-media-rewind" string="   30 Days   "
+	                <filter icon="terp-go-month" string="   30 Days   "
 	                		name="month"
 	                		domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                		help="Analytic Entries of last 30 days"/>
-	                <filter icon="gtk-media-rewind"
+	                <filter icon="terp-go-week"
 	                        string="    7 Days    "
 	                        separator="1"
 	                        domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
@@ -54,21 +54,21 @@
 	                </field>
 	            </group>
                 <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="User" name="User" icon="terp-account" context="{'group_by':'user_id'}"/>
-                    <filter string="Currency" icon="terp-account" context="{'group_by':'currency_id'}"/>
-                    <filter string="Company"  icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                <group expand="0" string="Group By...">
+                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Currency" icon="terp-dolar" context="{'group_by':'currency_id'}"/>
+                    <filter string="Company"  icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
-                    <filter string="Account"  icon="terp-account" context="{'group_by':'account_id'}"/>
-                    <filter string="General Account" icon="terp-account" context="{'group_by':'general_account_id'}"/>
-                    <filter string="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
+                    <filter string="Account"  icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
+                    <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
+                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
-                    <filter string="Product UOM" icon="terp-account" context="{'group_by':'product_uom_id'}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <filter string="Product UOM" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
+                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">
diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index f853b809867..290e6950569 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -36,26 +36,26 @@
         <field name="arch" type="xml">
             <search string="Analytic Accounts Analysis">
             	<group>
-	                <filter icon="gtk-media-rewind" string="  365 Days  "
+	                <filter icon="terp-go-year" string="  365 Days  "
                             domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
                             help="Analytic Accounts of last 365 days"/>
-                    <filter icon="gtk-media-rewind" string="   30 Days   "
+                    <filter icon="terp-go-month" string="   30 Days   "
                             name="This Month"
                             domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
                             help="Analytic Accounts of last 30 days"/>
-                    <filter icon="gtk-media-rewind"
+                    <filter icon="terp-go-week"
                             string="    7 Days    "
                             separator="1"
                             domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                             help="Analytic Accounts during last 7 days"/>
 	                <separator orientation="vertical"/>
-	                <filter icon="terp-account"
+	                <filter icon="terp-document-new"
                     		string="Draft"
                     		domain="[('state','=','draft')]"/>
-                    <filter icon="terp-account"
+                    <filter icon="terp-camera_test"
                     		string="Open"
                     		domain="[('state','=','open')]"/>
-                    <filter icon="terp-account"
+                    <filter icon="terp-gtk-media-pause"
                     		string="Pending"
                     		domain="[('state','=','pending')]"/>
                     <separator orientation="vertical"/>
@@ -63,28 +63,28 @@
 	                <field name="product_id" />
 	                <field name="partner_id"/>
 	                <field name="user_id" widget="selection">
-	                    <filter icon="terp-account"
+	                    <filter icon="terp-folder-orange"
 	                        	string="My Accounts"
 	                        	help="My Account"
 	                        	domain="[('user_id','=',uid)]"/>
 	                </field>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                	<filter string="User" name="User" icon="terp-account" context="{'group_by':'user_id'}"/>
-                    <filter string="Associated Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
+                <group expand="0" string="Group By..." colspan="10" col="12">
+                	<filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Associated Partner" icon="terp-personal+" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
-					<filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <filter string="Analytic Account" icon="terp-account" context="{'group_by':'parent_id'}"/>
-                    <filter string="Analytic Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
+					<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'parent_id'}"/>
+                    <filter string="Analytic Journal" icon="terp-folder-green" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
-                    <filter string="Account Type" icon="terp-account" context="{'group_by':'type'}"/>
-                    <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <filter string="Account Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
+                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 5d1b99b578e..0c3a77db2a7 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -50,25 +50,25 @@
         <field name="arch" type="xml">
             <search string="Entries Analysis">
             	<group colspan="10" col="12">
-	            	<filter icon="gtk-media-rewind" string="  365 Days  "
+	            	<filter icon="terp-go-year" string="  365 Days  "
 	            			domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 		                    help="Entries of last 365 days"/>
-	                <filter icon="gtk-media-rewind" string="   30 Days   "
+	                <filter icon="terp-go-month" string="   30 Days   "
 	                		name="This Month"
 	                		domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                		help="Entries of last 30 days"/>
-	                <filter icon="gtk-media-rewind"
+	                <filter icon="terp-go-week"
 	                        string="    7 Days    "
 	                        separator="1"
 	                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
 	                        help="Entries during last 7 days"/>
 	                <separator orientation="vertical"/>
                     <filter string="Draft"
-                    		icon="terp-account"
+                    		icon="terp-document-new"
                     		domain="[('state','=','draft')]"
                     		help = "Draft entries"/>
                     <filter string="Posted"
-                            icon="terp-account"
+                            icon="terp-camera_test"
                             domain="[('state','=','posted')]"
                             help = "Posted entries"/>
                     <separator orientation="vertical"/>
@@ -78,24 +78,24 @@
                     <field name="analytic_account_id"/>
 					</group>
                 <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
-                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
-                    <filter string="Journal" name="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
+                <group expand="0" string="Group By...">
+                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <filter string="Journal" name="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
-                    <filter string="Type" icon="terp-account" context="{'group_by':'type'}"/>
-                    <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <filter string="Account" name="Account" icon="terp-account" context="{'group_by':'account_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
+                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Account" name="Account" icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Analytic Account" name="Analytic Account" icon="terp-account" context="{'group_by':'analytic_account_id'}"/>
-                    <filter string="State of Move Line" icon="terp-account" context="{'group_by':'state_2'}"/>
-                    <filter string="Period" icon="terp-account" context="{'group_by':'period_id'}"/>
-                    <filter string="Period of Move Line" icon="terp-account" context="{'group_by':'period_id2'}"/>
+                    <filter string="Analytic Account" name="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}"/>
+                    <filter string="State of Move Line" icon="terp-stock_effects-object-colorize" context="{'group_by':'state_2'}"/>
+                    <filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}"/>
+                    <filter string="Period of Move Line" icon="terp-go-month" context="{'group_by':'period_id2'}"/>
                     <newline/>
-                    <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
+                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                  </group>
                  <newline/>
                  <group expand="0" string="Extended options..." groups="base.group_extended">
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 965d5078ae9..416b340b89c 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -56,39 +56,39 @@
         <field name="arch" type="xml">
             <search string="Invoices Analysis">
               <group col="10" colspan="12">
-	            	<filter icon="gtk-media-rewind" string="  365 Days  "
+	            	<filter icon="terp-go-year" string="  365 Days  "
 		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 		                    help="Invoices of last 365 days"/>
-	                <filter icon="gtk-media-rewind" string="   30 Days   "
+	                <filter icon="terp-go-month" string="   30 Days   "
 	                		name="month"
 	                		domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                		help="Invoices of last 30 days"/>
-	                <filter icon="gtk-media-rewind"
+	                <filter icon="terp-go-week"
 	                        string="    7 Days    "
 	                        separator="1"
 	                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
 	                        help="Invoices during last 7 days"/>
 	                <separator orientation="vertical"/>
                     <filter string="Draft"
-                    		icon="terp-account"
+                    		icon="terp-document-new"
                     		domain="[('state','=','draft')]"
                     		help = "Draft Invoices"/>
                    	<filter string="Pro-forma"
-                   			icon="terp-account"
+                   			icon="terp-check"
                    			domain="[('state','=','proforma'),('state','=','proforma2')]"
                    			help = "Pro-forma Invoices"/>
                    	<filter string="Current"
-	                		icon="terp-account"
+	                		icon="terp-check"
 	                		domain="[('state', '=' ,'open')]"
 	                		help = "open Invoices"/>
 	                <filter string="Done"
-                            icon="terp-account"
+                            icon="terp-dialog-close"
                             domain="[('state','=','paid')]"
                             help = "Done Invoices"/>
   					<separator orientation="vertical"/>
   					<field name="partner_id"/>
                     <field name="user_id" widget="selection">
-                    <filter icon="terp-account"
+                    <filter icon="terp-dolar"
                     		string="My Invoices"
                     		help="My Invoices"
                     		domain="[('user_id','=',uid)]"/>
@@ -96,26 +96,26 @@
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
 				</group>
 				<newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="Salesman" name='User' icon="terp-account" context="{'group_by':'user_id'}"/>
-                    <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
-                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id','set_visible':True}"/>
+                <group expand="0" string="Group By...">
+                    <filter string="Salesman" name='User' icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
-                    <filter string="Type" icon="terp-account" context="{'group_by':'type'}"/>
+                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Default UoM" icon="terp-account" context="{'group_by':'uom_name'}"/>
-                    <filter string="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
-                    <filter string="Account" icon="terp-account" context="{'group_by':'account_id'}"/>
+                    <filter string="Default UoM" icon="terp-mrp" context="{'group_by':'uom_name'}"/>
+                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+                    <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Category of Product" icon="terp-account" context="{'group_by':'categ_id'}"/>
-                    <filter string="Currency" icon="terp-account" context="{'group_by':'currency_id'}"/>
-                    <filter string="Force Period" icon="terp-account" context="{'group_by':'period_id'}"/>
+                    <filter string="Category of Product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
+                    <filter string="Currency" icon="terp-dolar" context="{'group_by':'currency_id'}"/>
+                    <filter string="Force Period" icon="terp-go-month" context="{'group_by':'period_id'}"/>
                     <newline/>
-                    <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
+                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">
diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml
index 9b1688730aa..190ff856c8a 100644
--- a/addons/account/report/account_report_view.xml
+++ b/addons/account/report/account_report_view.xml
@@ -153,8 +153,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-					<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="This year's Sales by type"/>
-					<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This months' Sales by type"/>
+					<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="This year's Sales by type"/>
+					<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This months' Sales by type"/>
 					<separator orientation="vertical"/>
 					<field name="name" select="1"/>
 					<field name="month" select="1"/>
@@ -221,8 +221,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-					<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
-					<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by type"/>
+					<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
+					<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by type"/>
 					<separator orientation="vertical"/>
 					<field name="name" select="1"/>
 					<field name="month" select="1"/>
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index b48ccc55daa..e7a0faf069d 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -185,8 +185,8 @@
            <field name="arch" type="xml">
                <search string="Budget">
                    <group col="20" colspan="4">
-                       <filter string="Draft" domain="[('state','=','draft')]" help="Draft Budgets"  default="1"/>
-                       <filter string="To Validate" domain="[('state','=','validate')]" help="To Validate Budgets" />
+                       <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"  default="1"/>
+                       <filter string="To Validate" icon="terp-gtk-go-back-rtl" domain="[('state','=','validate')]" help="To Validate Budgets" />
                        <separator orientation="vertical"/>
                        <field name="name" select="1"/>
                        <field name="code" select="1" />
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 6eb6988480d..0049c5ff5de 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -71,7 +71,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="view_account_move_filter" model="ir.ui.view">
             <field name="name">account.voucher.select</field>
             <field name="model">account.voucher</field>
@@ -79,10 +79,10 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group col='8' colspan='4'>
-                        <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
-                        <filter icon="terp-account" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Vouchers"/>
-                        <filter icon="terp-account" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                        <filter icon="terp-account" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
+                        <filter icon="terp-check" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Vouchers"/>
+                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
+                        <filter icon="terp-gtk-stop" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers"/>
                         <separator orientation="vertical"/>
                         <field name="date" select='1'/>
                         <field name="name" select='1'/>
@@ -92,14 +92,14 @@
                         <field name="period_id" select='1'/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="12" col="10">
-                        <filter string="Journal" icon="terp-account" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Period" icon="terp-account" domain="[]" context="{'group_by':'period_id'}"/>
-                        <filter string="Type" icon="terp-account" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
-                        <filter string="States" icon="terp-account" domain="[]" context="{'group_by':'state'}"/>
+                    <group expand="0" string="Group By..." colspan="12" col="10">
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
+                        <filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Extended options...">
+                    <group expand="0" string="Extended options...">
                        <field name="journal_id" widget="selection" context="{'journal_id': self}" />
                        <field name="period_id" widget="selection" context="{'period_id': self}" groups="base.group_extended"/>
                        <field name="type" context="{'type': self}" />
@@ -107,7 +107,7 @@
                 </search>
             </field>
         </record>
-        
+
         <!--  Receipt Vouchers -->
         <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">
             <field name="name">Voucher Entries</field>
@@ -245,7 +245,7 @@
 <!--        </record>-->
 <!--        <menuitem id="menu_action_view_jour_voucher_form"-->
 <!--            action="action_view_jour_voucher_form" parent="menu_action_other_voucher_list"/>-->
-        
+
         <record model="ir.ui.view" id="view_account_journal_form_inherit">
             <field name="name">account.journal.form.inherit</field>
             <field name="model">account.journal</field>
@@ -257,7 +257,7 @@
                 </field>
             </field>
         </record>
-        
+
         <act_window
             domain="[('journal_id', '=', active_id)]"
             id="act_journal_voucher_open"
@@ -265,6 +265,6 @@
             context="{'journal_id': active_id, 'type':type}"
             res_model="account.voucher"
             src_model="account.journal"/>
-        
+
         </data>
 </openerp>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index fd424ad7d52..0bab191d942 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -234,22 +234,22 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
              <search string="IR Attachment">
-             <filter icon="gtk-media-rewind" string="Recent"
+             <filter icon="terp-go-month" string="Recent"
                     help="less 1 month modified/created attachments"
                     domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
                 />
                     <separator orientation="vertical"/>
                   <field name="user_id" widget="selection">
-                    <filter icon="terp-partner"
+                    <filter icon="terp-personal"
                         domain="[('user_id','=', False)]"
                         help="Filter on my Attachment" />
                     </field>
                     <field name="partner_id" widget="selection"/>
                     <newline/>
-                 <group expand="1" string="Group By...">
-                    <filter string="Partner" icon="terp-partner" domain="[]"
+                 <group expand="0" string="Group By...">
+                    <filter string="Partner" icon="terp-personal" domain="[]"
                        context="{'group_by':'partner_id'}" />
-                    <filter string="Directory" icon="gtk-open" domain="[]" context="{'group_by':'parent_id'}"/>
+                    <filter string="Directory" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
                  </group>
               </search>
              </field>
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index 4afc66fb4d7..00743d768e7 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -41,8 +41,8 @@
                 <search string="All users files">
                 	<group col="12" colspan="4">
                         <separator orientation="vertical"/>
-						<filter icon="terp-stock" string="This Year" domain="[('name','=',time.localtime()[0])]" help="All Months Files"/>
-						<filter icon="terp-stock" string="This Month" domain="[('month','=',time.localtime()[1])]" help="This Months Files"/>
+						<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.localtime()[0])]" help="All Months Files"/>
+						<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.localtime()[1])]" help="This Months Files"/>
 						<separator orientation="vertical"/>
 						<field name="name" select="1"/>
 						<field name="month" select="1"/>
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index 55957619e31..fdd201380d0 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -81,7 +81,7 @@
                     	<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
                     	<separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
-                    	<filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    	<filter string="Month" name="terp-go-month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     	<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                    </group>
                     <newline/>