Launchpad automatic translations update.
[odoo/odoo.git] / addons / crm / crm_lead_view.xml
index f43baf9..c552b18 100644 (file)
@@ -4,50 +4,49 @@
 
         <!-- Read/Unread actions -->
         <record id="actions_server_crm_lead_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">CRM Lead: Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_crm_lead"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_crm_lead_unread" model="ir.values">
             <field name="name">action_crm_lead_unread</field>
             <field name="action_id" ref="actions_server_crm_lead_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_lead_unread'))" />
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_lead_unread'))"/>
             <field name="key">action</field>
-            <field name="model_id" ref="model_crm_lead" />
+            <field name="model_id" ref="model_crm_lead"/>
             <field name="model">crm.lead</field>
             <field name="key2">client_action_multi</field>
         </record>
 
         <record id="actions_server_crm_lead_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">CRM Lead: Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_crm_lead"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_crm_lead_read" model="ir.values">
             <field name="name">action_crm_lead_read</field>
             <field name="action_id" ref="actions_server_crm_lead_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_lead_read'))" />
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_lead_read'))"/>
             <field name="key">action</field>
-            <field name="model_id" ref="model_crm_lead" />
+            <field name="model_id" ref="model_crm_lead"/>
             <field name="model">crm.lead</field>
             <field name="key2">client_action_multi</field>
         </record>
 
         <!--
             CRM CASE STAGE
-            -->
+        -->
 
         <!-- Stage Search view -->
         <record id="crm_lead_stage_search" model="ir.ui.view">
             <field name="name">Stage - Search</field>
             <field name="model">crm.case.stage</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stage Search">
                     <field name="name" string="Stage Name"/>
             <field name="res_model">crm.case.stage</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm.crm_case_stage_tree"/>
-            <field name="help">Add specific stages to leads and opportunities allowing your sales to better organise their sales pipeline. Stages will allow them to easily track how a specific lead or opportunity is positioned in the sales cycle.</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to set a new stage in your lead/opportunity pipeline.
+              </p><p>
+                Stages will allow salespersons to easily track how a specific
+                lead or opportunity is positioned in the sales cycle.
+              </p>
+            </field>
         </record>
 
         <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" name="Stages" sequence="0" parent="base.menu_crm_config_lead" groups="base.group_no_one"/>
 
         <!--
             LEADS/OPPORTUNITIES CATEGORIES
-            -->
+        -->
 
         <!-- Categories Form View -->
         <record id="crm_lead_categ_action" model="ir.actions.act_window">
-            <field name="name">Categories</field>
+            <field name="name">Sales Tags</field>
             <field name="res_model">crm.case.categ</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_categ_tree-view"/>
             <field name="context" eval="{'object_id': ref('model_crm_lead')}"/>
             <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
-            <field name="help">Create specific categories that fit your company's activities to better classify and analyse your leads and opportunities. Such categories could for instance reflect your product structure or the different types of sales you do.</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to define a new sales tag.
+              </p><p>
+                Create specific tags that fit your company's activities
+                to better classify and analyse your leads and opportunities.
+                Such categories could for instance reflect your product
+                structure or the different types of sales you do.
+              </p>
+            </field>
         </record>
 
         <menuitem action="crm_lead_categ_action"
-            id="menu_crm_lead_categ" name="Categories"
+            id="menu_crm_lead_categ" name="Sales Tags"
             parent="base.menu_crm_config_lead" sequence="1" groups="base.group_no_one"/>
 
         <!--
             LEADS
-            -->
+        -->
         <act_window
                 id="act_crm_opportunity_crm_phonecall_new"
                 name="Phone calls"
         <record model="ir.ui.view" id="crm_case_form_view_leads">
         <field name="name">CRM - Leads Form</field>
         <field name="model">crm.lead</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Leads Form" version="7.0">
                 <header>
                     <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
                             states="draft,open,pending" help="Convert to Opportunity" class="oe_highlight"/>
-                    <button name="case_escalate" string="Escalate" type="object"  
-                            states="draft,open,pending"/>
                     <button name="case_reset" string="Reset" type="object"
                             states="cancel"/>
                     <button name="case_cancel" string="Cancel" type="object"
                 <sheet>
                     <div class="oe_right oe_button_box" name="buttons">
                         <button type="action"
