diff --git a/addons/crm_project/crm_bugs_data.xml b/addons/crm_project/crm_bugs_data.xml
index ba5f5edbf81..c03e14adf50 100644
--- a/addons/crm_project/crm_bugs_data.xml
+++ b/addons/crm_project/crm_bugs_data.xml
@@ -1,43 +1,35 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-    <!--
-    Case Sections
-    -->
-    <record model="crm.case.section" id="section_support">
-        <field name="name">Bug Tracking</field>
-        <field name="code">BugSup</field>
-    </record>
-
     <!--
     Case Categories
     -->
          <!--    For Bugs    -->
          
-    <record model="crm.case.categ" id="categ1">
+    <record model="crm.bug.categ" id="categ1">
         <field name="name">Bugs</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>
-    <record model="crm.case.categ" id="categ2">
+    <record model="crm.bug.categ" id="categ2">
         <field name="name">Patches</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>
-    <record model="crm.case.categ" id="categ3">
+    <record model="crm.bug.categ" id="categ3">
         <field name="name">Feature Requests</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>
 
     <!--
     Case Category2
     -->
          <!--    For Bugs    -->
-    <record model="crm.case.category2" id="category1">
+    <record model="crm.bug.type" id="type1">
         <field name="name">Version 4.2</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>    
-    <record model="crm.case.category2" id="category2">
+    <record model="crm.bug.type" id="type1">
         <field name="name">Version 4.4</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>
 
     <!--
@@ -45,33 +37,33 @@
     -->
          <!--    For Bugs    -->
          
-    <record model="crm.case.stage" id="stage1">
+    <record model="crm.bug.stage" id="stage1">
         <field name="name">Accepted as Bug</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_departments"/>
     </record>    
-    <record model="crm.case.stage" id="stage2">
+    <record model="crm.bug.stage" id="stage2">
         <field name="name">Fixed</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>    
-    <record model="crm.case.stage" id="stage3">
+    <record model="crm.bug.stage" id="stage3">
         <field name="name">Won't fix</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>    
-    <record model="crm.case.stage" id="stage4">
+    <record model="crm.bug.stage" id="stage4">
         <field name="name">Invalid</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>    
-    <record model="crm.case.stage" id="stage5">
+    <record model="crm.bug.stage" id="stage5">
         <field name="name">Awaiting Response</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>    
-    <record model="crm.case.stage" id="stage6">
+    <record model="crm.bug.stage" id="stage6">
         <field name="name">Works For Me</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>    
-    <record model="crm.case.stage" id="stage7">
+    <record model="crm.bug.stage" id="stage7">
         <field name="name">Future</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>    
 
 </data>
diff --git a/addons/crm_project/crm_bugs_demo.xml b/addons/crm_project/crm_bugs_demo.xml
index 45797ab61dd..5b17320c87f 100644
--- a/addons/crm_project/crm_bugs_demo.xml
+++ b/addons/crm_project/crm_bugs_demo.xml
@@ -8,7 +8,7 @@
 	<record id="crm_case_buginaccountsmodule0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_8"/>
 		<field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;5&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_agrolait"/>
@@ -32,7 +32,7 @@
 	<record id="crm_case_programnotgivingproperoutput0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_tang"/>
 		<field eval="time.strftime('%Y-%m-15  12:50:00')" name="date"/>
-		<field name="category2_id" ref="category2"/>
+		<field name="type_id" ref="type2"/>
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_asus"/>
@@ -48,7 +48,7 @@
 	<record id="crm_case_outputincorrect0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_9"/>
 		<field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;4&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_demo"/>
 		<field name="partner_id" ref="base.res_partner_2"/>
@@ -64,7 +64,7 @@
 	<record id="crm_case_problemloadingpage0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_13"/>
 		<field eval="time.strftime('%Y-%m-20  15:25:05')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_14"/>
@@ -79,7 +79,7 @@
 
 	<record id="crm_case_pagenotfound0" model="crm.project.bug">
 		<field eval="time.strftime('%Y-%m-22  18:15:00')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
