From b73ba942d883c04b672ec7fa96b2390ea3192124 Mon Sep 17 00:00:00 2001
From: "Sofia (Open ERP)" <sso@tinyerp.com>
Date: Sat, 10 Jan 2009 12:42:27 +0530
Subject: [PATCH 1/3] bugfixed for duplicate fields

bzr revid: sso@tinyerp.com-20090110071227-23m7p5bh7e7t9l4g
---
 addons/crm_configuration/crm_bugs_view.xml      | 2 +-
 addons/crm_configuration/crm_fund_view.xml      | 4 ++--
 addons/crm_configuration/crm_jobs_view.xml      | 2 +-
 addons/crm_configuration/crm_phonecall_view.xml | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

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">

From fd499facba36b89e5eaeb490f3bd0f6d374025ac Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Mon, 12 Jan 2009 12:14:44 +0530
Subject: [PATCH 2/3] Bug 316173

lp bug: https://launchpad.net/bugs/316173 fixed

bzr revid: jvo@tinyerp.com-20090112064444-ye7mayvd42uj7j9f
---
 addons/account/invoice.py | 2 ++
 1 file changed, 2 insertions(+)

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):

From 52a7fb6e87c125181cdefb84b6ffc96494579542 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Mon, 12 Jan 2009 12:18:05 +0530
Subject: [PATCH 3/3] quality

bzr revid: mra@tinyerp.com-20090112064805-6noberspeq4a27lz
---
 addons/base_module_quality/speed_test/speed_test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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]])