-                            name="%(act_crm_opportunity_crm_meeting_new)d"
-                            string="Meetings" />
-
-                        <button type="action"
                             name="%(act_crm_opportunity_crm_phonecall_new)d"
-                            string="Phone Calls" />
+                            string="Phone Calls"/>
                     </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only" string="Lead Description"/>
                     </div>
                     <group>
                         <group>
-                            <field name="user_id" />
-                            <field name="section_id"/>
-                            <field name="type" invisible="1"/>
-                        </group>
-                        <group>
-                            <field name="priority"/>
-                            <field name="categ_ids"
-                                widget="many2many_tags"
-                                domain="[('object_id.model','=','crm.lead')]"/>
-                        </group>
-                        <group>
                             <field name="partner_name" string="Company Name"/>
-                            <field name="partner_id" string="Customer"/>
+                            <field name="partner_id" string="Customer"
+                                on_change="on_change_partner(partner_id)" options='{"create_name_field": "name"}'/>
                             <label for="street" string="Address"/>
                             <div>
                                 <field name="street" placeholder="Street..."/>
                                 <field name="street2"/>
-                                <div>
-                                    <field name="zip" class="oe_inline" placeholder="ZIP"/>
-                                    <field name="city" class="oe_inline" placeholder="City"/>
+                                <div class="address_format">
+                                    <field name="city" placeholder="City" style="width: 40%%"/>
+                                    <field name="state_id" on_change="onchange_state(state_id)" options='{"no_open": True}' placeholder="State" style="width: 24%%"/>
+                                    <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                 </div>
-                                <field name="state_id" placeholder="State"/>
-                                <field name="country_id" placeholder="Country"/>
+                                <field name="country_id" placeholder="Country" options='{"no_open": True}'/>
                             </div>
                         </group>
                         <group>
-                            <label for="contact_name" />
+                            <label for="contact_name"/>
                             <div>
                                 <field name="contact_name" class="oe_inline"/>,
-                                <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline"/>
+                                <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline" options='{"no_open": True}'/>
                             </div>
                             <field name="email_from" widget="email"/>
-                            <field name="function" />
+                            <field name="function"/>
                             <field name="phone"/>
                             <field name="mobile"/>
                             <field name="fax"/>
                                 icon="terp-mail-message-new" type="action" colspan="1"/>
                             -->
                         </group>
+                        <group>
+                            <field name="user_id"/>
+                            <label for="section_id"/>
+                            <div>
+                                <field name="section_id"/>
+                                <button name="case_escalate" string="Escalate" type="object" states="draft,open,pending"/>
+                            </div>
+                            <field name="type" invisible="1"/>
+                        </group>
+                        <group>
+                            <field name="priority"/>
+                            <field name="categ_ids"
+                                widget="many2many_tags"
+                                domain="[('object_id.model','=','crm.lead')]"/>
+                        </group>
                     </group>
                     <notebook colspan="4">
                     <page string="Notes">
                             <group string="Categorization">
                                 <field name="company_id"
                                     groups="base.group_multi_company"
-                                    widget="selection" colspan="2" />
-                                <field name="type_id" widget="selection"/>
+                                    widget="selection" colspan="2"/>
+                                <field name="type_id"/>
                                 <field name="channel_id" widget="selection"/>
                                 <field name="referred"/>
                                 <field name="state" groups="base.group_no_one"/>
                             </group>
                             <group string="Mailings">
-                                <field name="opt_out" />
+                                <field name="opt_out"/>
                             </group>
                         </group>
                     </page>
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers"/>
                     <field name="message_ids" widget="mail_thread"/>
                 </div>
             </form>
         </field>
         </record>
 
+        <!-- CRM Lead Graph View -->
+        <record model="ir.ui.view" id="crm_case_graph_view_leads">
+            <field name="name">Opportunities</field>
+            <field name="model">crm.lead</field>
+            <field name="arch" type="xml">
+                <graph string="Opportunities" type="bar">
+                    <field name="stage_id"/>
+                    <field name="planned_revenue" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+
         <!-- CRM Lead Tree View -->
         <record model="ir.ui.view" id="crm_case_tree_view_leads">
             <field name="name">Leads</field>
             <field name="model">crm.lead</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Leads" fonts="bold:needaction_pending==True" colors="grey:state in ('cancel', 'done')">