@@ -95,7 +95,7 @@
 	<record id="crm_case_programmingerror0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_10"/>
 		<field eval="time.strftime('%Y-%m-24  09:45:00')" name="date"/>
-		<field name="category2_id" ref="category2"/>
+		<field name="type_id" ref="type2"/>
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_5"/>
@@ -111,7 +111,7 @@
 	<record id="crm_case_logicalerrorinprogram0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_6"/>
 		<field eval="time.strftime('%Y-%m-26  11:10:00')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_6"/>
@@ -127,7 +127,7 @@
 	<record id="crm_case_constrainterror0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_6"/>
 		<field eval="time.strftime('%Y-%m-25  13:35:00')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_6"/>
@@ -143,7 +143,7 @@
 	<record id="crm_case_errorinprogram0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_10"/>
 		<field eval="time.strftime('%Y-%m-28  15:40:00')" name="date"/>
-		<field name="category2_id" ref="category2"/>
+		<field name="type_id" ref="type2"/>
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_demo"/>
 		<field name="partner_id" ref="base.res_partner_5"/>
@@ -175,7 +175,7 @@
 	<record id="crm_case_newfeaturestobeadded0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_wong"/>
 		<field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;4&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_maxtor"/>
@@ -191,7 +191,7 @@
 	<record id="crm_case_addmenustothemodule0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_1"/>
 		<field eval="time.strftime('%Y-%m-05 18:00:00')" name="date"/>
-		<field name="category2_id" ref="category2"/>
+		<field name="type_id" ref="type2"/>
 		<field eval="&quot;1&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_demo"/>
 		<field name="partner_id" ref="base.res_partner_9"/>
@@ -208,7 +208,7 @@
 	<record id="crm_case_includeattendancesheetinproject0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_2"/>
 		<field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_10"/>
@@ -227,7 +227,7 @@
 		<field name="partner_address_id" ref="base.res_partner_address_6"/>
 		<field name="som" ref="base.som_happy"/>
 		<field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_6"/>
@@ -243,7 +243,7 @@
 	<record id="crm_case_improvereportsinhrms0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_15"/>
 		<field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;4&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_11"/>
@@ -259,7 +259,7 @@
 	<record id="crm_case_improvereportsinpms0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_15"/>
 		<field eval="time.strftime('%Y-%m-21 14:30:00')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_demo"/>
 		<field name="partner_id" ref="base.res_partner_11"/>
diff --git a/addons/crm_project/crm_bugs_view.xml b/addons/crm_project/crm_bugs_view.xml
index 0e8535e4140..05d904306b5 100644
--- a/addons/crm_project/crm_bugs_view.xml
+++ b/addons/crm_project/crm_bugs_view.xml
@@ -4,37 +4,76 @@
 <!--    <menuitem name="CRM &amp; SRM" icon="terp-crm" id="menu_crm1"/>    -->
 
     # ------------------------------------------------------
-    # Bug Tracking
+    # Bug Categories
     # ------------------------------------------------------
 
-    <record model="ir.ui.view" id="crm_bug_assign_wizard_form">
-        <field name="name">crm.project.bug.assign_wizard.form</field>
-        <field name="model">crm.project.bug.assign_wizard</field>
+       
+    <record id="crm_bug_categ_view_form" model="ir.ui.view">
+        <field name="name">crm.bug.categ.form</field>
+        <field name="model">crm.bug.categ</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="To Assign">
-                <group col="2">            	
-                    <field name="section_id" select="1" widget="selection"/>
-                    <field name="user_id"/>
-                </group>
-                <newline/>                    
-                <separator colspan="4"/>                             
-                <group col="2" colspan="2">
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button icon="gtk-execute" name="action_create" string="Assign" type="object"/>
-                </group>
+            <form string="Bug Category">
+                <field name="name" select="1"/>
+                <field name="probability"/>
+                <field name="section_id"/>
             </form>
         </field>
     </record>
