merge

bzr revid: fp@tinyerp.com-20101229183007-mlroj1fky2b7opxr

6 files changed, 12 insertions, 12 deletions

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 6c4c1025880..6e794827a96 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -937,7 +937,7 @@
                     <group expand="0" string="Group By...">
                         <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'create_uid'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"  groups="base.group_extended"/>
-                        <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Company" icon="terp-gtk-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <separator orientation="vertical"/>
                         <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
                     </group>
@@ -1144,11 +1144,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Fields">
-                    <filter icon="terp-camera_test"
+                    <filter icon="terp-gnome-cpu-frequency-applet+"
                         string="Required"
                         domain="[('required', '=', True)]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-stock_align_left_24"
+                    <filter icon="terp-dialog-close"
                         string="Readonly"
                         domain="[('readonly', '=', True)]"/>
                     <separator orientation="vertical"/>
@@ -1264,7 +1264,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Translations">
-                    <filter icon="terp-document-new"
+                    <filter icon="terp-gdu-smart-failing"
                         string="Untranslated"
                         domain="['|',('value', '=', False),('value','=','')]"/>
                     <separator orientation="vertical"/>
diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index a207eea52ab..5866b81a25e 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -182,7 +182,7 @@
           <field name="action"/>
           <newline/>
               <group expand="0" string="Group By...">
-                  <filter string="Workflow" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'wkf_id'}"/>
+                  <filter string="Workflow" icon="terp-stage" domain="[]" context="{'group_by':'wkf_id'}"/>
               </group>
         </search>
       </field>
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 9b52ecdbd09..20b8f736e38 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -29,7 +29,7 @@
                         <filter string="Customer" name="customer" icon="terp-personal" domain="[('is_customer_add','=','1')]" />
                         <filter string="Supplier" name="supplier"  icon="terp-personal" domain="[('is_supplier_add','=','1')]" />
                         <separator orientation="vertical"/>
-                        <field name="partner_id" />
+                        <field name="partner_id" string="Partner"/>
                         <field name="name" />
                         <field name="country_id" />
                     </group>
diff --git a/bin/addons/base/res/partner/wizard/partner_sms_send_view.xml b/bin/addons/base/res/partner/wizard/partner_sms_send_view.xml
index 97c418d9f81..7d84d6d405a 100644
--- a/bin/addons/base/res/partner/wizard/partner_sms_send_view.xml
+++ b/bin/addons/base/res/partner/wizard/partner_sms_send_view.xml
@@ -20,7 +20,7 @@
 			        <separator string="" colspan="4" />
                     <group colspan="4" col="6">
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                        <button name="sms_send" string="Send SMS" type="object" icon="gtk-go-forward"/>
+                        <button name="sms_send" string="Send SMS" type="object" icon="terp-mail-message-new"/>
                     </group>
              </form>
             </field>
diff --git a/bin/addons/base/res/partner/wizard/partner_wizard_spam_view.xml b/bin/addons/base/res/partner/wizard/partner_wizard_spam_view.xml
index b7c940b5a22..0de26400f90 100644
--- a/bin/addons/base/res/partner/wizard/partner_wizard_spam_view.xml
+++ b/bin/addons/base/res/partner/wizard/partner_wizard_spam_view.xml
@@ -17,7 +17,7 @@
                 <separator string="" colspan="6"/>
                 <group colspan="6" col="4" >
                 <button special="cancel" string="Cancel" icon="gtk-cancel" />
-                <button name="mass_mail_send" string="Send Email" type="object" icon="gtk-go-forward"/>
+                <button name="mass_mail_send" string="Send Email" type="object" icon="terp-mail-message-new"/>
                 </group>
             </form>
             </field>
diff --git a/bin/addons/base/res/res_log_view.xml b/bin/addons/base/res/res_log_view.xml
index 48dac9ca119..e8cb912e227 100644
--- a/bin/addons/base/res/res_log_view.xml
+++ b/bin/addons/base/res/res_log_view.xml
@@ -7,12 +7,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Logs">
-                    <filter icon="terp-stock_align_left_24" string="Read" domain="[('read','=',True)]" name="read"/>
-                    <filter icon="terp-stock_align_left_24" string="Unread" domain="[('read','&lt;&gt;',True)]" name="unread"/>
+                    <filter icon="terp-camera_test" string="Read" domain="[('read','=',True)]" name="read"/>
+                    <filter icon="terp-gtk-jump-to-ltr" string="Unread" domain="[('read','&lt;&gt;',True)]" name="unread"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-stock_align_left_24" string="My Logs" domain="[('user_id','=',uid)]" name="my"/>
+                    <filter icon="terp-personal" string="My Logs" domain="[('user_id','=',uid)]" name="my"/>
                     <filter icon="terp-stock_align_left_24" string="System Logs"
-                    	domain="[('res_model','=','publisher_warranty.contract')]" name="sys"/>
+                        domain="[('res_model','=','publisher_warranty.contract')]" name="sys"/>
                     <separator orientation="vertical"/>
                     <field name="name"/>
                     <field name="user_id"/>