+                <tree string="Leads" fonts="bold:message_unread==True" colors="grey:state in ('cancel', 'done')">
                     <field name="date_deadline" invisible="1"/>
                     <field name="create_date" groups="base.group_no_one"/>
                     <field name="name"/>
                     <field name="contact_name"/>
-                    <field name="country_id" invisible="context.get('invisible_country', True)" />
+                    <field name="country_id" invisible="context.get('invisible_country', True)"/>
                     <field name="email_from"/>
                     <field name="phone"/>
                     <field name="stage_id"/>
                     <field name="user_id" invisible="1"/>
-                    <field name="section_id" invisible="context.get('invisible_section', True)" />
-                    <field name="state" groups="base.group_no_one"/>
+                    <field name="section_id" invisible="context.get('invisible_section', True)"/>
+                    <field name="state" invisible="1"/>
                     <field name="type_id" invisible="1"/>
                     <field name="referred" invisible="1"/>
                     <field name="channel_id" invisible="1"/>
-                    <field name="subjects" invisible="1"/>
-                    <field name="needaction_pending" invisible="1"/>
+                    <field name="message_unread" invisible="1"/>
                 </tree>
             </field>
         </record>
         <record model="ir.ui.view" id="crm_case_calendar_view_leads">
             <field name="name">CRM - Leads Calendar</field>
             <field name="model">crm.lead</field>
-            <field name="type">calendar</field>
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
                 <calendar string="Leads Generation"
                     date_start="date_action" color="user_id">
-                    <field name="name" />
-                    <field name="partner_name" />
+                    <field name="name"/>
+                    <field name="partner_name"/>
                 </calendar>
             </field>
         </record>
 
-    <!-- CRM Lead Kanban View  -->
-    <record model="ir.ui.view" id="crm_case_kanban_view_leads">
-        <field name="name">CRM - Leads Kanban</field>
-        <field name="model">crm.lead</field>
-        <field name="type">kanban</field>
-        <field name="arch" type="xml">
-            <kanban default_group_by="stage_id">
-                <field name="state" groups="base.group_no_one"/>
-                <field name="color"/>
-                <field name="priority"/>
-                <field name="planned_revenue" sum="Expected Revenues"/>
-                <field name="user_email"/>
-                <field name="user_id"/>
-                <field name="partner_address_email"/>
-                <field name="message_summary"/>
-                <field name="needaction_pending"/>
-                <templates>
-                    <t t-name="lead_details">
-                        <ul class="oe_kanban_tooltip">
-                            <li t-if="record.phone.raw_value"><b>Phone:</b> <field name="phone"/></li>
-                            <li><b>Probability:</b> <field name="probability"/>%%</li>
-                            <li><b>Creation date:</b> <field name="create_date"/></li>
-                            <li t-if="record.date_deadline.raw_value"><b>Date Deadline:</b> <field name="date_deadline"/></li>
-                        </ul>
-                    </t>
-                    <t t-name="kanban-box">
-                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
-                            <div class="oe_dropdown_toggle oe_dropdown_kanban">
-                                <span class="oe_e">í</span>
-                                <ul class="oe_dropdown_menu">
-                                    <li><a type="edit" >Edit...</a></li>
-                                    <li><a type="delete">Delete</a></li>
-                                    <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
-                                    <li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
-                                    <li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
-                                    <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
-                                </ul>
-                            </div>
-                            <div class="oe_kanban_content">
-                                <div>
-                                    <b><field name="name"/></b>
-                                    <t t-if="record.planned_revenue.raw_value">
-                                        - <b><t t-esc="Math.round(record.planned_revenue.value)"/>
-                                        <field name="company_currency"/></b>
-                                    </t>
-                                </div>
-                                <div>
-                                    <field name="partner_id"/>
-                                </div>
-                                <div style="padding-left: 0.5em">
-                                    <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
-                                    <span t-attf-class="#{red || ''}"><field name="date_action"/></span>
-                                    <t t-if="record.date_action.raw_value"> : </t>
-                                    <field name="title_action"/>
-                                </div>
-                                <div class="oe_kanban_bottom_right">
-                                    <a t-if="record.priority.raw_value == 1" type="object" name="set_normal_priority" class="oe_e oe_star_on">7</a>
-                                    <a t-if="record.priority.raw_value != 1" type="object" name="set_high_priority" class="oe_e oe_star_off">7</a>
-                                    <!--
-                                    <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kaban_status_red</t>
-                                    <span t-attf-class="oe_kanban_status #{red}"> </span>
-                                    -->
-                                    <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+        <!-- CRM Lead Kanban View  -->
+        <record model="ir.ui.view" id="crm_case_kanban_view_leads">
+            <field name="name">CRM - Leads Kanban</field>
+            <field name="model">crm.lead</field>
+            <field name="arch" type="xml">
+                <kanban default_group_by="stage_id">
+                    <field name="state" groups="base.group_no_one"/>
+                    <field name="stage_id"/>
+                    <field name="color"/>
+                    <field name="priority"/>
+                    <field name="planned_revenue" sum="Expected Revenues"/>
+                    <field name="user_email"/>
+                    <field name="user_id"/>
+                    <field name="partner_address_email"/>
+                    <field name="message_summary"/>
+                    <field name="message_unread"/>
+                    <templates>
+                        <field name="date_deadline"/>
+                        <t t-name="kanban-box">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                    <span class="oe_e">í</span>
+                                    <ul class="oe_dropdown_menu">
+                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
+                                        <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
+                                        <li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
+                                        <li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
+                                        <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                                    </ul>
                                 </div>
