diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 447876f51f1..3878400e40d 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -67,7 +67,6 @@
                     <field name="date_closed" string="Closure Date"/>
                     <field name="categ_id" string="Type" select="1"/>
                     <field name="stage_id" invisible="1"/>
-                    <field name="som" invisible="1"/>
                     <field name="state"/>
                     <button name="case_open" string="Open"
                         states="draft,pending" type="object"
@@ -209,7 +208,6 @@
                                 <field name="id" select="1"/>
                                 <field name="active"/>
                                 <field name="canal_id"/>
-                                <field name="som"/>
                                 <separator colspan="4" string="Dates"/>
                                 <field name="create_date"/>
                                 <field name="date_closed"/>
@@ -312,10 +310,6 @@
                        <filter string="Closure" icon="terp-go-month"
                            domain="[]" help="Date Closed"
                            context="{'group_by':'date_closed'}" />
-                       <separator orientation="vertical"/>
-                        <filter string="State of Mind"
-                            icon="terp-face-plain"
-                            domain="[]" context="{'group_by':'som'}" />
                    </group>
                </search>
            </field>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 7368bb5e349..f6ac9d22c2a 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -202,7 +202,6 @@
                                 <field name="id" select="1"/>
                                 <field name="priority" string="Priority"/>
                                 <field name="canal_id"/>
-                                <field name="som"/>
                             </group>
                             <group col="2" colspan="2">
                                 <separator colspan="4" string="Dates"/>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 55ff735abed..0fe887bab6f 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -36,7 +36,6 @@
                             states="open,pending"
                             string="Send Reminder" type="object"
                             icon="gtk-go-forward" />
-                        <field name="som"/>
                         <field name="date" select="1"/>
                         <field name="date_deadline"/>
                     </group>
@@ -176,7 +175,6 @@
                     <field name="user_id"/>
                     <field name="section_id"/>
                     <field name="priority"/>
-                    <field name="som" invisible="1"/>
                     <field name="state"/>
                     <button name="case_open" string="Open"
                         states="draft,pending" type="object"
@@ -259,9 +257,6 @@
                             context="{'group_by':'state'}" />
                         <filter string="Priority" icon="terp-rating-rated"
                             domain="[]" context="{'group_by':'priority'}" />
-                        <filter string="State of Mind"
-                            icon="terp-face-plain"
-                            domain="[]" context="{'group_by':'som'}" />
                         <separator orientation="vertical"/>
                         <filter string="Date" icon="terp-go-month"
                            domain="[]" help="Request Date"
diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml
index 52603d7b8fa..4811e2b91a2 100644
--- a/addons/hr_recruitment/hr_recruitment_demo.xml
+++ b/addons/hr_recruitment/hr_recruitment_demo.xml
@@ -27,7 +27,6 @@
     <record id="hr_case_traineemca0" model="hr.applicant">
         <field model="res.partner.canal" name="canal_id" search="[('name','=','E-mail')]"/>
         <field name="partner_address_id" ref="base.res_partner_address_14"/>
-        <field name="som" ref="base.som_fury"/>
         <field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
         <field name="type_id" ref="degree_bac5"/>
         <field name="partner_id" ref="base.res_partner_15"/>
@@ -47,7 +46,6 @@
     </record>
     <record id="hr_case_fresher0" model="hr.applicant">
         <field model="res.partner.canal" name="canal_id" search="[('name','=','direct')]"/>
-        <field name="som" ref="base.som_happy"/>
         <field eval="time.strftime('%Y-%m-15 16:10:00')" name="date"/>
         <field eval="time.strftime('%Y-%m-18')" name="date_deadline"/>
         <field name="type_id" ref="degree_licenced"/>
@@ -119,7 +117,6 @@
     <record id="hr_case_traineemca1" model="hr.applicant">
         <field model="res.partner.canal" name="canal_id" search="[('name','=','E-mail')]"/>
         <field name="partner_address_id" ref="base.res_partner_address_14"/>
-        <field name="som" ref="base.som_fury"/>
         <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
         <field name="type_id" ref="degree_bac5"/>
         <field name="partner_id" ref="base.res_partner_15"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 8cb74fb95c5..69b9b1c094a 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -93,14 +93,6 @@
             </field>
         </record>
 
-        <act_window name="Deposit"
-           res_model="sale.advance.payment.inv"
-           src_model="sale.order"
-           view_mode="form"
-           target="new"
-           key2="client_action_multi"
-           id="action_view_sale_advance_payment_inv"/>
-
         <record id="view_order_form" model="ir.ui.view">
             <field name="name">sale.order.form</field>
             <field name="model">sale.order</field>
@@ -205,7 +197,7 @@
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
-                                <button name="%(action_view_sale_advance_payment_inv)d" string="Deposit" type="action" icon="gtk-execute"/>
+                                <button name="%(action_view_sale_advance_payment_inv)d" string="Deposit" type="action" icon="gtk-execute" attrs="{'invisible':[('state','!=','draft')]}"/>
                             </group>
                             <group col="13" colspan="4">
                                 <field name="state"/>
diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
index b3f121b8c40..37239aedd38 100644
--- a/addons/sale/wizard/sale_make_invoice.xml
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -26,14 +26,14 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-        
-        <act_window name="Make Invoices"            
-            res_model="sale.make.invoice"
-            src_model="sale.order"
-            view_mode="form"
-            target="new"        
-            key2="client_action_multi"    
-            id="action_view_sale_order_make_invoice"/>        
+
+<!--        <act_window name="Make Invoices"-->
+<!--            res_model="sale.make.invoice"-->
+<!--            src_model="sale.order"-->
+<!--            view_mode="form"-->
+<!--            target="new"-->
+<!--            key2="client_action_multi"-->
+<!--            id="action_view_sale_order_make_invoice"/>-->
 
     </data>
 </openerp>
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 598df143393..be74ac94ac9 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -20,6 +20,14 @@
             </field>
         </record>
 
+        <record id="action_view_sale_advance_payment_inv" model="ir.actions.act_window">
+            <field name="name">Deposit</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.advance.payment.inv</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
         <record id="view_sale_open_invoice" model="ir.ui.view">
             <field name="name">Open Invoice</field>