diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 9069bec1d17..0e078820062 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -139,9 +139,7 @@ and users"),
         ],'Type', help="Type is used to separate Leads and Opportunities"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'date_closed': fields.datetime('Closed', readonly=True),
-        'stage_id': fields.many2one('crm.case.stage', 'Stage', \
-                            domain="[('section_id','=',section_id),\
-                            ('object_id.model', '=', 'crm.lead')]"),
+        'stage_id': fields.many2one('crm.case.stage', 'Stage'),
         'user_id': fields.many2one('res.users', 'Salesman',help='By Default Salesman is Administrator when create New User'),
         'referred': fields.char('Referred By', size=64),
         'date_open': fields.datetime('Opened', readonly=True),
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 7a614a16211..39c65cb6faf 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -53,8 +53,8 @@
                     <newline />
                     <field name="section_id" widget="selection" />
                     <field name="user_id" />
-                    <field name="stage_id" widget="selection"
-                        domain="[('object_id.model', '=', 'crm.lead')]" />
+                    <field name="stage_id"
+                        domain="[('section_id','=',section_id), ('object_id.model', '=', 'crm.lead')]" />
                     <group col="2" colspan="1">
                         <button name="stage_previous" string="Previous"
                             states="open,pending" type="object"
@@ -223,7 +223,7 @@
                 <field name="type_id" invisible="1"/>
                 <field name="referred" invisible="1"/>
 
-                <field name="stage_id"/>
+                <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 5c3f3ffa8e1..5bbe4feed35 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -14,8 +14,7 @@
                             <group colspan="1" col="4">
                                 <field name="stage_id" nolabel="1"
                                 on_change="onchange_stage_id(stage_id)"
-                                widget="selection"
-                                domain="[('object_id.model', '=', 'crm.lead')]" />
+                                domain="[('section_id','=',section_id), ('object_id.model', '=', 'crm.lead')]" />
                                 <button name="stage_previous"
                                 states="open,pending" type="object"
                                 icon="gtk-go-back" string="" />
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 4086a04ee9d..bf679c4cdaa 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -133,7 +133,7 @@
                   <group  expand="0" string="Extended options..." groups="base.group_extended">
                       <field name="partner_id"/>
                       <separator orientation="vertical"/>
-                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                      <field name="stage_id" widget="selection" domain="[('section_id','=',section_id), ('object_id.model', '=', 'crm.lead')]" />
                       <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
                       <separator orientation="vertical"/>
                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 8ccd8acd0a4..85dfc8b9dd0 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -79,9 +79,7 @@ class crm_claim(osv.osv, crm.crm_case):
         'partner_name': fields.char("Employee's Name", size=64), 
         'partner_mobile': fields.char('Mobile', size=32), 
         'partner_phone': fields.char('Phone', size=32), 
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
-                         domain="[('section_id','=',section_id),\
-                         ('object_id.model', '=', 'crm.claim')]"), 
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage'), 
         'probability': fields.float('Probability (%)'), 
         'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, 
                                   help='The state is set to \'Draft\', when a case is created.\
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 75defcf3d88..a0a8a93f247 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -47,7 +47,7 @@
         </record>
 
          <menuitem action="crm_claim_resource_act" name="Resource Type"
-                id="menu_crm_claim_stage_act"
+                id="menu_crm_claim_type_act"
                 parent="menu_config_claim" />
 
         <!-- Claims    -->
@@ -125,7 +125,9 @@
                                     <field name="section_id" widget="selection"/>
                                     <label string="Stage: " align="1.0"/>
                                     <group colspan="1" col="3">
-                                        <field name="stage_id" select="1" nolabel="1"/>
+                                        <field name="stage_id" nolabel="1"
+                                            on_change="onchange_stage_id(stage_id)"
+                                            domain="[('section_id','=',section_id), ('object_id.model', '=', 'crm.claim')]" />
                                         <button name="stage_previous" string="" type="object" icon="gtk-go-back" />
                                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                                     </group>