-                                <div class="oe_kanban_footer_left">
-                                    <t t-if="record.needaction_pending.raw_value"><span class="oe_kanban_mail_new">New</span></t>
-                                    <t t-raw="record.message_summary.raw_value"/>
+                                <div class="oe_kanban_content">
+                                    <div>
+                                        <b><field name="name"/></b>
+                                        <t t-if="record.planned_revenue.raw_value">
+                                            - <b><t t-esc="record.planned_revenue.value"/>
+                                            <field name="company_currency"/></b>
+                                        </t>
+                                    </div>
+                                    <div>
+                                        <field name="partner_id"/>
+                                    </div>
+                                    <div style="padding-left: 0.5em">
+                                        <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
+                                        <span t-attf-class="#{red || ''}"><field name="date_action"/></span>
+                                        <t t-if="record.date_action.raw_value"> : </t>
+                                        <field name="title_action"/>
+                                    </div>
+                                    <div class="oe_kanban_bottom_right">
+                                        <a t-if="record.priority.raw_value == 1" type="object" name="set_normal_priority" class="oe_e oe_star_on">7</a>
+                                        <a t-if="record.priority.raw_value != 1" type="object" name="set_high_priority" class="oe_e oe_star_off">7</a>
+                                        <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                    </div>
+                                    <div class="oe_kanban_footer_left">
+                                        <t t-raw="record.message_summary.raw_value"/>
+                                    </div>
                                 </div>
+                                <div class="oe_clear"></div>
                             </div>
-                            <div class="oe_clear"></div>
-                        </div>
-                        <!--
-                            <div class="oe_kanban_right">
-                                <a name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="kanban-stop" />
-                                <a name="case_pending" string="Pending" states="draft,open" type="object" icon="kanban-pause" />
-                                <a name="case_open" string="Open" states="pending" type="object" icon="gtk-media-play" />
-                                <a name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="kanban-apply" />
-                            </div>
-                        -->
-                    </t>
-                </templates>
-            </kanban>
-        </field>
-    </record>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
 
