diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 64a1c31da64..8a5cc00589e 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -383,6 +383,8 @@ class account_invoice(osv.osv):
             cr.execute("DELETE FROM account_invoice_tax WHERE invoice_id=%s", (id,))
             for taxe in ait_obj.compute(cr, uid, id).values():
                 ait_obj.create(cr, uid, taxe)
+         # Update the stored value (fields.function), so we write to trigger recompute
+        self.pool.get('account.invoice').write(cr, uid, ids, {}, context=context)        
         return True
 
     def button_compute(self, cr, uid, ids, context=None, set_total=False):
diff --git a/addons/base_module_quality/speed_test/speed_test.py b/addons/base_module_quality/speed_test/speed_test.py
index 33456e4729f..99523f23735 100644
--- a/addons/base_module_quality/speed_test/speed_test.py
+++ b/addons/base_module_quality/speed_test/speed_test.py
@@ -50,7 +50,7 @@ This test checks the speed of the module. Note that at least 5 demo data is need
         module_name = module_path.split('/')[-1]
         obj_list = self.get_objects(cr, uid, module_name)
         obj_counter = 0
-        score = 0
+        score = 0.0
         obj_ids = self.get_ids(cr, uid, obj_list)
         result_dict = {}
         result_dict2 = {}
@@ -63,7 +63,7 @@ This test checks the speed of the module. Note that at least 5 demo data is need
             if size:
                 list = []
 
-                #we perform the operation twice, and count the number of queries in the second run. This allows to avoid the cache effect. (like translated terms that asks for more queries) 
+                #we perform the operation twice, and count the number of queries in the second run. This allows to avoid the cache effect. (like translated terms that asks for more queries)
                 pool.get(obj).read(cr, uid, [ids[0]])
                 c = cr.count
                 pool.get(obj).read(cr, uid, [ids[0]])
diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
index 5335aefbb7d..17c54f16377 100644
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -87,7 +87,7 @@
                     <field name="create_date"/>
                     <field name="date_closed"/>
                     <field name="date_action_last"/>
-                    <field name="date"/>
+                    <field name="date_action_next"/>
                     <separator colspan="4" string="Estimates"/>
                     <field name="planned_revenue"/>
                     <field name="planned_cost"/>
diff --git a/addons/crm_configuration/crm_fund_view.xml b/addons/crm_configuration/crm_fund_view.xml
index 51cf92d9bd1..038cfc23bdf 100644
--- a/addons/crm_configuration/crm_fund_view.xml
+++ b/addons/crm_configuration/crm_fund_view.xml
@@ -37,7 +37,7 @@
                     <field name="duration"/>
                     <field name="category2_id" select="1" string="Payment Mode"/>
                 </group>
-                <notebook>
+                <notebook colspan="4">
                 <page string="Funds">
                     <field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
                     <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
@@ -70,7 +70,7 @@
                     <field name="create_date"/>
                     <field name="date_closed"/>
                     <field name="date_action_last"/>
-                    <field name="date"/>
+                    <field name="date_action_next"/>
                     <separator colspan="4"/>
                     <field name="history_line" colspan="2" nolabel="1" mode="tree,form">
                         <form string="Communication history">
diff --git a/addons/crm_configuration/crm_jobs_view.xml b/addons/crm_configuration/crm_jobs_view.xml
index dd33f9c2e0a..3e196da0ac2 100644
--- a/addons/crm_configuration/crm_jobs_view.xml
+++ b/addons/crm_configuration/crm_jobs_view.xml
@@ -115,7 +115,7 @@
                     <field name="create_date"/>
                     <field name="date_closed"/>
                     <field name="date_action_last"/>
-                    <field name="date"/>
+                    <field name="date_action_next"/>
                     <separator colspan="4" string="References"/>
                     <field name="ref" colspan="4"/>
                     <field name="ref2" colspan="4"/>
diff --git a/addons/crm_configuration/crm_phonecall_view.xml b/addons/crm_configuration/crm_phonecall_view.xml
index c87eef8c535..61eba3043fb 100644
--- a/addons/crm_configuration/crm_phonecall_view.xml
+++ b/addons/crm_configuration/crm_phonecall_view.xml
@@ -74,7 +74,6 @@
                     <field name="planned_cost"/>
                     <field name="planned_revenue"/>
                     <field name="probability"/>
-                    <field name="categ_id"/>
                     <separator colspan="4"/>
                     <field name="history_line" colspan="2" nolabel="1" mode="tree,form">
                         <form string="Communication history">