-    <record id="action_crm_bug_assign_wizard" model="ir.actions.act_window">
-        <field name="name">To Assign</field>
-        <field name="res_model">crm.project.bug.assign_wizard</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm_bug_assign_wizard_form"/>
-        <field name="view_mode">form</field>
-        <field name="target">new</field>
+    <record id="crm_bug_categ_view_tree" model="ir.ui.view">
+        <field name="name">crm.bug.categ.tree</field>
+        <field name="model">crm.bug.categ</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Bug Category">
+                <field name="name"/>
+                <field name="probability"/>
+                <field name="section_id"/>
+            </tree>
+        </field>
     </record>
 
+    <record id="crm_bug_categ_action" model="ir.actions.act_window">
+        <field name="name">Bug Categories</field>
+        <field name="res_model">crm.job.categ</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="crm_bug_categ_view_tree"/>
+    </record>
+    # ------------------------------------------------------ 
+	    # Stage
+	 # ------------------------------------------------------ 
+	    <record model="ir.ui.view" id="crm_bug_stage_tree">
+	        <field name="name">crm.bug.stage.tree</field>
+	        <field name="model">crm.bug.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_bug_stage_form">
+	        <field name="name">crm.bug.stage.form</field>
+	        <field name="model">crm.bug.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_bug_stage_act" model="ir.actions.act_window">
+	        <field name="name">Job Stages</field>
+	        <field name="res_model">crm.bug.stage</field>
+	        <field name="view_type">form</field>
+	        <field name="view_id" ref="crm_bug_stage_tree"/>
+	    </record>
+	  <menuitem action="crm_bug_stage_act" id="menu_crm_job_stage_act" parent="crm.menu_crm_case_stage"/>
+	  
     <record model="ir.ui.view" id="crm_case_form_view">
         <field name="name">CRM - Bug Tracker Form</field>
         <field name="model">crm.project.bug</field>
@@ -59,13 +98,9 @@
                     <field name="partner_address_id"  string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
                     <field name="email_from" colspan="2"/>
                     <separator colspan="4"/>
-                    <field name="category2_id" string="Version"/>
+                    <field name="type_id" string="Version"/>
                     <field name="categ_id"  on_change="onchange_categ_id(categ_id)"/>
                     <field name="priority" string="Severity"/>
-                    <group colspan="2">
-                        <field name="case_id" select="1"/>
-                        <button string="Assign" name="%(action_crm_bug_assign_wizard)d"  type="action" />
-                    </group>
                     <newline/>
                     <separator string= "Description" colspan="4"/>
                     <field name="description" nolabel="1" colspan="4"/>
@@ -106,19 +141,6 @@
                         </form>
                     </field>
                 </page>
-                <page string="Events">
-                   <field name="child_ids" colspan="4" nolabel="1">
-                       <tree string="Related Cases">
-                           <field name="id"/>
-                           <field name="date"/>
-                           <field name="name"/>
-                           <field name="partner_id"/>
-                           <field name="user_id"/>
-                           <field name="section_id" widget="selection"/>
-                           <field name="state"/>
-                       </tree>
-                    </field>
-                 </page>
                 <page string="Emails">
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
@@ -162,7 +184,7 @@
                 <field name="priority" string="Severity"/>
                 <field name="categ_id"/>
                 <field name="stage_id" string="Resolution"/>
-                <field name="category2_id" string="Version"/>
+                <field name="type_id" string="Version"/>
                 <field name="user_id"/>
                 <field name="state"/>
                 <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
diff --git a/addons/crm_project/crm_feature_menu.xml b/addons/crm_project/crm_feature_menu.xml
index 3cedcabba26..0168e561a62 100644
--- a/addons/crm_project/crm_feature_menu.xml
+++ b/addons/crm_project/crm_feature_menu.xml
@@ -3,17 +3,17 @@
 <data noupdate="1">   
 
     
-    <record model="crm.case.categ" id="future_patch_categ">
+    <record model="crm.bug.categ" id="future_patch_categ">
         <field name="name">Patches</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>
-    <record model="crm.case.stage" id="future_fixed_categ">
+    <record model="crm.bug.stage" id="future_fixed_categ">
         <field name="name">Fixed</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>