-    <!-- CRM Lead Search View -->
-    <record id="view_crm_case_leads_filter" model="ir.ui.view">
-        <field name="name">CRM - Leads Search</field>
-        <field name="model">crm.lead</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Search Leads">
-                <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
-                <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]" />
-                <!-- subjects is not set as store=True so, it is placed outside filter_domain-->
-                <field name="subjects"/>
-                <field name="create_date"/>
-                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
-                <separator/>
-                <filter icon="terp-check" string="New" name="new" help="New Leads" domain="[('state','=','draft')]"/>
-                <filter icon="terp-camera_test" string="Open" name="open" domain="[('state','=','open')]"/>
-                <separator/>
-                <filter string="Unassigned Leads" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Leads" />
-                <separator/>
-                <filter string="Leads Assigned to Me or My Team(s)" icon="terp-personal+" context="{'invisible_section': False}"
-                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                        help="Leads that are assigned to one of the sale teams I manage, or to me"/>
-                <field name="user_id"/>
-                <field name="section_id" context="{'invisible_section': False}"/>
-                <field name="country_id" context="{'invisible_country': False}"/>
-                <group expand="0" string="Group By...">
-                    <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                    <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
-                    <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
-                    <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" />
-                    <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
-                    <separator orientation="vertical"/>
-                    <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
-                        domain="[]" context="{'group_by':'type_id'}" />
-                    <filter string="Channel" icon="terp-call-start"
-                        domain="[]" context="{'group_by':'channel_id'}" />
-                    <separator orientation="vertical"/>
-                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Creation" help="Create date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
-                </group>
-                <group string="Display">
-                    <filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/>
-                    <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
-                </group>
-           </search>
-        </field>
-    </record>
+        <!-- CRM Lead Search View -->
+        <record id="view_crm_case_leads_filter" model="ir.ui.view">
+            <field name="name">CRM - Leads Search</field>
+            <field name="model">crm.lead</field>
+            <field name="arch" type="xml">
+                <search string="Search Leads">
+                    <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
+                    <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]"/>
+                    <field name="create_date"/>
+                    <filter icon="terp-mail-message-new" string="Unread Messages" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
+                    <separator/>
+                    <filter icon="terp-check" string="New" name="new" help="New Leads" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-camera_test" string="In Progress" name="open" domain="[('state','=','open')]"/>
+                    <separator/>
+                    <filter string="Unassigned Leads" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Leads"/>
+                    <separator/>
+                    <filter string="Leads Assigned to Me or My Team(s)" icon="terp-personal+" context="{'invisible_section': False}"
+                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                            help="Leads that are assigned to one of the sale teams I manage, or to me"/>
+                    <field name="user_id"/>
+                    <field name="section_id" context="{'invisible_section': False}"/>
+                    <field name="country_id" context="{'invisible_country': False}"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
+                        <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
+                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/>
+                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Creation" help="Create date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
+                    </group>
+                    <group string="Display">
+                        <filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/>
+                        <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
+                    </group>
+               </search>
+            </field>
+        </record>
 
 
-    <!--
-        OPPORTUNITY
+        <!--
+            OPPORTUNITY
         -->
 
