diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 19ec87666da..86d5d30382b 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -78,6 +78,11 @@ class crm_case_stage(osv.osv):
         'state': fields.selection(AVAILABLE_STATES, 'State', required=True, help="The related state for the stage. The state of your document will automatically change regarding the selected stage. For example, if a stage is related to the state 'Close', when your document reaches this stage, it will be automatically have the 'closed' state."),
         'case_default': fields.boolean('Common to All Teams', help="If you check this field, this stage will be proposed by default on each sales team. It will not assign this stage to existing teams."),
         'fold': fields.boolean('Hide in Views when Empty', help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
+        'type': fields.selection([  ('lead','Lead'),
+                                    ('opportunity', 'Opportunity'),
+                                    ('both', 'Both')],
+                                    string='Type', size=16, required=True,
+                                    help="This field is used to distinguish stages related to Leads from stages related to Opportunities, or to specify stages available for both types."),
     }
 
     _defaults = {
@@ -85,6 +90,7 @@ class crm_case_stage(osv.osv):
         'probability': lambda *args: 0.0,
         'state': 'draft',
         'fold': False,
+        'type': 'both',
     }
 
 class crm_case_section(osv.osv):
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index a1816649317..20cbb0691f5 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -11,49 +11,76 @@
             <field eval="1" name="case_default"/>
             <field name="state">draft</field>
             <field eval="'10'" name="probability"/>
-            <field eval="'11'" name="sequence"/>
+            <field eval="'10'" name="sequence"/>
+            <field name="type">both</field>
         </record>
         <record model="crm.case.stage" id="stage_lead2">
+            <field name="name">Opportunity</field>
+            <field eval="1" name="case_default"/>
+            <field name="state">open</field>
+            <field eval="'20'" name="probability"/>
+            <field eval="'11'" name="sequence"/>
+            <field name="type">lead</field>
+        </record>
+        <record model="crm.case.stage" id="stage_lead3">
             <field name="name">Qualification</field>
             <field eval="1" name="case_default"/>
             <field name="state">open</field>
             <field eval="'20'" name="probability"/>
             <field eval="'12'" name="sequence"/>
+            <field name="type">opportunity</field>
         </record>
-        <record model="crm.case.stage" id="stage_lead3">
+        <record model="crm.case.stage" id="stage_lead4">
             <field name="name">Proposition</field>
             <field eval="1" name="case_default"/>
             <field name="state">open</field>
             <field eval="'40'" name="probability"/>
             <field eval="'13'" name="sequence"/>
+            <field name="type">opportunity</field>
         </record>
-        <record model="crm.case.stage" id="stage_lead4">
+        <record model="crm.case.stage" id="stage_lead5">
             <field name="name">Negotiation</field>
             <field eval="1" name="case_default"/>
             <field name="state">open</field>
             <field eval="'60'" name="probability"/>
             <field eval="'14'" name="sequence"/>
+            <field name="type">opportunity</field>
         </record>
-        <record model="crm.case.stage" id="stage_lead5">
+        <record model="crm.case.stage" id="stage_lead6">
             <field name="name">Won</field>
             <field eval="1" name="case_default"/>
             <field name="state">done</field>
             <field eval="'100'" name="probability"/>
             <field eval="'15'" name="sequence"/>
             <field eval="1" name="on_change"/>
+            <field name="type">opportunity</field>
         </record>
-        <record model="crm.case.stage" id="stage_lead6">
+        <record model="crm.case.stage" id="stage_lead7">
+            <field name="name">Dead</field>
+            <field eval="1" name="case_default"/>
+            <field eval="True" name="fold"/>
+            <field name="state">cancel</field>
+            <field eval="'0'" name="probability"/>
+            <field eval="'16'" name="sequence"/>
+            <field name="type">lead</field>
+        </record>
+        <record model="crm.case.stage" id="stage_lead8">
             <field name="name">Lost</field>
             <field eval="1" name="case_default"/>
             <field eval="True" name="fold"/>
             <field name="state">cancel</field>
             <field eval="'0'" name="probability"/>
             <field eval="'17'" name="sequence"/>
+            <field name="type">opportunity</field>
         </record>
+        
         <record model="crm.case.section" id="section_sales_department">
             <field name="name">Sales Department</field>
             <field name="code">Sales</field>
-            <field name="stage_ids" eval="[(4, ref('stage_lead1')), (4, ref('stage_lead2')), (4, ref('stage_lead3')), (4, ref('stage_lead4')), (4, ref('stage_lead5')), (4, ref('stage_lead6'))]"/>
+            <field name="stage_ids" eval="[ (4, ref('stage_lead1')), (4, ref('stage_lead2')),
+                                            (4, ref('stage_lead3')), (4, ref('stage_lead4')),
+                                            (4, ref('stage_lead5')), (4, ref('stage_lead6')),
+                                            (4, ref('stage_lead7')), (4, ref('stage_lead8'))]"/>
         </record>
 
         <!-- Crm campain -->
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 4dbe1405c4d..00bf0c33267 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -14,6 +14,8 @@
             <field name="arch" type="xml">
                 <search string="Stage Search">
                     <field name="name"/>
+                    <field name="state"/>
+                    <field name="type"/>
                 </search>
             </field>
         </record>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index a11e6a4ecec..c8f019e685b 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -144,6 +144,7 @@
                     <field name="name"/>
                     <field name="probability"/>
                     <field name="state"/>
+                    <field name="type"/>
                 </tree>
             </field>
         </record>
@@ -164,6 +165,8 @@
                         <field name="case_default"/>
                         <field name="sequence"/>
                         <field name="state"/>
+                        <field name="fold"/>
+                        <field name="type"/>
                     </group>
                     <separator string="Requirements" colspan="4"/>
                     <field name="requirements" nolabel="1" colspan="4"/>