diff --git a/addons/crm/crm_claim.py b/addons/crm/crm_claim.py
index 0b76da6a59a..781ce45bacb 100644
--- a/addons/crm/crm_claim.py
+++ b/addons/crm/crm_claim.py
@@ -47,7 +47,7 @@ class crm_claim(osv.osv):
                                                                        "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
         'categ_id': fields.many2one('crm.case.categ','Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
-        'type_id': fields.many2one('crm.case.resource.type', 'Claim Type', domain="[('section_id','=',section_id)]"),
+        'type_id': fields.many2one('crm.case.resource.type', 'Claim Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]"),
         
         'partner_name': fields.char("Employee's Name", size=64),
         'partner_mobile': fields.char('Mobile', size=32),
diff --git a/addons/crm_hr/crm_hr.py b/addons/crm_hr/crm_hr.py
index e3aaadb45fe..da144da950a 100644
--- a/addons/crm_hr/crm_hr.py
+++ b/addons/crm_hr/crm_hr.py
@@ -34,43 +34,6 @@ from osv.orm import except_orm
 
 from crm import crm
 
-class crm_job_categ(osv.osv):
-    _name = "crm.job.categ"
-    _description = "Job Categories"
-    _columns = {
-            'name': fields.char('Category Name', size=64, required=True),
-            'probability': fields.float('Probability (%)', required=True),
-            'section_id': fields.many2one('crm.case.section', 'Case Section'),
-    }
-    _defaults = {
-        'probability': lambda *args: 0.0
-    }
-crm_job_categ()
-
-class crm_job_type(osv.osv):
-    _name = "crm.job.type"
-    _description = "Job Type"
-    _rec_name = "name"
-    _columns = {
-        'name': fields.char('Claim Type Name', size=64, required=True, translate=True),
-        'section_id': fields.many2one('crm.case.section', 'Case Section'),
-    }
-crm_job_type()
-
-class crm_job_stage(osv.osv):
-    _name = "crm.job.stage"
-    _description = "Stage of job case"
-    _rec_name = 'name'
-    _order = "sequence"
-    _columns = {
-        'name': fields.char('Stage Name', size=64, required=True, translate=True),
-        'section_id': fields.many2one('crm.case.section', 'Case Section'),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of case stages."),
-    }
-    _defaults = {
-        'sequence': lambda *args: 1
-    }
-crm_job_stage()
 
 class crm_job(osv.osv):
     _name = "crm.job"
@@ -80,7 +43,7 @@ class crm_job(osv.osv):
     _columns = {        
             'date_closed': fields.datetime('Closed', readonly=True),
             'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),            
-            'categ_id': fields.many2one('crm.job.categ', 'Category', domain="[('section_id','=',section_id)]"),
+            'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.job')]"),
             'planned_revenue': fields.float('Planned Revenue'),
             'planned_cost': fields.float('Planned Costs'),
             'probability': fields.float('Probability (%)'),     
@@ -88,8 +51,8 @@ class crm_job(osv.osv):
             'partner_name2': fields.char('Employee Email', size=64),
             'partner_phone': fields.char('Phone', size=32),
             'partner_mobile': fields.char('Mobile', size=32), 
-            'stage_id': fields.many2one ('crm.job.stage', 'Stage', domain="[('section_id','=',section_id)]"),
-            'type_id': fields.many2one('crm.job.type', 'Type Name', domain="[('section_id','=',section_id)]"),
+            'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.job')]"),
+            'type_id': fields.many2one('crm.case.resource.type', 'Type Name', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.job')]"),
             'duration': fields.float('Duration'),
             'case_id': fields.many2one('crm.case', 'Related Case'),
             'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
@@ -105,7 +68,7 @@ class crm_job(osv.osv):
     def onchange_categ_id(self, cr, uid, ids, categ, context={}):
         if not categ:
             return {'value':{}}
-        cat = self.pool.get('crm.categ.categ').browse(cr, uid, categ, context).probability
+        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
         return {'value':{'probability':cat}}
    
 crm_job()
diff --git a/addons/crm_hr/crm_hr_data.xml b/addons/crm_hr/crm_hr_data.xml
index 2486981eded..94a47be6d2f 100644
--- a/addons/crm_hr/crm_hr_data.xml
+++ b/addons/crm_hr/crm_hr_data.xml
@@ -5,60 +5,72 @@
 
         <!--    CASE CATEGORY(categ_id)        -->
         
-    <record model="crm.job.categ" id="categ_job1">
+    <record model="crm.case.categ" id="categ_job1">
         <field name="name">Salesman</field>
         <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>         
     </record>
     
-    <record model="crm.job.categ" id="categ_job2">
+    <record model="crm.case.categ" id="categ_job2">
         <field name="name">Junior Developer</field>
         <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>         
     </record>    
         
-        <!--    CATEGORY2(category2_id)        -->
+        <!--    Resource(type_id)        -->
         
-    <record model="crm.job.type" id="type_job1">
+    <record model="crm.case.resource.type" id="type_job1">
         <field name="name">Graduate</field>
         <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>         
     </record>        
-    <record model="crm.job.type" id="type_job2">
+    <record model="crm.case.resource.type" id="type_job2">
         <field name="name">Licenced</field>
         <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>         
     </record>
-    <record model="crm.job.type" id="type_job3">
+    <record model="crm.case.resource.type" id="type_job3">
         <field name="name"> > Bac +5</field>
         <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>         
     </record>
     
          <!--    STAGE(stage_id)    -->
          
-    <record model="crm.job.stage" id="stage_job1">
+    <record model="crm.case.stage" id="stage_job1">
         <field name="name">Initial Jobs Demand</field>
         <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>         
     </record>
-    <record model="crm.job.stage" id="stage_job2">
+    <record model="crm.case.stage" id="stage_job2">
         <field name="name">First Interview</field>
         <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/> 
     </record>
-    <record model="crm.job.stage" id="stage_job3">
+    <record model="crm.case.stage" id="stage_job3">
         <field name="name">Second Interview</field>
         <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/> 
     </record>
-    <record model="crm.job.stage" id="stage_job4">
+    <record model="crm.case.stage" id="stage_job4">
         <field name="name">Contract Proposed</field>
         <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/>         
     </record>
-    <record model="crm.job.stage" id="stage_job5">
+    <record model="crm.case.stage" id="stage_job5">
         <field name="name">Contract Signed</field>
         <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>         
     </record>
-    <record model="crm.job.stage" id="stage_job6">
+    <record model="crm.case.stage" id="stage_job6">
         <field name="name">Refused by Employee</field>
         <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>         
     </record>
-    <record model="crm.job.stage" id="stage_job7">
+    <record model="crm.case.stage" id="stage_job7">
         <field name="name">Refused by Company</field>
         <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>         
     </record>
 </data>
 </openerp>
diff --git a/addons/crm_hr/crm_hr_view.xml b/addons/crm_hr/crm_hr_view.xml
index bb90d62b960..7e9d4249075 100644
--- a/addons/crm_hr/crm_hr_view.xml
+++ b/addons/crm_hr/crm_hr_view.xml
@@ -5,70 +5,25 @@
     # ------------------------------------------------------
     # Job Categories
     # ------------------------------------------------------
-    
-    <record id="crm_job_categ_view_form" model="ir.ui.view">
-        <field name="name">crm.job.categ.form</field>
-        <field name="model">crm.job.categ</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Job Category">
-                <field name="name" select="1"/>
-                <field name="probability"/>
-                <field name="section_id"/>
-            </form>
-        </field>
-    </record>
-    <record id="crm_job_categ_view_tree" model="ir.ui.view">
-        <field name="name">crm.job.categ.tree</field>
-        <field name="model">crm.job.categ</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Job Category">
-                <field name="name"/>
-                <field name="probability"/>
-                <field name="section_id"/>
-            </tree>
-        </field>
-    </record>
 
     <record id="crm_job_categ_action" model="ir.actions.act_window">
         <field name="name">Job Categories</field>
-        <field name="res_model">crm.job.categ</field>
+        <field name="res_model">crm.case.categ</field>
         <field name="view_type">form</field>
-        <field name="view_id" ref="crm_job_categ_view_tree"/>
+        <field name="view_id" ref="crm.crm_case_categ_tree-view"/>     
+       	<field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
+		<field name="context">{'object_id':'crm.job'}</field>            
     </record>
     # ------------------------------------------------------ 
-	    # Stage
+	 # Stage
 	 # ------------------------------------------------------ 
-	    <record model="ir.ui.view" id="crm_job_stage_tree">
-	        <field name="name">crm.job.stage.tree</field>
-	        <field name="model">crm.job.stage</field>
-	        <field name="type">tree</field>
-	        <field name="arch" type="xml">
-	            <tree string="Stages">
-	                <field name="sequence"/>
-	                <field name="name"/>
-	                <field name="section_id"/>
-	            </tree>
-	        </field>
-	    </record>
-	    <record model="ir.ui.view" id="crm_job_stage_form">
-	        <field name="name">crm.job.stage.form</field>
-	        <field name="model">crm.job.stage</field>
-	        <field name="type">form</field>
-	        <field name="arch" type="xml">
-	            <form string="Stage">
-	            	<field name="name" select="1"/>
-	                <field name="section_id" select="1" widget="selection"/>
-	                <field name="sequence"/>
-	            </form>
-	        </field>
-	    </record>
 	    <record id="crm_job_stage_act" model="ir.actions.act_window">
 	        <field name="name">Job Stages</field>
-	        <field name="res_model">crm.claim.stage</field>
+	        <field name="res_model">crm.case.stage</field>
 	        <field name="view_type">form</field>
-	        <field name="view_id" ref="crm_job_stage_tree"/>
+	        <field name="view_id"  ref="crm.crm_case_stage_tree"/>
+       		<field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
+			<field name="context">{'object_id':'crm.job'}</field>    	        
 	    </record>
 	  <menuitem action="crm_job_stage_act" id="menu_crm_job_stage_act" parent="crm.menu_crm_case_stage"/>
     # ------------------------------------------------------