-    <!-- Opportunities Form View -->
-    <record model="ir.ui.view" id="crm_case_form_view_oppor">
-        <field name="name">Opportunities</field>
-        <field name="model">crm.lead</field>
-        <field name="type">form</field>
-        <field name="priority">20</field>
-        <field name="arch" type="xml">
-            <form string="Opportunities" version="7.0">
-                <header>
-                    <button name="stage_previous" string="Previous" type="object"
-                            states="open" context="{'stage_type': 'opportunity'}"/>
-                    <button name="stage_next" string="Next" type="object"  
-                            states="open" context="{'stage_type': 'opportunity'}"/>
-                    <button name="case_mark_won" string="Mark Won" type="object"
-                            states="open" class="oe_highlight"/>
-                    <button name="case_mark_won" string="Mark Won" type="object"
-                            states="draft,pending"/>
-                    <button name="case_open" string="Open" type="object" class="oe_highlight"
-                            states="draft,pending"/>
-                    <button name="case_escalate" string="Escalate" type="object"
-                            states="open" />
-                    <button name="case_mark_lost" string="Mark Lost" type="object"
-                            states="draft,open"/>
-                    <button name="case_reset" string="Reset to Draft" type="object"
-                            states="done,cancel" />
-                    <button name="case_cancel" string="Cancel" type="object"
-                            states="draft"/>
-                    <field name="stage_id" widget="statusbar"
-                            on_change="onchange_stage_id(stage_id)"/>
-                </header>
-                <sheet>
-                    <div class="oe_right oe_button_box">
-                        <button string="Schedule/Log Call"
-                            name="%(opportunity2phonecall_act)d"
-                            type="action"/>
-                        <button string="Schedule Meeting"
-                            name="action_makeMeeting"
-                            type="object"/>
-                    </div>
-                    <div class="oe_title">
-                        <label for="name" class="oe_edit_only"/>
-                        <h1><field name="name"/></h1>
-                        <label for="planned_revenue" class="oe_edit_only"/>
-                        <h2>
-                            <field name="planned_revenue" class="oe_inline"/>
-                            <field name="company_currency" class="oe_inline"/> at 
-                            <field name="probability" class="oe_inline"/>%% success rate
-                        </h2>
-                    </div>
-                    <group>
-                        <group>
-                            <field name="partner_id"
-                                on_change="onchange_partner_id(partner_id, email_from)"
-                                string="Customer"
-                                context="{'default_name': partner_name, 'default_email': email_from, 'default_phone': phone}"/>
-                            <field name="email_from" string="Email"/>
-                            <field name="phone"/>
-                        </group>
-
-                        <group>
-                            <label for="title_action"/>
-                            <div>
-                                <field name="date_action" nolabel="1"/> <label string="-" attrs="{'invisible': ['|', ('date_action', '=', False), ('title_action', '=', False)]}"/>
-                                <field name="title_action" class="oe_inline" nolabel="1" placeholder="Call for proposal"/>
-                            </div>
-                            <field name="date_deadline"/>
-                            <field name="priority"/>
-                        </group>
-
-                        <group>
-                            <field name="user_id"/>
-                            <field name="section_id" colspan="1" widget="selection"/>
-                        </group>
+        <!-- Opportunities Form View -->
+        <record model="ir.ui.view" id="crm_case_form_view_oppor">
+            <field name="name">Opportunities</field>
+            <field name="model">crm.lead</field>
+            <field name="priority">20</field>
+            <field name="arch" type="xml">
+                <form string="Opportunities" version="7.0">
+                    <header>
+                        <button name="case_mark_won" string="Mark Won" type="object"
+                                states="draft,open,pending" class="oe_highlight"/>
+                        <button name="case_mark_lost" string="Mark Lost" type="object"
+                                states="draft,open" class="oe_highlight"/>
+                        <field name="stage_id" widget="statusbar" clickable="True"/>
+                    </header>
+                    <sheet>
+                        <div class="oe_right oe_button_box">
+                            <button string="Schedule/Log Call"
+                                name="%(opportunity2phonecall_act)d"
+                                type="action"/>
+                            <button string="Meeting"
+                                name="action_makeMeeting"
+                                type="object"
+                                context="{'search_default_attendee_id': active_id, 'default_attendee_id' : active_id}"
+                               />
+                        </div>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1><field name="name"/></h1>
+                            <label for="planned_revenue" class="oe_edit_only"/>
+                            <h2>
+                                <field name="company_currency" invisible="1"/>
+                                <field name="planned_revenue" class="oe_inline" widget='monetary' options="{'currency_field': 'company_currency'}"/>
+                                <span class="oe_grey"> at </span>
+                                <field name="probability" class="oe_inline" widget="integer"/>%%
+                            </h2>
+                        </div>
                         <group>
-                            <field name="categ_ids"
-                                string="Categories" widget="many2many_tags"
-                                domain="[('object_id.model', '=', 'crm.lead')]"/>
-
-                        </group>
-                    </group>
-
-                                    <!--<button string="Mail"
-                                        name="%(mail.action_email_compose_message_wizard)d"
-                                        context="{'mail':'new', 'model': 'crm.lead'}"
-                                        icon="terp-mail-message-new" type="action" />-->
+                            <group>
+                                <field name="partner_id"
+                                    on_change="onchange_partner_id(partner_id, email_from)"
+                                    string="Customer"
+                                    context="{'default_name': partner_name, 'default_email': email_from, 'default_phone': phone}"/>
+                                <field name="email_from" string="Email"/>
+                                <field name="phone"/>
+                            </group>
 
-                    <notebook colspan="4">
-                    <page string="Internal Notes">
-                        <field name="description"/>
-                    </page>
-                    <page string="Lead">
-                        <group>
                             <group>
-                                <field name="partner_name"/>
-                                <label for="street" string="Address"/>
+                                <label for="title_action"/>
                                 <div>
-                                    <field name="street" placeholder="Street..."/>
-                                    <field name="street2"/>
-                                    <div class="address_format">
-                                        <field name="city" placeholder="City" style="width: 40%%"/>
-                                        <field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%"/>
-                                        <field name="zip" placeholder="ZIP" style="width: 34%%"/>
-                                    </div>
-                                    <field name="country_id" placeholder="Country"/>
+                                    <field name="date_action" nolabel="1"/> <label string="-" attrs="{'invisible': ['|', ('date_action', '=', False), ('title_action', '=', False)]}"/>
+                                    <field name="title_action" class="oe_inline" nolabel="1" placeholder="e.g. Call for proposal"/>
                                 </div>
