From 5b1ba838126dfea0109ff860263259ce563eec6a Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 9 Jul 2010 18:24:25 +0530
Subject: [PATCH 1/2] [IMP]: crm: Improved Statistics Dashboard

bzr revid: rpa@tinyerp.com-20100709125425-fn0qkegnw4chlr2a
---
 addons/crm/board_crm_statistical_view.xml | 84 ++++++++++++++---------
 1 file changed, 50 insertions(+), 34 deletions(-)

diff --git a/addons/crm/board_crm_statistical_view.xml b/addons/crm/board_crm_statistical_view.xml
index 1baf673990d..b23fdeac1cd 100644
--- a/addons/crm/board_crm_statistical_view.xml
+++ b/addons/crm/board_crm_statistical_view.xml
@@ -4,53 +4,69 @@
         <!--
          Board for statistical view of the sections
          -->
-        <record model="ir.ui.view" id="view_crm_lead_stage_graph1">
-            <field name="name">Leads By Stage - Graph</field>
-            <field name="model">crm.lead.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Leads By Stage" type="pie">
-                    <field name="stage_id"/>
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
 
-        <record model="ir.ui.view" id="view_crm_opportunity_categ_graph">
-            <field name="name">report.crm.opportunity.categ.graph</field>
+         <record model="ir.ui.view" id="view_crm_opportunity_categ_graph">
+            <field name="name">Opportunities By Categories - Graph</field>
             <field name="model">crm.lead.report</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Opportunity by Sales Team and Categories" type="bar" orientation="horizontal">
+                <graph string="Opportunity by Categories" type="bar" orientation="horizontal">
                     <field name="categ_id"/>
                     <field name="nbr" operator="+"/>
                 </graph>
             </field>
         </record>
 
-        <act_window name="Opportunities By Categories"
-            domain="[('state','!=','done'),('state','!=','cancel')]"
-            res_model="crm.lead.report"
-            view_type="form"
-            view_mode="graph,tree,form"
-            view_id="view_crm_opportunity_categ_graph"
-            id="act_oppor_categ"/>
+        <record model="ir.ui.view" id="view_crm_opportunity_stage_graph">
+            <field name="name">Opportunities By Stage - Graph</field>
+            <field name="model">crm.lead.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Opportunities By Stage" type="pie">
+                    <field name="stage_id"/>
+                    <field name="nbr" operator="+"/>
+                </graph>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_crm_opportunity_user_stage_graph">
+            <field name="name">Opportunities By Stage Per User - Graph</field>
+            <field name="model">crm.lead.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Opportunities By Stage" type="bar">
+                    <field name="stage_id"/>
+                    <field name="nbr" operator="+"/>
+                    <field name="user_id" group="True"/>
+                </graph>
+            </field>
+        </record>
 
-        <record model="ir.actions.act_window" id="act_leads_state">
+        <record model="ir.actions.act_window" id="act_oppor_categ">
+            <field name="res_model">Opportunities By Categories</field>
             <field name="res_model">crm.lead.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree,form</field>
-            <field name="view_id" ref="view_crm_lead_stage_graph1"/>
+            <field name="view_id" ref="view_crm_opportunity_categ_graph"/>
             <field name="domain">[('state','!=','done'),('state','!=','cancel')]</field>
         </record>
 
-        <act_window name="Leads Of The Month By User"
-            domain="[('month','=',time.strftime('%%m')),('state','!=','cancel')]"
-            res_model="crm.lead.report"
-            view_type="form"
-            view_mode="graph,tree,form"
-            view_id="view_crm_lead_stage_graph1"
-            id="act_leads_month_user"/>
+        <record model="ir.actions.act_window" id="act_opportunity_stage">
+            <field name="res_model">crm.lead.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree,form</field>
+            <field name="view_id" ref="view_crm_opportunity_stage_graph"/>
+            <field name="domain">[('state','!=','done'),('state','!=','cancel')]</field>
+        </record>
+
+        <record model="ir.actions.act_window" id="act_oppor_stage_user">
+            <field name="res_model">Number of Opportunities by stage</field>
+            <field name="res_model">crm.lead.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree,form</field>
+            <field name="view_id" ref="view_crm_opportunity_user_stage_graph"/>
+            <field name="domain">[('state','!=','cancel')]</field>
+        </record>
 
         <record model="ir.ui.view" id="board_crm_statistical_form">
             <field name="name">CRM - Statistical Dashboard Form</field>
@@ -68,8 +84,8 @@
                                 width="250"/>
 
                             <action
-                                string="Leads By Stage"
-                                name="%(act_leads_state)d"
+                                string="Opportunities By Stage"
+                                name="%(act_opportunity_stage)d"
                                 height="200"
                                 colspan="4"/>
 
@@ -77,8 +93,8 @@
                         <child2>
 
                             <action
-                                string="Leads Of The Month By User"
-                                name="%(act_leads_month_user)d"
+                                string="Number of Opportunities by Stage and User"
+                                name="%(act_oppor_stage_user)d"
                                 colspan="4"/>
 
                         </child2>

From 6ad5e679300776a7125d558698ac29d7e43f7d44 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 9 Jul 2010 19:05:29 +0530
Subject: [PATCH 2/2] [FIX] Calendar: minor improvement

