diff --git a/addons/crm_job/crm_job.py b/addons/crm_job/crm_job.py
index 15a4d56066d..a104fc5ab61 100644
--- a/addons/crm_job/crm_job.py
+++ b/addons/crm_job/crm_job.py
@@ -59,6 +59,31 @@ class crm_job_categ(osv.osv):
     }
 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"
     _description = "Job Cases"
@@ -75,8 +100,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.case.stage', 'Stage', domain="[('section_id','=',section_id)]"),
-            'category2_id': fields.many2one('crm.case.category2', 'Category Name', domain="[('section_id','=',section_id)]"),
+            '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)]"),
             'duration': fields.float('Duration'),
             'case_id': fields.many2one('crm.case', 'Related Case'),
             'ref' : fields.reference('Reference', selection=_links_get, size=128),
diff --git a/addons/crm_job/crm_jobs_data.xml b/addons/crm_job/crm_jobs_data.xml
index 716cb4c2554..2486981eded 100644
--- a/addons/crm_job/crm_jobs_data.xml
+++ b/addons/crm_job/crm_jobs_data.xml
@@ -1,67 +1,64 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-    <record model="crm.case.section" id="section_support0">
-        <field name="name">Jobs</field>
-        <field name="code">jobs</field>
-    </record>
+  
 
         <!--    CASE CATEGORY(categ_id)        -->
         
     <record model="crm.job.categ" id="categ_job1">
         <field name="name">Salesman</field>
-        <field name="section_id" ref="section_support0"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>
     
     <record model="crm.job.categ" id="categ_job2">
         <field name="name">Junior Developer</field>
-        <field name="section_id" ref="section_support0"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>    
         
         <!--    CATEGORY2(category2_id)        -->
         
-    <record model="crm.case.category2" id="category_job1">
+    <record model="crm.job.type" id="type_job1">
         <field name="name">Graduate</field>
-        <field name="section_id" ref="section_support0"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>        
-    <record model="crm.case.category2" id="category_job2">
+    <record model="crm.job.type" id="type_job2">
         <field name="name">Licenced</field>
-        <field name="section_id" ref="section_support0"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>
-    <record model="crm.case.category2" id="category_job3">
+    <record model="crm.job.type" id="type_job3">
         <field name="name"> > Bac +5</field>
-        <field name="section_id" ref="section_support0"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>
     
          <!--    STAGE(stage_id)    -->
          
-    <record model="crm.case.stage" id="stage_job1">
+    <record model="crm.job.stage" id="stage_job1">
         <field name="name">Initial Jobs Demand</field>
-        <field name="section_id" ref="section_support0"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>
-    <record model="crm.case.stage" id="stage_job2">
+    <record model="crm.job.stage" id="stage_job2">
         <field name="name">First Interview</field>
-        <field name="section_id" ref="section_support0"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>
-    <record model="crm.case.stage" id="stage_job3">
+    <record model="crm.job.stage" id="stage_job3">
         <field name="name">Second Interview</field>
-        <field name="section_id" ref="section_support0"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>
-    <record model="crm.case.stage" id="stage_job4">
+    <record model="crm.job.stage" id="stage_job4">
         <field name="name">Contract Proposed</field>
-        <field name="section_id" ref="section_support0"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>
-    <record model="crm.case.stage" id="stage_job5">
+    <record model="crm.job.stage" id="stage_job5">
         <field name="name">Contract Signed</field>
-        <field name="section_id" ref="section_support0"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>
-    <record model="crm.case.stage" id="stage_job6">
+    <record model="crm.job.stage" id="stage_job6">
         <field name="name">Refused by Employee</field>
-        <field name="section_id" ref="section_support0"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>
-    <record model="crm.case.stage" id="stage_job7">
+    <record model="crm.job.stage" id="stage_job7">
         <field name="name">Refused by Company</field>
-        <field name="section_id" ref="section_support0"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>
 </data>
 </openerp>
diff --git a/addons/crm_job/crm_jobs_demo.xml b/addons/crm_job/crm_jobs_demo.xml
index 8878eca9e47..3ab57a9f26c 100644
--- a/addons/crm_job/crm_jobs_demo.xml
+++ b/addons/crm_job/crm_jobs_demo.xml
@@ -9,13 +9,13 @@
 	<record id="crm_case_salesman0" model="crm.job">
 		<field eval="time.strftime('%Y-%m-01 10:35:50')" name="date"/>
 		<field eval="time.strftime('%Y-%m-03')" name="date_deadline"/>
-		<field name="category2_id" ref="crm_job.category_job1"/>
+		<field name="type_id" ref="crm_job.type_job1"/>
 		<field name="partner_id" ref="base.res_partner_asus"/>
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field eval="&quot;Enrique Jones&quot;" name="partner_name"/>
 		<field eval="&quot;draft&quot;" name="state"/>
-		<field name="section_id" ref="crm_job.section_support0"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="&quot;enrique@rediff.com&quot;" name="partner_name2"/>
 		<field eval="&quot;9963214587&quot;" name="partner_mobile"/>
 		<field eval="1" name="active"/>
@@ -30,14 +30,14 @@
 		<field name="partner_address_id" ref="base.res_partner_address_14"/>
 		<field name="som" ref="base.som_fury"/>
 		<field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
-		<field name="category2_id" ref="crm_job.category_job3"/>
+		<field name="type_id" ref="crm_job.type_job3"/>
 		<field name="partner_id" ref="base.res_partner_15"/>
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field eval="&quot;Marie Justine&quot;" name="partner_name"/>
 		<field eval="&quot;open&quot;" name="state"/>
 		<field eval="5.15" name="duration"/>
-		<field name="section_id" ref="crm_job.section_support0"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="&quot;marie@gmail.com&quot;" name="partner_name2"/>
 		<field eval="&quot;9988774455&quot;" name="partner_mobile"/>
 		<field eval="1" name="active"/>