+                                <field name="date_deadline"/>
+                                <field name="priority"/>
                             </group>
 
                             <group>
-                                <label for="contact_name" />
+                                <field name="user_id"/>
+                                <label for="section_id"/>
                                 <div>
-                                    <field name="contact_name" class="oe_inline"/>
-                                    <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline oe_no_button"/>
+                                    <field name="section_id" widget="selection"/>
+                                    <button name="case_escalate" string="Escalate" type="object" class="oe_link"
+                                        attrs="{'invisible': [('section_id', '=', False)]}"/>
                                 </div>
-                                <field name="function" />
-                                <field name="mobile"/>
-                                <field name="fax"/>
                             </group>
+                            <group>
+                                <field name="categ_ids"
+                                    string="Categories" widget="many2many_tags"
+                                    domain="[('object_id.model', '=', 'crm.lead')]"/>
 
-                            <group string="Categorization">
-                                <field name="type_id" widget="selection"/>
-                                <field name="channel_id" widget="selection"/>
-                            </group>
-                            <group string="Mailings">
-                                <field name="opt_out" />
                             </group>
-                            <group string="Misc">
-                                <field name="active"/>
-                                <field name="day_open" groups="base.group_no_one"/>
-                                <field name="day_close" groups="base.group_no_one"/>
-                                <field name="referred"/>
-                                <field name="state" groups="base.group_no_one"/>
-                                <field name="type" invisible="1"/>
+                        </group>
+
+                        <notebook colspan="4">
+                        <page string="Internal Notes">
+                            <field name="description"/>
+                        </page>
+                        <page string="Lead">
+                            <group>
+                                <group>
+                                    <field name="partner_name"/>
+                                    <label for="street" string="Address"/>
+                                    <div>
+                                        <field name="street" placeholder="Street..."/>
+                                        <field name="street2"/>
+                                        <div class="address_format">
+                                            <field name="city" placeholder="City" style="width: 40%%"/>
+                                            <field name="state_id" options='{"no_open": True}' on_change="onchange_state(state_id)" placeholder="State" style="width: 24%%"/>
+                                            <field name="zip" placeholder="ZIP" style="width: 34%%"/>
+                                        </div>
+                                        <field name="country_id" placeholder="Country" options='{"no_open": True}'/>
+                                    </div>
+                                </group>
+
+                                <group>
+                                    <label for="contact_name"/>
+                                    <div>
+                                        <field name="contact_name" class="oe_inline"/>
+                                        <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" options='{"no_open": True}' class="oe_inline"/>
+                                    </div>
+                                    <field name="function"/>
+                                    <field name="mobile"/>
+                                    <field name="fax"/>
+                                </group>
+
+                                <group string="Categorization">
+                                    <field name="type_id" />
+                                    <field name="channel_id" widget="selection"/>
+                                </group>
+                                <group string="Mailings">
+                                    <field name="opt_out"/>
+                                </group>
+                                <group string="Misc">
+                                    <field name="active"/>
+                                    <field name="day_open" groups="base.group_no_one"/>
+                                    <field name="day_close" groups="base.group_no_one"/>
+                                    <field name="referred"/>
+                                    <field name="state" invisible="1"/>
+                                    <field name="type" invisible="1"/>
+                                </group>
+                                <group string="References">
+                                    <field name="ref"/>
+                                    <field name="ref2"/>
+                                </group>
                             </group>
-                            <group string="References">
-                                <field name="ref"/>
-                                <field name="ref2"/>
+                        </page>
+                        <page string="Fund Raising" groups="crm.group_fund_raising">
+                            <group>
+                                <field name="payment_mode" widget="selection"/>
+                                <field name="planned_cost"/>
                             </group>
-                        </group>
-                    </page>
-                    </notebook>
-                </sheet>
-                <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
-                </div>
-            </form>
-        </field>
-    </record>
+                        </page>
+                        </notebook>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
+                </form>
+            </field>
+        </record>
 
         <!-- Opportunities Tree View -->
         <record model="ir.ui.view" id="crm_case_tree_view_oppor">
             <field name="name">Opportunities Tree</field>
             <field name="model">crm.lead</field>
