diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 2b47140e396..41eeb529154 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -1,81 +1,105 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">
+    <data>
 
 
-<!--        CASE STATUS(stage_id)        -->
-    <record model="crm.case.stage" id="stage_lead1">
-        <field name="name">New</field>
-        <field name="section_id" ref="section_sales_department"/>
-           <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.stage" id="stage_lead2">
-        <field name="name">Assigned</field>
-        <field name="section_id" ref="section_sales_department"/>
-           <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.stage" id="stage_lead3">
-        <field name="name">In Process</field>
-        <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.stage" id="stage_lead4">
-        <field name="name">Converted</field>
-        <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.stage" id="stage_lead5">
-        <field name="name">Recycled</field>
-        <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.stage" id="stage_lead6">
-        <field name="name">Dead</field>
-        <field name="section_id" ref="section_sales_department"/>
-           <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
+        <!--        CASE STATUS(stage_id)        -->
+        <record model="crm.case.stage" id="stage_lead1">
+            <field name="name">New</field>
+            <field eval="'10'" name="probability"/>
+            <field eval="'1'" name="sequence"/>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
 
-<!--        CASE CATEGORY2(category2_id)        -->
-    <record model="crm.case.resource.type" id="type_lead1">
-        <field name="name">Telesales</field>
-        <field name="section_id" ref="section_sales_department"/>
-           <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.resource.type" id="type_lead2">
-        <field name="name">Mail</field>
-        <field name="section_id" ref="section_sales_department"/>
-           <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.resource.type" id="type_lead3">
-        <field name="name">Email</field>
-        <field name="section_id" ref="section_sales_department"/>
-           <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.resource.type" id="type_lead4">
-        <field name="name">Print</field>
-        <field name="section_id" ref="section_sales_department"/>
-           <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.resource.type" id="type_lead5">
-        <field name="name">Web</field>
-        <field name="section_id" ref="section_sales_department"/>
-           <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.resource.type" id="type_lead6">
-        <field name="name">Radio</field>
-        <field name="section_id" ref="section_sales_department"/>
-           <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.resource.type" id="type_lead7">
-        <field name="name">Television</field>
-        <field name="section_id" ref="section_sales_department"/>
-           <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.resource.type" id="type_lead8">
-        <field name="name">Newsletter</field>
-        <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
+        <record model="crm.case.stage" id="stage_lead2">
+            <field name="name">Qualification</field>
+            <field eval="'20'" name="probability"/>
+            <field eval="'2'" name="sequence"/>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
 
-</data>
+        <record model="crm.case.stage" id="stage_lead3">
+            <field name="name">Proposition</field>
+            <field eval="'40'" name="probability"/>
+            <field eval="'3'" name="sequence"/>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
+
+        <record model="crm.case.stage" id="stage_lead4">
+            <field name="name">Negotiation</field>
+            <field eval="'60'" name="probability"/>
+            <field eval="'4'" name="sequence"/>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
+
+        <record model="crm.case.stage" id="stage_lead5">
+            <field name="name">Win</field>
+            <field eval="'100'" name="probability"/>
+            <field eval="'5'" name="sequence"/>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
+
+        <record model="crm.case.stage" id="stage_lead6">
+            <field name="name">Lost</field>
+            <field eval="'0'" name="probability"/>
+            <field eval="'6'" name="sequence"/>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
+
+    <!--        CASE CATEGORY2(category2_id)        -->
+        <record model="crm.case.resource.type" id="type_lead1">
+            <field name="name">Telesales</field>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
+
+        <record model="crm.case.resource.type" id="type_lead2">
+            <field name="name">Mail</field>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
+
+        <record model="crm.case.resource.type" id="type_lead3">
+            <field name="name">Email</field>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
+
+        <record model="crm.case.resource.type" id="type_lead4">
+            <field name="name">Print</field>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
+
+        <record model="crm.case.resource.type" id="type_lead5">
+            <field name="name">Web</field>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
+
+        <record model="crm.case.resource.type" id="type_lead6">
+            <field name="name">Radio</field>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
+
+        <record model="crm.case.resource.type" id="type_lead7">
+            <field name="name">Television</field>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
+
+        <record model="crm.case.resource.type" id="type_lead8">
+            <field name="name">Newsletter</field>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        </record>
+
+    </data>
 </openerp>
