From 3b74f505e17c53d41c604049ec1bbdf2b0e5e242 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 21 Jun 2012 12:46:40 +0200
Subject: [PATCH] [IMP] crm: updated crm_meeting and crm_phonecall, to have
 Inbox filter for needaction.

bzr revid: tde@openerp.com-20120621104640-qsptqc62eyxzskl4
---
 addons/crm/crm_lead_view.xml      |   2 +-
 addons/crm/crm_meeting_view.xml   |  34 +++---
 addons/crm/crm_phonecall_view.xml | 174 ++++++++++++++++--------------
 3 files changed, 111 insertions(+), 99 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f24544ec25e..fd959d5f404 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -549,7 +549,6 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Opportunities" fonts="bold:needaction_pending==True" colors="gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
-                    <field name="needaction_pending" invisible="1"/>
                     <field name="date_deadline" invisible="1"/>
                     <field name="create_date" groups="base.group_no_one"/>
                     <field name="name" string="Opportunity"/>
@@ -568,6 +567,7 @@
                     <field name="priority" invisible="1"/>
                     <field name="categ_id" invisible="1"/>
                     <field name="state" groups="base.group_no_one"/>
+                    <field name="needaction_pending" invisible="1"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index c855fae26cc..29dda8d3da4 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -234,7 +234,6 @@
         <field name="arch" type="xml">
             <tree string="Meetings" fonts="bold:needaction_pending==True"
                 colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
-                <field name="needaction_pending" invisible="1"/>
                 <field name="name" string="Subject" />
                 <field name="user_id"/>
                 <field name="date"/>
@@ -243,6 +242,7 @@
                 <field name="partner_id" string="Partner" />
                 <field name="location" />
                 <field name="categ_id"/>
+                <field name="needaction_pending" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -282,20 +282,24 @@
         <field name="model">crm.meeting</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-                <search string="Search Meetings">
-                       <group>
-                           <field name="name" string="Meeting / Partner"
-                               filter_domain="['|', ('name','ilike',self), ('partner_id','ilike', self)]"/>
-                           <field name="user_id">
-                               <filter icon="terp-personal"
-                                   domain="[('user_id','=',uid)]"
-                                   help="My Meetings" />
-                           </field>
-                           <field name="partner_id"/>
-                       </group>
-                </search>
-            </field>
-        </record>
+            <search string="Search Meetings">
+                <filter icon="terp-mail-message-new"
+                    string="Inbox" help="Unread messages"
+                    name="needaction_pending"
+                    domain="[('needaction_pending','=',True)]"/>
+                <group>
+                    <field name="name" string="Meeting / Partner"
+                        filter_domain="['|', ('name','ilike',self), ('partner_id','ilike', self)]"/>
+                    <field name="user_id">
+                        <filter icon="terp-personal"
+                            domain="[('user_id','=',uid)]"
+                            help="My Meetings" />
+                    </field>
+                    <field name="partner_id"/>
+                </group>
+            </search>
+        </field>
+    </record>
 
         <!-- Calendar Attendee Form View -->
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 0722a278fb0..ba08a58f46d 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -154,7 +154,7 @@
         </field>
     </record>
 
-<!-- Phonecalls Calendar View -->
+    <!-- Phonecalls Calendar View -->
 
     <record model="ir.ui.view" id="crm_case_phone_calendar_view">
         <field name="name">CRM - Phone Calls Calendar</field>
@@ -169,55 +169,59 @@
         </field>
     </record>
 
-<!-- Phonecalls Search View  -->
-
+    <!-- Phonecalls Search View  -->
     <record id="view_crm_case_phonecalls_filter" model="ir.ui.view">
         <field name="name">CRM - Phone Calls Search</field>
         <field name="model">crm.phonecall</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <filter icon="terp-go-today" string="Today"
