Merge lp:~openerp-dev/openobject-addons/trunk-bug-1095373-cga into lp:openobject-addons

[Chandni Gandhi(OpenERP)]

Hello,

Set the priority field and put the calender view of opportunity instead of lead.

Thanks

[Atul Patel(OpenERP) (atp-openerp)]

hello,

it seems ok to me.

Thanks for solution and fix.

review: Approve

Unmerged revisions

8490. By Chandni Gandhi(OpenERP) on 2013-01-03

[FIX]:Set the priority field and put the calender view of the opportunity insted of lead

=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml	2012-12-26 10:33:19 +0000
+++ crm/crm_lead_view.xml	2013-01-03 11:26:26 +0000
@@ -235,19 +235,6 @@
             </field>
         </record>
 
-        <!-- CRM Lead Calendar View -->
-        <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="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"/>
-                </calendar>
-            </field>
-        </record>
 
         <!-- CRM Lead Kanban View  -->
         <record model="ir.ui.view" id="crm_case_kanban_view_leads">
@@ -363,7 +350,7 @@
         <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="priority">2</field>
             <field name="arch" type="xml">
                 <form string="Opportunities" version="7.0">
                     <header>
@@ -566,5 +553,20 @@
             </field>
         </record>
 
+        <!-- CRM Opportunities Calendar View -->
+        <record model="ir.ui.view" id="crm_case_calendar_view_opports">
+            <field name="name">Opportunities Calendar</field>
+            <field name="model">crm.lead</field>
+            <field name="priority" eval="2"/>
+            <field name="arch" type="xml">
+                <calendar string="Opportunities"
+                    date_start="date_action" color="user_id">
+                    <field name="name"/>
+                    <field name="partner_name"/>
+                </calendar>
+            </field>
+        </record>
+
+
     </data>
 </openerp>