-            <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)">
+                <tree string="Opportunities" fonts="bold:message_unread==True" colors="gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
                     <field name="date_deadline" invisible="1"/>
                     <field name="create_date" groups="base.group_no_one"/>
                     <field name="name" string="Opportunity"/>
                     <field name="partner_id" string="Customer"/>
-                    <field name="country_id" invisible="context.get('invisible_country', True)" />
+                    <field name="country_id" invisible="context.get('invisible_country', True)"/>
                     <field name="date_action"/>
-                    <field name="title_action" />
+                    <field name="title_action"/>
                     <field name="channel_id" invisible="1"/>
                     <field name="type_id" invisible="1"/>
-                    <field name="subjects" invisible="1"/>
                     <field name="stage_id"/>
                     <field name="planned_revenue" sum="Expected Revenues"/>
                     <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
-                    <field name="section_id" invisible="context.get('invisible_section', True)" />
+                    <field name="section_id" invisible="context.get('invisible_section', True)"/>
                     <field name="user_id"/>
                     <field name="priority" invisible="1"/>
                     <field name="state" groups="base.group_no_one"/>
-                    <field name="needaction_pending" invisible="1"/>
+                    <field name="message_unread" invisible="1"/>
                 </tree>
             </field>
         </record>
 
 
-    <!-- Opportunities Search View -->
-    <record id="view_crm_case_opportunities_filter" model="ir.ui.view">
-        <field name="name">CRM - Opportunities Search</field>
-        <field name="model">crm.lead</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Search Opportunities">
-                <field name="name" string="Opportunity / Customer"
-                    filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
-                <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]" />
-                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
-                <separator/>
-                <filter icon="terp-check" string="New" help="New Opportunities" name="new" domain="[('state','=','draft')]"/>
-                <filter icon="terp-camera_test" string="Open" help="Open Opportunities" name="open" domain="[('state','=','open')]"/>
-                <separator/>
-                <filter string="Unassigned Opportunities" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Opportunities" />
-                <separator/>
-                <filter string="Opportunities Assigned to Me or My Team(s)"  icon="terp-personal+"
-                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
-                        help="Opportunities that are assigned to either me or one of the sale teams I manage" />
-                <field name="user_id"/>
-                <field name="country_id"/>
-                <field name="partner_id"/>
-                <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
-                <group expand="0" string="Group By..." colspan="16">
-                    <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
-                    <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
-                    <filter string="Customer" help="Partner" icon="terp-personal+" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
-                    <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
-                    <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/>
-                    <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
-                    <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
-                </group>
-                <group string="Display">
-                    <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
-                </group>
-            </search>
-        </field>
-    </record>
+        <!-- Opportunities Search View -->
+        <record id="view_crm_case_opportunities_filter" model="ir.ui.view">
+            <field name="name">CRM - Opportunities Search</field>
+            <field name="model">crm.lead</field>
+            <field name="arch" type="xml">
+                <search string="Search Opportunities">
+                    <field name="name" string="Opportunity / Customer"
+                        filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
+                    <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]"/>
+                    <filter icon="terp-mail-message-new" string="Unread Messages" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
+                    <separator/>
+                    <filter icon="terp-check" string="New" help="New Opportunities" name="new" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-camera_test" string="In Progress" help="Open Opportunities" name="open" domain="[('state','=','open')]"/>
+                    <separator/>
+                    <filter string="Unassigned Opportunities" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Opportunities"/>
+                    <separator/>
+                    <filter string="Opportunities Assigned to Me or My Team(s)"  icon="terp-personal+"
+                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
+                            help="Opportunities that are assigned to either me or one of the sale teams I manage"/>
+                    <field name="user_id"/>
+                    <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
+                    <field name="partner_id"/>
+                    <group expand="0" string="Group By..." colspan="16">
+                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
+                        <filter string="Customer" help="Partner" icon="terp-personal+" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}"/>
+                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/>
+                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}"/>
+                        <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
+                        <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}"/>
+                    </group>
+                    <group string="Display">
+                        <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
+                    </group>
+                </search>
+            </field>
+        </record>
 
     </data>
 </openerp>