-    <record model="crm.case.stage" id="future_awaiting_categ">
+    <record model="crm.bug.stage" id="future_awaiting_categ">
         <field name="name">Awaiting Response</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
     </record>    
     
     
diff --git a/addons/crm_project/crm_feature_view.xml b/addons/crm_project/crm_feature_view.xml
index 67616e4fd62..f7e6b77ebde 100644
--- a/addons/crm_project/crm_feature_view.xml
+++ b/addons/crm_project/crm_feature_view.xml
@@ -7,33 +7,6 @@
     # Future Request
     # ------------------------------------------------------
 
-    <record model="ir.ui.view" id="crm_future_assign_wizard_form">
-        <field name="name">crm.project.future.assign_wizard.form</field>
-        <field name="model">crm.project.future.assign_wizard</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="To Assign">
-                <group col="2">            	
-                    <field name="section_id" select="1" widget="selection"/>
-                    <field name="user_id"/>
-                </group>
-                <newline/>                    
-                <separator colspan="4"/>                             
-                <group col="2" colspan="2">
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button icon="gtk-execute" name="action_create" string="Assign" type="object"/>
-                </group>
-            </form>
-        </field>
-    </record>
-    <record id="action_crm_future_assign_wizard" model="ir.actions.act_window">
-        <field name="name">To Assign</field>
-        <field name="res_model">crm.project.future.assign_wizard</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm_future_assign_wizard_form"/>
-        <field name="view_mode">form</field>
-        <field name="target">new</field>
-    </record>
 
     <record model="ir.ui.view" id="crm_case_future_form_view">
         <field name="name">CRM - Future Request Form</field>
@@ -62,10 +35,6 @@
                     <field name="category2_id" string="Version"/>
                     <field name="categ_id"  on_change="onchange_categ_id(categ_id)"/>
                     <field name="priority" string="Severity"/>
-                    <group colspan="2">
-                        <field name="case_id" select="1"/>
-                        <button string="Assign" name="%(action_crm_future_assign_wizard)d"  type="action" />
-                    </group>
                     <newline/>
                     <separator string= "Description" colspan="4"/>
                     <field name="description" nolabel="1" colspan="4"/>
@@ -106,19 +75,6 @@
                         </form>
                     </field>
                 </page>
-                <page string="Events">
-                   <field name="child_ids" colspan="4" nolabel="1">
-                       <tree string="Related Cases">
-                           <field name="id"/>
-                           <field name="date"/>
-                           <field name="name"/>
-                           <field name="partner_id"/>
-                           <field name="user_id"/>
-                           <field name="section_id" widget="selection"/>
-                           <field name="state"/>
-                       </tree>
-                    </field>
-                 </page>
                 <page string="Emails">
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
diff --git a/addons/crm_project/crm_project_bug.py b/addons/crm_project/crm_project_bug.py
index 2e56911821a..066739cc8d3 100644
--- a/addons/crm_project/crm_project_bug.py
+++ b/addons/crm_project/crm_project_bug.py
@@ -32,14 +32,84 @@ import tools
 from osv import fields,osv,orm
 from osv.orm import except_orm
 
+AVAILABLE_PRIORITIES = [
+    ('5','Lowest'),
+    ('4','Low'),
+    ('3','Normal'),
+    ('2','High'),
+    ('1','Highest')
+]
+
+def _links_get(self, cr, uid, context={}):
+    obj = self.pool.get('res.request.link')
+    ids = obj.search(cr, uid, [])
+    res = obj.read(cr, uid, ids, ['object', 'name'], context)
+    return [(r['object'], r['name']) for r in res]
+
+class crm_bug_categ(osv.osv):
+    _name = "crm.bug.categ"
+    _description = " Bug 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_bug_categ()
+
+class crm_bug_type(osv.osv):
+    _name = "crm.bug.type"
+    _description = "Bug 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_bug_type()
+
+class crm_bug_stage(osv.osv):
+    _name = "crm.bug.stage"
+    _description = "Stage of Project Bug"
+    _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_bug_stage()
+
 class crm_project_bug(osv.osv):
     _name = "crm.project.bug"
     _description = "Project Bug Cases"
     _order = "id desc"
