diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 76ac424f1e0..6631413033d 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -538,7 +538,7 @@ class crm_case_section(osv.osv):
         'resource_calendar_id': fields.many2one('resource.calendar', "Resource's Calendar"),
         'note': fields.text('Description'),
         'working_hours': fields.float('Working Hours', digits=(16,2 )), 
-        'stage_ids':fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'),
+        'stage_ids': fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'),
     }
 
     _defaults = {
@@ -628,6 +628,14 @@ class crm_case_categ(osv.osv):
 crm_case_categ()
 
 
+class crm_case_stage(osv.osv):
+    _inherit = "crm.case.stage"
+    _columns = {
+        'section_ids':fields.many2many('crm.case.section', 'section_stage_rel', 'stage_id', 'section_id', 'Sections'),
+    }
+crm_case_stage()
+
+
 class crm_case_resource_type(osv.osv):
     """ Resource Type of case """
     _name = "crm.case.resource.type"
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index fc7a7dfdb73..702cddeaf16 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -55,7 +55,7 @@
                     <newline />
                     <field name="section_id" widget="selection" />
                     <field name="user_id" />
-                    <field name="stage_id" readonly="1"/>
+                    <field name="stage_id" domain="[('object_id.model', '=', 'crm.lead'), ('section_ids', '=', section_id)]"/>
                     <group col="2" colspan="1">
                         <button name="stage_previous" string="Previous"
                             states="open,pending,draft" type="object"
@@ -234,7 +234,7 @@
                 <field name="referred" invisible="1"/>
                 <field name="channel_id" invisible="1"/>
 
-                <field name="stage_id" readonly="1"/>
+                <field name="stage_id"/>
                 <button name="stage_previous" string="Previous Stage"
                     states="open,pending" type="object" icon="gtk-go-back" />
                 <button name="stage_next" string="Next Stage"
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 86bb99633ac..5b45af19398 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -14,9 +14,8 @@
                             <label string="Stage:" align="1.0"/>
                             <group colspan="1" col="4">
                                 <field name="stage_id" nolabel="1"
-                                    widget="selection"
                                     on_change="onchange_stage_id(stage_id)"
-                                    domain="[('object_id.model', '=', 'crm.lead')]"/>
+                                    domain="[('object_id.model', '=', 'crm.lead'), ('section_ids', '=', section_id)]"/>
                                 <button name="stage_previous"
                                     states="draft,open,pending" type="object"
                                     icon="gtk-go-back" string="" />
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index ea1d9e543ff..7a75353608c 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -107,11 +107,10 @@
                                 <group colspan="4" col="6">
                                     <field name="user_id" string="Responsible"/>
                                     <field name="section_id" widget="selection"/>
-                                    <label string="Stage: " align="1.0"/>
-                                    <group colspan="1" col="3">
-                                        <field name="stage_id" nolabel="1" readonly="1"
+                                    <group colspan="2" col="4">
+                                        <field name="stage_id"
                                             on_change="onchange_stage_id(stage_id)"
-                                            domain="[('object_id.model', '=', 'crm.claim')]" />
+                                            domain="[('object_id.model', '=', 'crm.claim'), ('section_ids', '=', section_id)]" />
                                         <button name="stage_previous" string="" type="object" icon="gtk-go-back" />
                                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                                     </group>