bzr revid: hmo@tinyerp.com-20100709133529-68fftd7xbjz69uoq
---
 addons/base_calendar/base_calendar.py         | 19 ++++++++------
 addons/base_calendar/base_calendar_view.xml   | 25 ++++++++++++++-----
 .../wizard/base_calendar_invite_attendee.py   |  7 +++---
 addons/crm/crm_meeting_view.xml               | 15 +----------
 4 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 9458e3e01a6..85ec16bda8d 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -379,6 +379,9 @@ property or property parameter."),
     _defaults = {
         'state': 'needs-action',
         'user_id': lambda self, cr, uid, ctx: uid,
+        'role': 'req-participant',
+        'rsvp':  True,
+        'cutype': 'individual',
     }
     
     def copy(self, cr, uid, id, default=None, context=None):
@@ -543,13 +546,13 @@ property or property parameter."),
             context = {}
 
         for vals in self.browse(cr, uid, ids, context=context):
-            user = vals.user_id
-            if user:
-                mod_obj = self.pool.get(vals.ref._name)
-                if vals.ref:
-                    if vals.ref.user_id.id != user.id:
-                        defaults = {'user_id': user.id}
-                        new_event = mod_obj.copy(cr, uid, vals.ref.id, default=defaults, context=context)
+            #user = vals.user_id
+            #if user:
+            #    mod_obj = self.pool.get(vals.ref._name)
+            #    if vals.ref:
+            #        if vals.ref.user_id.id != user.id:
+            #            defaults = {'user_id': user.id}
+            #            new_event = mod_obj.copy(cr, uid, vals.ref.id, default=defaults, context=context)
             self.write(cr, uid, vals.id, {'state': 'accepted'}, context)
 
         return True
@@ -1417,6 +1420,8 @@ true, it will allow you to hide the event alarm information without removing it.
                     until_date = arg[2]
         res = super(calendar_event, self).search(cr, uid, args_without_date, \
                                  offset, limit, order, context, count)
+        #Search Event ID which are invitted
+        
         return self.get_recurrent_ids(cr, uid, res, start_date, until_date, limit)
 
 
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index bb0412a2247..cb2ca806afa 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -76,13 +76,26 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Invitation details">
-                    <field name="email" string="Invitation To"/>
-                    <field name="user_id" string="Internal User" />
-                    <field name="partner_address_id" string="Contact" />
-                    <field name="role" />
+                    <field name="sent_by_uid" string="Invitation From" />
+                    <field name="role" string="My Role"/>                    
+                    <field name="cutype" string="Invitation type"/>
                     <field name="state" />
-                    <field name="cutype" invisible="1"/>
-                    <field name="rsvp" invisible="1"/>
+                    <field name="rsvp" string="Required to Join"/>
+                    <button name="do_tentative" states="needs-action,declined,accepted"                                
+                                string="Uncertain" type="object"
+                                icon="terp-crm" />
+                    <button name="do_accept" string="Accept"
+                        states="needs-action,tentative,declined"
+                        type="object" icon="gtk-apply" />
+                    <button name="do_decline" string="Decline"
+                        states="needs-action,tentative,accepted"
+                        type="object" icon="gtk-cancel" />
+                    <button
+                        name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                        string="Delegate" type="action"
+                        icon="gtk-sort-descending"
+                        states="needs-action,tentative,declined,accepted"
+                        context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
                 </tree>
             </field>
         </record>
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index ebbfe6c48d2..15763da202d 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -75,7 +75,8 @@ send an Email to Invited Person')
         obj = self.pool.get(model)
         res_obj = obj.browse(cr, uid, context_id)
         att_obj = self.pool.get('calendar.attendee')
-
+        user_obj = self.pool.get('res.users')
+        current_user = user_obj.browse(cr, uid, uid, context=context)
         for datas in self.read(cr, uid, ids, context=context):
             type = datas.get('type')
             vals = []
@@ -89,7 +90,7 @@ send an Email to Invited Person')
                 else:
                     return {}
             if type == 'internal':
-                user_obj = self.pool.get('res.users')
+                
                 if not datas.get('user_ids'):
                     raise osv.except_osv(_('Error!'), ("Please select any User"))
                 for user_id in datas.get('user_ids'):
@@ -139,7 +140,7 @@ send an Email to Invited Person')
                                        self._columns['type'].selection))
                     raise osv.except_osv(_('Error!'), ("%s must have an email  Address to send mail") %(name[0]))
                 att_obj._send_mail(cr, uid, attendees, mail_to, \
-                       email_from= tools.config.get('email_from', False))
+                       email_from = current_user.user_email or tools.config.get('email_from', False))
 
         return {}
 
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index e635a1d26bc..6cc8059b1a6 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -342,20 +342,7 @@
                     </field>
                 </field>
         </record>
-
-        <!-- Calendar Attendee Tree View -->
-
-        <record id="attendee_tree_view_inherit" model="ir.ui.view">
-                <field name="name">calendar.attendee.tree.inherit</field>
-                <field name="model">calendar.attendee</field>
-                <field name="type">tree</field>
-                <field name="inherit_id" ref="base_calendar.base_calendar_attendee_tree_view"/>
-                <field name="arch" type="xml">
-                    <field name="role" position="after">
-                        <field name="categ_id" string="Event Type"/>
-                    </field>
-                </field>
-        </record>
+       
 
     </data>
 </openerp>