-    _inherits = {'crm.case':"inherit_case_id"}
+    _inherit = 'crm.case'
     _columns = {
-           'inherit_case_id':fields.many2one('crm.case','Case'),
-           'project_id':fields.many2one('project.project', 'Project'),
+        'date_closed': fields.datetime('Closed', readonly=True),
+        'ref' : fields.reference('Reference', selection=_links_get, size=128),
+        'ref2' : fields.reference('Reference 2', selection=_links_get, size=128),
+        'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
+                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+        'planned_revenue': fields.float('Planned Revenue'),
+        'planned_cost': fields.float('Planned Costs'),
+        'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
+                                                                       "the partner mentality in relation to our services.The scale has" \
+                                                                       "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
+        'categ_id': fields.many2one('crm.bug.categ','Category', domain="[('section_id','=',section_id)]"),
+        'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'),
+        'type_id': fields.many2one('crm.project.bug.type', 'Bug Type', domain="[('section_id','=',section_id)]"),
+        
+        '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.bug.stage', 'Stage', domain="[('section_id','=',section_id)]"),
+        'project_id':fields.many2one('project.project', 'Project'),
     }
 
     def _get_project(self, cr, uid, context):
@@ -51,122 +121,12 @@ class crm_project_bug(osv.osv):
     _defaults = {
           'project_id':_get_project
           }