diff --git a/addons/crm/crm_opportunity_data.xml b/addons/crm/crm_opportunity_data.xml
index a7cfd2d46ca..fd4d76d5865 100644
--- a/addons/crm/crm_opportunity_data.xml
+++ b/addons/crm/crm_opportunity_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">
+<data>
     <record model="crm.case.categ" id="categ_oppor1">
         <field name="name">Existing Customer</field>
         <field name="section_id" ref="section_sales_department"/>
@@ -42,43 +42,6 @@
         <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
 
-<!--        CASE STATUS(stage_id)        -->
-    <record model="crm.case.stage" id="stage_oppor1">
-        <field name="name">Prospecting</field>
-        <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.stage" id="stage_oppor2">
-        <field name="name">Needs Analysis</field>
-        <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.stage" id="stage_oppor3">
-        <field name="name">Value Proposition</field>
-        <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.stage" id="stage_oppor4">
-        <field name="name">Proposal/Price Quote</field>
-        <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.stage" id="stage_oppor5">
-        <field name="name">Negotiation/Review</field>
-        <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.stage" id="stage_oppor6">
-        <field name="name">Closed Won</field>
-        <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-    <record model="crm.case.stage" id="stage_oppor7">
-        <field name="name">Closed Lost</field>
-        <field name="section_id" ref="section_sales_department"/>
-         <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
-    </record>
-
 <!--        Case Resource(type_id)        -->
     <record model="crm.case.resource.type" id="type_oppor1">
         <field name="name">Existing Business</field>
diff --git a/addons/crm/crm_opportunity_demo.xml b/addons/crm/crm_opportunity_demo.xml
index 3c06d16dc19..48812b17cf0 100644
--- a/addons/crm/crm_opportunity_demo.xml
+++ b/addons/crm/crm_opportunity_demo.xml
@@ -20,7 +20,7 @@
             <field eval="85000.0" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor1"/>
-            <field name="stage_id" ref="crm.stage_oppor3"/>
+            <field name="stage_id" ref="crm.stage_lead3"/>
             <field eval="&quot;CONS TRUST (AZ) 529701 - 1000 units&quot;" name="name"/>
         </record>
         <record id="crm_case_rdroundfundingunits0" model="crm.lead">
@@ -36,7 +36,7 @@
             <field eval="50" name="probability"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
-            <field name="stage_id" ref="crm.stage_oppor1"/>
+            <field name="stage_id" ref="crm.stage_lead1"/>
             <field eval="&quot;3rd Round Funding - 1000 units &quot;" name="name"/>
         </record>
         <record id="crm_case_mediapoleunits0" model="crm.lead">
@@ -53,7 +53,7 @@
             <field eval="70" name="probability"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor7"/>
-            <field name="stage_id" ref="crm.stage_oppor5"/>
+            <field name="stage_id" ref="crm.stage_lead5"/>
             <field eval="&quot;Mediapole - 5000 units&quot;" name="name"/>
             <field eval="&quot;info@mycompany.net&quot;" name="email_from"/>
         </record>
@@ -70,7 +70,7 @@
             <field eval="45000.0" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
-            <field name="stage_id" ref="crm.stage_oppor4"/>
+            <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="&quot;ABC FUEL CO 829264 - 1000 units &quot;" name="name"/>
             <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
         </record>
@@ -86,7 +86,7 @@
             <field eval="42000.0" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor2"/>
-            <field name="stage_id" ref="crm.stage_oppor6"/>
+            <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="&quot;Dirt Mining Ltd 271742 - 1000 units&quot;" name="name"/>
         </record>
     </data>
diff --git a/addons/crm/test/test_crm_opportunity.yml b/addons/crm/test/test_crm_opportunity.yml
index e3a4f28cb5e..48a71de1dce 100644
--- a/addons/crm/test/test_crm_opportunity.yml
+++ b/addons/crm/test/test_crm_opportunity.yml
@@ -8,7 +8,7 @@
     partner_address_id: base.res_partner_address_1
     partner_id: base.res_partner_9
     probability: 1.0
-    stage_id: crm.stage_oppor1
+    stage_id: crm.stage_lead1
     categ_id: crm.categ_oppor2
     section_id: crm.section_sales_department