diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 19987f8f61a..91219713758 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -8,14 +8,13 @@
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="'The Oil Company'" name="partner_name"/>
-            <field eval="'draft'" name="state"/>
             <field name="section_id" ref="crm.section_sales_marketing_department"/>
             <field eval="'Luc Latour'" name="contact_name"/>
             <field name="title" ref="base.res_partner_title_sir"/>
-        <field eval="'Training Manager'" name="function"/>
-        <field eval="'Paris'" name="city"/>
-        <field name="country_id" ref="base.fr"/>
-        <field eval="'luc.latour@oilcompany.fr'" name="email_from"/>
+            <field eval="'Training Manager'" name="function"/>
+            <field eval="'Paris'" name="city"/>
+            <field name="country_id" ref="base.fr"/>
+            <field eval="'luc.latour@oilcompany.fr'" name="email_from"/>
             <field eval="'0033 621 782-0636'" name="mobile"/>
             <field eval="1" name="active"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
@@ -29,13 +28,12 @@
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="'Le Club SARL'" name="partner_name"/>
-        <field eval="'Marc Dufour'" name="contact_name"/>
+            <field eval="'Marc Dufour'" name="contact_name"/>
             <field name="title" ref="base.res_partner_title_sir"/>
-        <field eval="'Purchase Manager'" name="function"/>
-        <field eval="'Bordeaux'" name="city"/>
-        <field name="country_id" ref="base.fr"/>
-        <field eval="'md@leclub.fr'" name="email_from"/>
-            <field eval="'draft'" name="state"/>
+            <field eval="'Purchase Manager'" name="function"/>
+            <field eval="'Bordeaux'" name="city"/>
+            <field name="country_id" ref="base.fr"/>
+            <field eval="'md@leclub.fr'" name="email_from"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(392) 895-7917'" name="mobile"/>
             <field eval="1" name="active"/>
@@ -50,10 +48,9 @@
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_demo"/>
             <field eval="'The Kompany'" name="partner_name"/>
-        <field eval="'John Miller'" name="contact_name"/>
-        <field eval="'New-York'" name="city"/>
-        <field name="country_id" ref="base.us"/>
-            <field eval="'draft'" name="state"/>
+            <field eval="'John Miller'" name="contact_name"/>
+            <field eval="'New-York'" name="city"/>
+            <field name="country_id" ref="base.us"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(820) 167-3208'" name="mobile"/>
             <field eval="1" name="active"/>
@@ -68,10 +65,9 @@
             <field eval="'3'" name="priority"/>
             <field name="type">lead</field>
             <field eval="'The Gas Company'" name="partner_name"/>
-        <field eval="'Henry Mc Coy'" name="contact_name"/>
-        <field eval="'London'" name="city"/>
-        <field name="country_id" ref="base.uk"/>
-            <field eval="'draft'" name="state"/>
+            <field eval="'Henry Mc Coy'" name="contact_name"/>
+            <field eval="'London'" name="city"/>
+            <field name="country_id" ref="base.uk"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(077) 582-4035'" name="mobile"/>
             <field eval="1" name="active"/>
@@ -87,11 +83,10 @@
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="'Stonage IT'" name="partner_name"/>
-        <field eval="'Carrie Helle'" name="contact_name"/>
-        <field eval="'Purchase Manager'" name="function"/>
-        <field eval="'Bruxelles'" name="city"/>
-        <field name="country_id" ref="base.be"/>
-            <field eval="'draft'" name="state"/>
+            <field eval="'Carrie Helle'" name="contact_name"/>
+            <field eval="'Purchase Manager'" name="function"/>
+            <field eval="'Bruxelles'" name="city"/>
+            <field name="country_id" ref="base.be"/>
             <field name="section_id" ref="crm.section_sales_marketing_department"/>
             <field eval="'(333) 715-1450'" name="mobile"/>
             <field eval="1" name="active"/>
@@ -110,11 +105,10 @@
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="'Opensides'" name="partner_name"/>
-        <field eval="'Tina Pinero'" name="contact_name"/>
-        <field eval="'Consultant'" name="function"/>
-        <field eval="'Roma'" name="city"/>
-        <field name="country_id" ref="base.it"/>
-            <field eval="'draft'" name="state"/>
+            <field eval="'Tina Pinero'" name="contact_name"/>
+            <field eval="'Consultant'" name="function"/>
+            <field eval="'Roma'" name="city"/>
+            <field name="country_id" ref="base.it"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(468) 017-2684'" name="mobile"/>
             <field name="categ_id" ref="crm.categ_oppor8"/>
@@ -130,11 +124,10 @@
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_demo"/>
             <field eval="'Gardner Group'" name="partner_name"/>