-    def _map_ids(self, method, cr, uid, ids, *args, **argv):
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids
-        case_data = self.browse(cr, uid, select)
-        new_ids = []
-        for case in case_data:
-            if case.inherit_case_id:
-                new_ids.append(case.inherit_case_id.id)
-        res = getattr(self.pool.get('crm.case'),method)(cr, uid, new_ids, *args, **argv)
-        if isinstance(ids, (str, int, long)) and isinstance(res, list):
-            return res and res[0] or False
-        return res
-
-
-    def onchange_case_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_case_id',cr,uid,ids,*args,**argv)
-    def stage_next(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('stage_next',cr,uid,ids,*args,**argv)
-    def onchange_partner_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_id',cr,uid,ids,*args,**argv)
-    def onchange_partner_address_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_address_id',cr,uid,ids,*args,**argv)
-    def onchange_categ_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_categ_id',cr,uid,ids,*args,**argv)
-    def case_close(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_close',cr,uid,ids,*args,**argv)
-    def case_open(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_open',cr,uid,ids,*args,**argv)
-    def case_cancel(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_cancel',cr,uid,ids,*args,**argv)
-    def case_reset(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_reset',cr,uid,ids,*args,**argv)
-    def case_escalate(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_escalate',cr,uid,ids,*args,**argv)
-    def case_pending(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_pending',cr,uid,ids,*args,**argv)
-
-    def msg_new(self, cr, uid, msg):
-        mailgate_obj = self.pool.get('mail.gateway')
-        msg_body = mailgate_obj.msg_body_get(msg)
-        data = {
-            'name': msg['Subject'],
-            'email_from': msg['From'],
-            'email_cc': msg['Cc'],
-            'user_id': False,
-            'description': msg_body['body'],
-            'history_line': [(0, 0, {'description': msg_body['body'], 'email': msg['From'] })],
-        }
-        res = mailgate_obj.partner_get(cr, uid, msg['From'])
-        if res:
-            data.update(res)
-        res = self.create(cr, uid, data)
-        return res
-
-    def msg_update(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('msg_update',cr, uid, ids, *args, **argv)
-    def emails_get(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('emails_get',cr, uid, ids, *args, **argv)
-    def msg_send(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('msg_send',cr, uid, ids, *args, **argv)
-
-
+    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
+        if not categ:
+            return {'value':{}}
+        cat = self.pool.get('crm.bug.categ').browse(cr, uid, categ, context).probability
+        return {'value':{'probability':cat}}    
+    
 
 crm_project_bug()
 
-class crm_bug_assign_wizard(osv.osv_memory):
-    _name = 'crm.project.bug.assign_wizard'
-
-    _columns = {
-        'section_id': fields.many2one('crm.case.section', 'Section', required=True),
-        'user_id': fields.many2one('res.users', 'Responsible'),
-    }
-
-    def _get_default_section(self, cr, uid, context):
-        case_id = context.get('active_id',False)
-        if not case_id:
-            return False
-        case_obj = self.pool.get('crm.project.bug')
-        case = case_obj.read(cr, uid, case_id, ['state','section_id'])
-        if case['state'] in ('done'):
-            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))
-        return case['section_id']
-
-
-    _defaults = {
-        'section_id': _get_default_section
-    }
-    def action_create(self, cr, uid, ids, context=None):
-        case_obj = self.pool.get('crm.project.bug')
-        case_id = context.get('active_id',[])
-        res = self.read(cr, uid, ids)[0]
-        case = case_obj.browse(cr, uid, case_id)
-        if case.state in ('done'):
-            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))
-        new_case_id = case_obj.copy(cr, uid, case_id, default=
-                                            {
-                                                'section_id':res.get('section_id',False),
-                                                'user_id':res.get('user_id',False),
-                                                'case_id' : case.inherit_case_id.id
-                                            }, context=context)
-        case_obj.case_close(cr, uid, [case_id])
-
-        data_obj = self.pool.get('ir.model.data')
-        result = data_obj._get_id(cr, uid, 'crm_project', 'view_crm_case_bugs_filter')
-        search_view = data_obj.read(cr, uid, result, ['res_id'])
-        value = {
-            'name': _('Bugs'),
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'crm.project.bug',
-            'res_id': int(new_case_id),
-            'type': 'ir.actions.act_window',
-            'search_view_id': search_view['res_id']
-        }
-        return value
-
-crm_bug_assign_wizard()
diff --git a/addons/crm_project/crm_project_feature.py b/addons/crm_project/crm_project_feature.py
index 70072d8b962..d935ffb94fa 100644
--- a/addons/crm_project/crm_project_feature.py
+++ b/addons/crm_project/crm_project_feature.py
@@ -36,10 +36,27 @@ class crm_project_future_request(osv.osv):
     _name = "crm.project.future"
     _description = "Project Future Request"
     _order = "id desc"
-    _inherits = {'crm.case':"inherit_case_id"}
+    _inherit = 'crm.case'    
     _columns = {
-           'inherit_case_id':fields.many2one('crm.case','Case'),
-           'project_id':fields.many2one('project.project', 'Project'),
+        'date_closed': fields.datetime('Closed', readonly=True),
+        'ref' : fields.reference('Reference', selection=_links_get, size=128),
+        'ref2' : fields.reference('Reference 2', selection=_links_get, size=128),
+        'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
+                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+        'planned_revenue': fields.float('Planned Revenue'),
+        'planned_cost': fields.float('Planned Costs'),
+        'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
+                                                                       "the partner mentality in relation to our services.The scale has" \
+                                                                       "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
+        'categ_id': fields.many2one('crm.bug.categ','Category', domain="[('section_id','=',section_id)]"),
+        'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'),
+        'type_id': fields.many2one('crm.project.bug.type', 'Bug Type', domain="[('section_id','=',section_id)]"),
+        
+        '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.bug.stage', 'Stage', domain="[('section_id','=',section_id)]"),
+        'project_id':fields.many2one('project.project', 'Project'),
     }
     def _get_project(self, cr, uid, context):
        user = self.pool.get('res.users').browse(cr,uid,uid, context=context)
@@ -50,121 +67,6 @@ class crm_project_future_request(osv.osv):
     _defaults = {
           'project_id':_get_project
           }
-    def _map_ids(self, method, cr, uid, ids, *args, **argv):
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids
-        case_data = self.browse(cr, uid, select)
-        new_ids = []
-        for case in case_data:
-            if case.inherit_case_id:
-                new_ids.append(case.inherit_case_id.id)
-        res = getattr(self.pool.get('crm.case'),method)(cr, uid, new_ids, *args, **argv)
-        if isinstance(ids, (str, int, long)) and isinstance(res, list):
-            return res and res[0] or False
-        return res
-
-
-    def onchange_case_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_case_id',cr,uid,ids,*args,**argv)
-    def stage_next(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('stage_next',cr,uid,ids,*args,**argv)
-    def onchange_partner_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_id',cr,uid,ids,*args,**argv)
-    def onchange_partner_address_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_address_id',cr,uid,ids,*args,**argv)
-    def onchange_categ_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_categ_id',cr,uid,ids,*args,**argv)
-    def case_close(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_close',cr,uid,ids,*args,**argv)
-    def case_open(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_open',cr,uid,ids,*args,**argv)
-    def case_cancel(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_cancel',cr,uid,ids,*args,**argv)
-    def case_reset(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_reset',cr,uid,ids,*args,**argv)
-    def case_escalate(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_escalate',cr,uid,ids,*args,**argv)
-    def case_pending(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_pending',cr,uid,ids,*args,**argv)
-
-    def msg_new(self, cr, uid, msg):
-        mailgate_obj = self.pool.get('mail.gateway')
-        msg_body = mailgate_obj.msg_body_get(msg)
-        data = {
-            'name': msg['Subject'],
-            'email_from': msg['From'],
-            'email_cc': msg['Cc'],
-            'user_id': False,
-            'description': msg_body['body'],
-            'history_line': [(0, 0, {'description': msg_body['body'], 'email': msg['From'] })],
-        }
-        res = mailgate_obj.partner_get(cr, uid, msg['From'])
-        if res:
-            data.update(res)
-        res = self.create(cr, uid, data)
-        return res
-
-    def msg_update(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('msg_update',cr, uid, ids, *args, **argv)
-    def emails_get(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('emails_get',cr, uid, ids, *args, **argv)
-    def msg_send(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('msg_send',cr, uid, ids, *args, **argv)
-
 
 crm_project_future_request()
 
-class crm_future_request_assign_wizard(osv.osv_memory):
-    _name = 'crm.project.future.assign_wizard'
-
-    _columns = {
-        'section_id': fields.many2one('crm.case.section', 'Section', required=True),
-        'user_id': fields.many2one('res.users', 'Responsible'),
-    }
-
-    def _get_default_section(self, cr, uid, context):
-        case_id = context.get('active_id',False)
-        if not case_id:
-            return False
-        case_obj = self.pool.get('crm.project.future')
-        case = case_obj.read(cr, uid, case_id, ['state','section_id'])
-        if case['state'] in ('done'):
-            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))
-        return case['section_id']
-
-
-    _defaults = {
-        'section_id': _get_default_section
-    }
-    def action_create(self, cr, uid, ids, context=None):
-        case_obj = self.pool.get('crm.project.future')
-        case_id = context.get('active_id',[])
-        res = self.read(cr, uid, ids)[0]
-        case = case_obj.browse(cr, uid, case_id)
-        if case.state in ('done'):
-            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))
-        new_case_id = case_obj.copy(cr, uid, case_id, default=
-                                            {
-                                                'section_id':res.get('section_id',False),
-                                                'user_id':res.get('user_id',False),
-                                                'case_id' : case.inherit_case_id.id
-                                            }, context=context)
-        case_obj.case_close(cr, uid, [case_id])
-
-        data_obj = self.pool.get('ir.model.data')
-        result = data_obj._get_id(cr, uid, 'crm_project', 'view_crm_case_future_filter')
-        search_view = data_obj.read(cr, uid, result, ['res_id'])
-        value = {
-            'name': _('Future Requests'),
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'crm.project.future',
-            'res_id': int(new_case_id),
-            'type': 'ir.actions.act_window',
-            'search_view_id': search_view['res_id']
-        }
-        return value
-
-crm_future_request_assign_wizard()