-                   domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),
-                    ('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                   name="today"
-                   help="Todays's Phonecalls"
-               />
-               <filter icon="terp-go-week"
-                   string="7 Days"
-                   help="Phonecalls during last 7 days"
-                   domain="[('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-               />
-
-               <separator orientation="vertical"/>
-               <field name="name"/>
-               <field name="partner_id"/>
-               <field name="user_id">
-                   <filter icon="terp-personal-"
-                       domain="[('user_id','=',False)]"
-                       help="Unassigned Phonecalls" />
-               </field>
-               <field name="section_id"
-                   widget="selection" string="Sales Team">
-                   <filter icon="terp-personal+"
-                       domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                       help="My Sales Team(s)" />
-               </field>
-               <newline/>
-               <group expand="0" string="Group By...">
-                   <filter string="Partner" icon="terp-partner" domain="[]"
-                       context="{'group_by':'partner_id'}" />
-                   <filter string="Responsible" icon="terp-personal"
-                       domain="[]" context="{'group_by':'user_id'}" />
-                   <separator orientation="vertical" />
-                   <filter string="Creation" icon="terp-go-month" help="Creation Date"
-                       domain="[]" context="{'group_by':'create_date'}" />
-                   <filter string="Date" icon="terp-go-month" domain="[]"
-                       context="{'group_by':'date'}" help="Date of Call" />
-               </group>
-           </search>
+                <filter icon="terp-mail-message-new"
+                    string="Inbox" help="Unread messages"
+                    name="needaction_pending"
+                    domain="[('needaction_pending','=',True)]"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-go-today" string="Today"
+                    domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),
+                        ('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
+                    name="today"
+                    help="Todays's Phonecalls"
+                />
+                <filter icon="terp-go-week"
+                    string="7 Days"
+                    help="Phonecalls during last 7 days"
+                    domain="[('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                />
+                <separator orientation="vertical"/>
+                <field name="name"/>
+                <field name="partner_id"/>
+                <field name="user_id">
+                    <filter icon="terp-personal-"
+                        domain="[('user_id','=',False)]"
+                        help="Unassigned Phonecalls" />
+                </field>
+                <field name="section_id"
+                    widget="selection" string="Sales Team">
+                    <filter icon="terp-personal+"
+                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                        help="My Sales Team(s)" />
+                </field>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Partner" icon="terp-partner" domain="[]"
+                        context="{'group_by':'partner_id'}" />
+                    <filter string="Responsible" icon="terp-personal"
+                        domain="[]" context="{'group_by':'user_id'}" />
+                    <separator orientation="vertical" />
+                    <filter string="Creation" icon="terp-go-month" help="Creation Date"
+                        domain="[]" context="{'group_by':'create_date'}" />
+                    <filter string="Date" icon="terp-go-month" domain="[]"
+                        context="{'group_by':'date'}" help="Date of Call" />
+                </group>
+            </search>
         </field>
     </record>
+
     <!-- Scheduled a phonecall search view-->
     <record id="view_crm_case_scheduled_phonecalls_filter" model="ir.ui.view">
         <field name="name">CRM - Scheduled Calls Search</field>
@@ -225,47 +229,51 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Scheduled Phonecalls">
-               <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
-               <separator orientation="vertical"/>
-               <filter icon="terp-go-today" string="Today"
-                   domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),
-                    ('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                   name="today"
-                   help="Todays's Phonecalls"
-               />
-               <filter icon="terp-go-week"
-                   string="7 Days"
-                   help="Phonecalls during last 7 days"
-                   domain="[('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-               />
-
-               <separator orientation="vertical"/>
-               <field name="name"/>
-               <field name="partner_id"/>
-               <field name="user_id">
-                   <filter icon="terp-personal-"
-                       domain="[('user_id','=',False)]"
-                       help="Unassigned Phonecalls" />
-               </field>
-               <field name="section_id"
-                   widget="selection" string="Sales Team">
-                   <filter icon="terp-personal+"
-                       domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                       help="My Sales Team(s)" />
-               </field>
-               <newline/>
-               <group expand="0" string="Group By...">
-                   <filter string="Partner" icon="terp-partner" domain="[]"
-                       context="{'group_by':'partner_id'}" />
-                   <filter string="Responsible" icon="terp-personal"
-                       domain="[]" context="{'group_by':'user_id'}" />
-                   <separator orientation="vertical" />
-                   <filter string="Creation" icon="terp-go-month" help="Creation Date"
-                       domain="[]" context="{'group_by':'create_date'}" />
-                   <filter string="Date" icon="terp-go-month" domain="[]"
-                       context="{'group_by':'date'}" help="Date of Call" />
-               </group>
-           </search>
+                <filter icon="terp-mail-message-new"
+                    string="Inbox" help="Unread messages"
+                    name="needaction_pending"
+                    domain="[('needaction_pending','=',True)]"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-go-today" string="Today"
+                    domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),
+                        ('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
+                    name="today"
+                    help="Todays's Phonecalls"
+                />
+                <filter icon="terp-go-week"
+                    string="7 Days"
+                    help="Phonecalls during last 7 days"
+                    domain="[('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                />
+                <separator orientation="vertical"/>
+                <field name="name"/>
+                <field name="partner_id"/>
+                <field name="user_id">
+                    <filter icon="terp-personal-"
+                        domain="[('user_id','=',False)]"
+                        help="Unassigned Phonecalls" />
+                </field>
+                <field name="section_id"
+                    widget="selection" string="Sales Team">
+                    <filter icon="terp-personal+"
+                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                        help="My Sales Team(s)" />
+                </field>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Partner" icon="terp-partner" domain="[]"
+                        context="{'group_by':'partner_id'}" />
+                    <filter string="Responsible" icon="terp-personal"
+                        domain="[]" context="{'group_by':'user_id'}" />
+                    <separator orientation="vertical" />
+                    <filter string="Creation" icon="terp-go-month" help="Creation Date"
+                        domain="[]" context="{'group_by':'create_date'}" />
+                    <filter string="Date" icon="terp-go-month" domain="[]"
+                        context="{'group_by':'date'}" help="Date of Call" />
+                </group>
+            </search>
         </field>
     </record>