From 48afffbd859fe5956d5f74c38efc40ee891e9129 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 4 Mar 2010 13:00:14 +0530
Subject: [PATCH] [Fix] report_crm:Fix the problem of group by in fundrising
 report

bzr revid: sbh@tinyerp.com-20100304073014-3xv4ksfd7lncp803
---
 addons/crm/crm_fundraising.py                      | 5 ++++-
 addons/crm_project/crm_bugs_view.xml               | 2 +-
 addons/crm_project/crm_project_bug.py              | 8 ++++++++
 addons/crm_project/report_crm_project_bug_view.xml | 2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_fundraising.py b/addons/crm/crm_fundraising.py
index df30ac8385f..9bfbd10a6b8 100644
--- a/addons/crm/crm_fundraising.py
+++ b/addons/crm/crm_fundraising.py
@@ -53,7 +53,10 @@ class crm_fundraising(osv.osv):
    
     _defaults = {
                  'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
-                 'probability':lambda *a:0.0,             
+                 'probability':lambda *a:0.0,       
+                 'planned_cost':lambda *a:0.0,    
+                 'planned_revenue':lambda *a:0.0,    
+                       
     }
 
 crm_fundraising()    
diff --git a/addons/crm_project/crm_bugs_view.xml b/addons/crm_project/crm_bugs_view.xml
index 6d89beb2f48..4179aa06cf5 100644
--- a/addons/crm_project/crm_bugs_view.xml
+++ b/addons/crm_project/crm_bugs_view.xml
@@ -73,7 +73,7 @@
 	                    <field name="user_id" />
 	                    <label string="Resolution: " align="1.0"/>
 	                    <group colspan="1" col="3">
-	                        <field name="stage_id" select="1" nolabel="1"/>
+	                        <field name="stage_id"  select="1" nolabel="1" on_change="onchange_stage_id(stage_id)"  domain="[('object_id.model', '=', 'crm.project.bug')]"/>
 	                        <button icon="gtk-go-back" string="" name="stage_previous" type="object"/>
 	                        <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
 	                    </group>
diff --git a/addons/crm_project/crm_project_bug.py b/addons/crm_project/crm_project_bug.py
index ad0fdc888ae..f7ec4af729f 100644
--- a/addons/crm_project/crm_project_bug.py
+++ b/addons/crm_project/crm_project_bug.py
@@ -88,6 +88,14 @@ class crm_project_bug(osv.osv):
     def convert_to_bug(self, cr, uid, ids, context=None):
         return self._convert(cr, uid, ids, 'bug_categ', context=context)
 
+    def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
+        if not stage_id:
+            return {'value':{}}
+        stage = self.pool.get('crm.case.stage').browse(cr, uid, stage_id, context)
+        if not stage.on_change:
+            return {'value':{}}
+        return {'value':{'probability':stage.probability}}
+
     _defaults = {
           'project_id':_get_project,          
           }
diff --git a/addons/crm_project/report_crm_project_bug_view.xml b/addons/crm_project/report_crm_project_bug_view.xml
index e822d4a7f0a..5ccb41aec58 100644
--- a/addons/crm_project/report_crm_project_bug_view.xml
+++ b/addons/crm_project/report_crm_project_bug_view.xml
@@ -59,7 +59,7 @@
             <field name="inherit_id" ref="report_crm.view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <field name="state" position="before">
+                 <field name="user_id" position="before">
                </field>
             </field>
         </record>