-        <field eval="'Wendi Baltz'" name="contact_name"/>
-        <field eval="'Journalist'" name="function"/>
-        <field eval="'Kiev'" name="city"/>
-        <field name="country_id" ref="base.ua"/>
-            <field eval="'draft'" name="state"/>
+            <field eval="'Wendi Baltz'" name="contact_name"/>
+            <field eval="'Journalist'" name="function"/>
+            <field eval="'Kiev'" name="city"/>
+            <field name="country_id" ref="base.ua"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(463) 014-1208'" name="mobile"/>
             <field name="categ_id" ref="crm.categ_oppor4"/>
@@ -149,17 +142,16 @@
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_demo"/>
             <field eval="'Survey'" name="name"/>
-            <field eval="'open'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor6"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
             <field eval="'Survey Expert'" name="partner_name"/>
-        <field eval="'John Smith'" name="contact_name"/>
-        <field eval="'Sales'" name="function"/>
-        <field eval="'Cambridge'" name="city"/>
-        <field name="country_id" ref="base.uk"/>
+            <field eval="'John Smith'" name="contact_name"/>
+            <field eval="'Sales'" name="function"/>
+            <field eval="'Cambridge'" name="city"/>
+            <field name="country_id" ref="base.uk"/>
             <field eval="'smith_john@gmail.com'" name="email_from"/>
-        <field eval="'(282) 596-8584'" name="phone"/>
+            <field eval="'(282) 596-8584'" name="phone"/>
         </record>
         <record id="crm_case_business_card0" model="crm.lead">
             <field eval="1" name="active"/>
@@ -168,17 +160,16 @@
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="'Partnership'" name="name"/>
-            <field eval="'open'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
             <field eval="'Marketing Business'" name="partner_name"/>
-        <field eval="'Laure Smith'" name="contact_name"/>
-        <field eval="'Sales'" name="function"/>
-        <field eval="'Oxford'" name="city"/>
-        <field name="country_id" ref="base.uk"/>
+            <field eval="'Laure Smith'" name="contact_name"/>
+            <field eval="'Sales'" name="function"/>
+            <field eval="'Oxford'" name="city"/>
+            <field name="country_id" ref="base.uk"/>
             <field eval="'l.smith@marketing-business.com'" name="email_from"/>
-        <field eval="'(252) 578-7894'" name="phone"/>
+            <field eval="'(252) 578-7894'" name="phone"/>
         </record>
         <record id="crm_case_imported_contact0" model="crm.lead">
             <field eval="1" name="active"/>
@@ -186,7 +177,6 @@
             <field eval="'2'" name="priority"/>
             <field name="type">lead</field>
             <field eval="'Info'" name="name"/>
-            <field eval="'cancel'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="stage_id" ref="crm.stage_lead2"/>
             <field eval="'Business Group'" name="partner_name"/>
@@ -198,12 +188,11 @@
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_demo"/>
             <field eval="'Need Info about Onsite Intervention'" name="name"/>
-            <field eval="'draft'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor3"/>
             <field name="stage_id" ref="crm.stage_lead2"/>
             <field eval="'Agrolait'" name="partner_name"/>
-        <field eval="'Sylvie Lelitre'" name="contact_name"/>
+            <field eval="'Sylvie Lelitre'" name="contact_name"/>
         </record>
         <record id="crm_case_company_partnership0" model="crm.lead">
             <field eval="1" name="active"/>
@@ -212,7 +201,6 @@
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_demo"/>
             <field eval="'Need Quotation for 100 PC and 100 Keyboards'" name="name"/>
-            <field eval="'done'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor1"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
@@ -245,7 +233,6 @@
             <field name="partner_id" ref="base.res_partner_3"/>
             <field eval="'3'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="'open'" name="state"/>
             <field eval="'150000'" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor1"/>
@@ -260,7 +247,6 @@
             <field name="partner_id" ref="base.res_partner_9"/>
             <field eval="'3'" name="priority"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field eval="'draft'" name="state"/>
             <field eval="45000.0" name="planned_revenue"/>
             <field eval="35" name="probability"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -283,7 +269,6 @@
             <field name="partner_id" ref="base.res_partner_lucievonck0"/>
             <field eval="'3'" name="priority"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field eval="'draft'" name="state"/>
             <field eval="30000.0" name="planned_revenue"/>
             <field eval="30" name="probability"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -299,14 +284,13 @@
             <field eval="1367" name="zip"/>
             <field name="country_id" ref="base.be"/>
         </record>
-       <record id="crm_case_unifliege" model="crm.lead">
+        <record id="crm_case_unifliege" model="crm.lead">
             <field eval="1" name="active"/>
             <field name="type">opportunity</field>
             <field name="type_id" ref="crm.type_lead2"/>
             <field name="partner_id" ref="base.res_partner_accent"/>
             <field eval="'3'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="'open'" name="state"/>
             <field eval="2500.0" name="planned_revenue"/>
             <field eval="25" name="probability"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -323,14 +307,13 @@
             <field eval="75016" name="zip"/>
             <field name="country_id" ref="base.be"/>
         </record>