@@ -52,14 +52,14 @@
 		<field name="som" ref="base.som_happy"/>
 		<field eval="time.strftime('%Y-%m-15 16:10:00')" name="date"/>
 		<field eval="time.strftime('%Y-%m-18')" name="date_deadline"/>
-		<field name="category2_id" ref="crm_job.category_job2"/>
+		<field name="type_id" ref="crm_job.type_job2"/>
 		<field name="partner_id" ref="base.res_partner_5"/>
 		<field eval="&quot;1&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field eval="1.45" name="duration"/>
 		<field eval="&quot;Jose&quot;" name="partner_name"/>
 		<field eval="&quot;pending&quot;" name="state"/>
-		<field name="section_id" ref="crm_job.section_support0"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="&quot;jose@timesgroup.com&quot;" name="partner_name2"/>
 		<field eval="1" name="active"/>
 		<field name="categ_id" ref="crm_job.categ_job1"/>
@@ -71,7 +71,7 @@
 		<field eval="time.strftime('%Y-%m-25 16:25:52')" name="date"/>
 		<field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
 		<field name="categ_id" ref="crm_job.categ_job2"/>
-		<field name="category2_id" ref="crm_job.category_job3"/>
+		<field name="type_id" ref="crm_job.type_job3"/>
 		<field name="partner_id" ref="base.res_partner_10"/>
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
@@ -79,7 +79,7 @@
 		<field eval="&quot;Sandra Elvis&quot;" name="partner_name"/>
 		<field eval="&quot;sandra@example.com&quot;" name="partner_name2"/>
 		<field eval="&quot;cancel&quot;" name="state"/>
-		<field name="section_id" ref="crm_job.section_support0"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field name="stage_id" ref="crm_job.stage_job6"/>
 		<field eval="&quot;More than 5 yrs Experience in PHP&quot;" name="name"/>
@@ -87,14 +87,14 @@
 	<record id="crm_case_marketingjob0" model="crm.job">
 		<field eval="time.strftime('%Y-%m-26 17:15:32')" name="date"/>
 		<field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-		<field name="category2_id" ref="crm_job.category_job2"/>
+		<field name="type_id" ref="crm_job.type_job2"/>
 		<field name="partner_id" ref="base.res_partner_11"/>
 		<field eval="&quot;4&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_demo"/>
 		<field eval="2.0" name="duration"/>
 		<field eval="&quot;John Bruno&quot;" name="partner_name"/>
 		<field eval="&quot;done&quot;" name="state"/>
-		<field name="section_id" ref="crm_job.section_support0"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="&quot;john@market.edu&quot;" name="partner_name2"/>
 		<field eval="&quot;9966332214&quot;" name="partner_mobile"/>
 		<field eval="1" name="active"/>
@@ -106,13 +106,13 @@
 	<record id="crm_case_financejob0" model="crm.job">
 		<field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
 		<field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-		<field name="category2_id" ref="crm_job.category_job2"/>
+		<field name="type_id" ref="crm_job.type_job2"/>
 		<field name="partner_id" ref="base.res_partner_11"/>
 		<field eval="&quot;4&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field eval="&quot;David Armstrong&quot;" name="partner_name"/>
 		<field eval="&quot;done&quot;" name="state"/>
-		<field name="section_id" ref="crm_job.section_support0"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="&quot;david@market.edu&quot;" name="partner_name2"/>
 		<field eval="&quot;9966332214&quot;" name="partner_mobile"/>
 		<field eval="1" name="active"/>
@@ -127,14 +127,14 @@
 		<field name="partner_address_id" ref="base.res_partner_address_14"/>
 		<field name="som" ref="base.som_fury"/>
 		<field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
-		<field name="category2_id" ref="crm_job.category_job3"/>
+		<field name="type_id" ref="crm_job.type_job3"/>
 		<field name="partner_id" ref="base.res_partner_15"/>
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field eval="&quot;Tina Augustie&quot;" name="partner_name"/>
 		<field eval="&quot;open&quot;" name="state"/>
 		<field eval="1.15" name="duration"/>
-		<field name="section_id" ref="crm_job.section_support0"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="&quot;tina_augustie@example.com&quot;" name="partner_name2"/>
 		<field eval="&quot;9898745745&quot;" name="partner_mobile"/>
 		<field eval="1" name="active"/>
diff --git a/addons/crm_job/crm_jobs_view.xml b/addons/crm_job/crm_jobs_view.xml
index a695343c30b..4a53b29ee0f 100644
--- a/addons/crm_job/crm_jobs_view.xml
+++ b/addons/crm_job/crm_jobs_view.xml
@@ -37,7 +37,40 @@
         <field name="view_type">form</field>
         <field name="view_id" ref="crm_job_categ_view_tree"/>
     </record>
-    
+    # ------------------------------------------------------ 
+	    # 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="view_type">form</field>
+	        <field name="view_id" ref="crm_job_stage_tree"/>
+	    </record>
+	  <menuitem action="crm_job_stage_act" id="menu_crm_job_stage_act" parent="crm.menu_crm_case_stage"/>
     # ------------------------------------------------------
     # Jobs
     # ------------------------------------------------------
@@ -113,7 +146,7 @@
                         <field name="planned_cost" string="Expected Salary"/>
                         <field name="planned_revenue" string="Proposed Salary"/>
                         <field name="categ_id" string="Applied Job" select="1" on_change="onchange_categ_id(categ_id)"/>
-                        <field name="category2_id" string="Degree" select="1"/>
+                        <field name="type_id" string="Degree" select="1"/>
                         <separator colspan="4" string="Qualication"/>
                         <field name="priority" string="Appreciation" select="2"/>