-       <record id="crm_case_bankwealthy2" model="crm.lead">
+        <record id="crm_case_bankwealthy2" model="crm.lead">
             <field eval="1" name="active"/>
             <field name="type">opportunity</field>
             <field name="type_id" ref="crm.type_lead2"/>
             <field name="partner_id" ref="base.res_partner_2"/>
             <field eval="'3'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="'open'" name="state"/>
             <field eval="462.0" name="planned_revenue"/>
             <field eval="40" name="probability"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -354,7 +337,6 @@
             <field name="partner_id" ref="base.res_partner_8"/>
             <field eval="'3'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="'done'" name="state"/>
             <field eval="55000.0" name="planned_revenue"/>
             <field eval="90" name="probability"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -372,7 +354,6 @@
             <field name="partner_id" ref="base.res_partner_duboissprl0"/>
             <field eval="'3'" name="priority"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field eval="'open'" name="state"/>
             <field eval="45000.0" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
@@ -395,35 +376,32 @@
             <field name="partner_id" ref="base.res_partner_maxtor"/>
             <field eval="'3'" name="priority"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field eval="'done'" name="state"/>
             <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_lead6"/>
             <field eval="'Want to subscribe to your online solution'" name="name"/>
         </record>
-    <record id="crm_case_dirtminingltdunits0" model="crm.lead">
+        <record id="crm_case_dirtminingltdunits0" model="crm.lead">
             <field eval="30" name="probability"/>
             <field eval="1" name="active"/>
             <field name="type">opportunity</field>
             <field name="partner_id" ref="base.res_partner_tinyatwork"/>
             <field eval="'3'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="'done'" name="state"/>
             <field eval="25000.0" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor6"/>
             <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="'Interest in your Partnership Contract'" name="name"/>
         </record>
-     <record id="crm_case_dirtminingltdunits10" model="crm.lead">
+        <record id="crm_case_dirtminingltdunits10" model="crm.lead">
             <field eval="30" name="probability"/>
             <field eval="1" name="active"/>
             <field name="type">opportunity</field>
             <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
             <field eval="'3'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="'open'" name="state"/>
             <field eval="5000" name="planned_revenue"/>
             <field eval="30" name="probability"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -439,7 +417,7 @@
             <field eval="77420" name="zip"/>
             <field name="country_id" ref="base.fr"/>
         </record>
-       <record id="crm_case_construstazunits0" model="crm.lead">
+        <record id="crm_case_construstazunits0" model="crm.lead">
             <field eval="60" name="probability"/>
             <field eval="1" name="active"/>
             <field name="type">opportunity</field>
@@ -447,7 +425,6 @@
             <field name="partner_id" ref="base.res_partner_thymbra"/>
             <field eval="'3'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="'open'" name="state"/>
             <field eval="'150000'" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor1"/>
@@ -461,7 +438,7 @@
             <field eval="1659" name="zip"/>
             <field name="country_id" ref="base.ar"/>
         </record>
-       <record id="crm_case_ericdubois4" model="crm.lead">
+        <record id="crm_case_ericdubois4" model="crm.lead">
             <field eval="65" name="probability"/>
             <field eval="1" name="active"/>
             <field name="type">opportunity</field>
@@ -469,7 +446,6 @@
             <field name="partner_id" ref="base.res_partner_ericdubois0"/>
             <field eval="'3'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="'open'" name="state"/>
             <field eval="'1200'" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor1"/>
@@ -484,26 +460,24 @@
             <field eval="7000" name="zip"/>
             <field name="country_id" ref="base.be"/>
         </record>
-       <record id="crm_case_fabiendupont" model="crm.lead">
+        <record id="crm_case_fabiendupont" model="crm.lead">
             <field eval="1" name="active"/>
             <field name="type">opportunity</field>
             <field name="type_id" ref="crm.type_lead1"/>
             <field name="partner_id" ref="base.res_partner_fabiendupont0"/>
             <field eval="'3'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="'draft'" name="state"/>
             <field name="categ_id" ref="crm.categ_oppor4"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
             <field eval="'Need more info about the onsite intervention'" name="name"/>
         </record>
-       <record id="crm_case_shelvehouse" model="crm.lead">
+        <record id="crm_case_shelvehouse" model="crm.lead">
             <field eval="1" name="active"/>
             <field name="type">opportunity</field>
             <field name="type_id" ref="crm.type_lead1"/>
             <field name="partner_id" ref="base.res_partner_theshelvehouse0"/>
             <field eval="'3'" name="priority"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field eval="'draft'" name="state"/>
             <field name="categ_id" ref="crm.categ_oppor4"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
             <field eval="'Need more info about your pc2'" name="name"/>