diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index c6f7759859c..4f21eb6f162 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -580,10 +580,8 @@ crm_case_section()
 
 class crm_case_categ(osv.osv):
     """ Category of Case """
-
     _name = "crm.case.categ"
-    _description = "Category of case"
-
+    _description = "Category of Case"
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True),
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 0a552a4165a..ee778401e4a 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -120,7 +120,7 @@ class crm_lead(crm_case, osv.osv):
 
         # Lead fields
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
-            domain="['|',('section_id','=',section_id),('section_id','=',False)]"),
+            domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.project.bug')]"),
         'type_id': fields.many2one('crm.case.resource.type', 'Campaign', \
             domain="['|',('section_id','=',section_id),('section_id','=',False)]"),
         'channel_id': fields.many2one('res.partner.canal', 'Channel'),
diff --git a/addons/crm/crm_opportunity_data.xml b/addons/crm/crm_opportunity_data.xml
index 3ab446440f2..6726714fd04 100644
--- a/addons/crm/crm_opportunity_data.xml
+++ b/addons/crm/crm_opportunity_data.xml
@@ -2,37 +2,37 @@
 <openerp>
 <data noupdate="1">
     <record model="crm.case.categ" id="categ_oppor1">
-        <field name="name">Existing Customer</field>
+        <field name="name">Interrest in Computer</field>
         <field name="section_id" ref="section_sales_department"/>
-          <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.categ" id="categ_oppor2">
-        <field name="name">Self Generated</field>
+        <field name="name">Interrest in Accessories</field>
         <field name="section_id" ref="section_sales_department"/>
         <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.categ" id="categ_oppor3">
-        <field name="name">Employee</field>
+        <field name="name">Need Services</field>
         <field name="section_id" ref="section_sales_department"/>
         <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.categ" id="categ_oppor4">
-        <field name="name">Partner</field>
+        <field name="name">Need Information</field>
         <field name="section_id" ref="section_sales_department"/>
         <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.categ" id="categ_oppor5">
-        <field name="name">Campaign</field>
+        <field name="name">Need a Website Design</field>
         <field name="section_id" ref="section_sales_department"/>
         <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.categ" id="categ_oppor6">
-        <field name="name">Website</field>
+        <field name="name">Potential Reseller</field>
         <field name="section_id" ref="section_sales_department"/>
         <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.categ" id="categ_oppor7">
-        <field name="name">Word of mouth</field>
+        <field name="name">Need Consulting</field>
         <field name="section_id" ref="section_sales_department"/>
         <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index c2713b91f89..a6a410fabb8 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -62,7 +62,7 @@
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Categorization"/>
                                 <field name="section_id" colspan="1" widget="selection"/>
-                                <field name="categ_id" select="1" groups="base.group_extended"
+                                <field name="categ_id" select="1"
                                 string="Category" widget="selection"
                                 domain="[('object_id.model', '=', 'crm.lead')]" />
                             </group>
@@ -118,7 +118,7 @@
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Categorization" colspan="2"/>
-                                <field name="type_id" widget="selection"/>
+                                <field name="type_id" widget="selection" groups="base.group_extended"/>
                                 <field name="channel_id" widget="selection"/>
                             </group>
                             <group colspan="2" col="2">
@@ -337,7 +337,7 @@
                             <filter string="Category" icon="terp-stock_symbol-selection"
                                 domain="[]" context="{'group_by':'categ_id'}" />
                             <filter string="Campaign" icon="terp-stock_symbol-selection"
-                                domain="[]" context="{'group_by':'type_id'}" />
+                                domain="[]" context="{'group_by':'type_id'}" groups="base.group_extended"/>
                             <filter string="Channel" icon="terp-stock_symbol-selection"
                                 domain="[]" context="{'group_by':'channel_id'}" />
                             <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index de77c842aa6..62c15759bbc 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -54,9 +54,8 @@ class crm_claim(crm.crm_case, osv.osv):
                             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),\
-                         ('object_id.model', '=', 'crm.claim')]"), 
+        'type_id': fields.many2one('crm.case.resource.type', 'Campaign', \
+                         domain="[('section_id','=',section_id)]"), 
         'user_id': fields.many2one('res.users', 'Responsible'), 
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
                         select=True, help="Sales team to which Case belongs to."\
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index d815e645c10..9bf5f3bb3ee 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -64,9 +64,8 @@ class crm_fundraising(crm.crm_case, osv.osv):
             'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
                              domain="[('section_id','=',section_id),\
                             ('object_id.model', '=', 'crm.fundraising')]"), 
-            'type_id': fields.many2one('crm.case.resource.type', 'Fundraising Type', \
-                             domain="[('section_id','=',section_id),\
-                             ('object_id.model', '=', 'crm.fundraising')]"), 
+            'type_id': fields.many2one('crm.case.resource.type', 'Campaign', \
+                             domain="[('section_id','=',section_id)]"), 
             'duration': fields.float('Duration'), 
             'ref': fields.reference('Reference', selection=crm._links_get, size=128), 
             'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128), 
diff --git a/addons/project_issue/i18n/en_US.po b/addons/project_issue/i18n/en_US.po
index e015c70de7c..1f4a96616e2 100644
--- a/addons/project_issue/i18n/en_US.po
+++ b/addons/project_issue/i18n/en_US.po
@@ -254,9 +254,9 @@ msgstr "Send New Email"
 
 #. module: project_issue
 #: view:project.issue:0
-#: field:project.issue,type_id:0
+#: field:project.issue,version_id:0
 #: view:project.issue.report:0
-#: field:project.issue.report,type_id:0
+#: field:project.issue.report,version_id:0
 msgid "Version"
 msgstr "Version"
 
diff --git a/addons/project_issue/i18n/fr.po b/addons/project_issue/i18n/fr.po
index 218c37a2cbf..316978046f5 100644
--- a/addons/project_issue/i18n/fr.po
+++ b/addons/project_issue/i18n/fr.po
@@ -259,9 +259,9 @@ msgstr ""
 
 #. module: project_issue
 #: view:project.issue:0
-#: field:project.issue,type_id:0
+#: field:project.issue,version_id:0
 #: view:project.issue.report:0
-#: field:project.issue.report,type_id:0
+#: field:project.issue.report,version_id:0
 msgid "Version"
 msgstr ""
 
diff --git a/addons/project_issue/i18n/project_issue.pot b/addons/project_issue/i18n/project_issue.pot
index d409b33816c..521eefb19c8 100644
--- a/addons/project_issue/i18n/project_issue.pot
+++ b/addons/project_issue/i18n/project_issue.pot
@@ -254,9 +254,9 @@ msgstr ""
 
 #. module: project_issue
 #: view:project.issue:0
-#: field:project.issue,type_id:0
+#: field:project.issue,version_id:0
 #: view:project.issue.report:0
-#: field:project.issue.report,type_id:0
+#: field:project.issue.report,version_id:0
 msgid "Version"
 msgstr ""
 
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 19db547983b..17df3444b27 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -28,6 +28,18 @@ import time
 import tools
 
 
+class project_issue_version(osv.osv):
+    _name = "project.issue.version"
+    _order = "name desc"
+    _columns = {
+        'name': fields.char('Version Number', size=32, required=True),
+        'active': fields.boolean('Active', required=False),
+    }
+    _defaults = {
+        'active': 1,
+    }
+project_issue_version()
+
 class project_issue(crm.crm_case, osv.osv):
     _name = "project.issue"
     _description = "Project Issue"
@@ -161,7 +173,7 @@ class project_issue(crm.crm_case, osv.osv):
                                                                         " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('object_id.model', '=', 'crm.project.bug')]"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Severity'),
-        'type_id': fields.many2one('crm.case.resource.type', 'Version', domain="[('object_id.model', '=', 'project.issue')]"),
+        'version_id': fields.many2one('project.issue.version', 'Version'),
         'partner_name': fields.char("Employee's Name", size=64),
         'partner_mobile': fields.char('Mobile', size=32),
         'partner_phone': fields.char('Phone', size=32),
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
index b5fa80b96bd..738f734e35a 100644
--- a/addons/project_issue/project_issue_data.xml
+++ b/addons/project_issue/project_issue_data.xml
@@ -19,19 +19,16 @@
 
         <!-- Case type_id -->
         <!--    For Bugs    -->
-        <record model="crm.case.resource.type" id="type1">
-            <field name="name">Version 4.2</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
+        <record model="project.issue.version" id="type1">
+            <field name="name">v1.0</field>
         </record>
 
-        <record model="crm.case.resource.type" id="type2">
-            <field name="name">Version 5.0</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
+        <record model="project.issue.version" id="type2">
+            <field name="name">v2.0</field>
         </record>
 
-        <record model="crm.case.resource.type" id="type3">
-            <field name="name">Version 6.0</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
+        <record model="project.issue.version" id="type3">
+            <field name="name">v3.0</field>
         </record>
 
         <!-- Case Stage -->
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index ad6af0e02b0..7c5ae6083ed 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -5,7 +5,6 @@
     <record id="crm_case_buginaccountsmodule0" model="project.issue">
         <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="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"/>
@@ -23,7 +22,6 @@
     <record id="crm_case_programnotgivingproperoutput0" model="project.issue">
         <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="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"/>
@@ -40,7 +38,6 @@
     <record id="crm_case_outputincorrect0" model="project.issue">
         <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="type_id" ref="type1"/>
         <field eval="&quot;4&quot;" name="priority"/>
         <field name="user_id" ref="base.user_demo"/>
         <field eval="&quot;cancel&quot;" name="state"/>
@@ -56,7 +53,6 @@
     <record id="crm_case_problemloadingpage0" model="project.issue">
         <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="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"/>
@@ -72,7 +68,6 @@
 
     <record id="crm_case_pagenotfound0" model="project.issue">
         <field eval="time.strftime('%Y-%m-22  18:15:00')" name="date"/>
-        <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"/>
@@ -89,7 +84,6 @@
     <record id="crm_case_programmingerror0" model="project.issue">
         <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="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"/>
@@ -106,7 +100,6 @@
     <record id="crm_case_logicalerrorinprogram0" model="project.issue">
         <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="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"/>
@@ -123,7 +116,6 @@
     <record id="crm_case_constrainterror0" model="project.issue">
         <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="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"/>
@@ -140,7 +132,6 @@
     <record id="crm_case_errorinprogram0" model="project.issue">
         <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="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"/>
@@ -156,7 +147,6 @@
     <record id="crm_case_patcheserrorinprogram0" model="project.issue">
         <field name="partner_address_id" ref="base.res_partner_address_9"/>
         <field eval="time.strftime('%Y-%m-28  16:30:00')" name="date"/>
-        <field name="type_id" ref="type2"/>
         <field eval="&quot;2&quot;" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
         <field name="partner_id" ref="base.res_partner_2"/>
@@ -173,7 +163,6 @@
     <record id="crm_case_newfeaturestobeadded0" model="project.issue">
         <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="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"/>
@@ -190,7 +179,6 @@
     <record id="crm_case_addmenustothemodule0" model="project.issue">
         <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="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 +196,6 @@
     <record id="crm_case_includeattendancesheetinproject0" model="project.issue">
         <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="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 +214,6 @@
         <field model="res.partner.canal" name="canal_id" search="[('name','=','phone')]"/>
         <field name="partner_address_id" ref="base.res_partner_address_6"/>
         <field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/>
-        <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"/>
@@ -244,7 +230,6 @@
     <record id="crm_case_improvereportsinhrms0" model="project.issue">
         <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="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"/>
@@ -261,7 +246,6 @@
     <record id="crm_case_improvereportsinpms0" model="project.issue">
         <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="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/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index ad254bdd6a8..c67820571ee 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -2,7 +2,36 @@
 <openerp>
     <data>
 
-       <menuitem  id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2" groups="base.group_system"/>
+        <menuitem  id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2" groups="base.group_system"/>
+
+        <record model="ir.ui.view" id="project_issue_version_search_view">
+            <field name="name">Issue Version</field>
+            <field name="model">project.issue.version</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Issue Version">
+                    <field name="name"/>
+                    <field name="active"/>
+                </search>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="project_issue_version_form_view">
+            <field name="name">Issue Version</field>
+            <field name="model">project.issue.version</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Issue Version">
+                    <field name="name"/>
+                    <field name="active"/>
+                </form>
+            </field>
+        </record>
+        <record id="project_issue_version_action" model="ir.actions.act_window">
+            <field name="name">Versions</field>
+            <field name="res_model">project.issue.version</field>
+            <field name="view_type">form</field>
+        </record>
+        <menuitem action="project_issue_version_action" id="menu_project_issue_version_act" parent="menu_project_confi" />
 
         <record id="project_issue_categ_action" model="ir.actions.act_window">
             <field name="name">Issue Categories</field>
@@ -54,7 +83,7 @@
                             </group>
                             <group col="3" colspan="2">
                             <separator colspan="3" string="Status"/>
-                            <field name="type_id" colspan="3"/>
+                            <field name="version_id" colspan="3" widget="selection"/>
                             <field name="priority" colspan="3"/>
                             <field name="task_id" />
                             <button string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"
@@ -169,7 +198,7 @@
                         states="open,draft,pending,done,cancel" />
                     <button icon="gtk-go-forward" string="" name="stage_next" type="object"
                         states="open,draft,pending,done,cancel" />
-                    <field name="type_id" string="Version"/>
+                    <field name="version_id" widget="selection"/>
                     <field name="user_id"/>
                     <field name="assigned_to"/>
                     <field name="state"/>
@@ -209,19 +238,19 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..."  groups="base.group_extended">
-                    	<filter string="Responsible" icon="terp-personal"
+                        <filter string="Responsible" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
-                    	<filter string="Partner" icon="terp-partner" domain="[]"
+                        <filter string="Partner" icon="terp-partner" domain="[]"
                             context="{'group_by':'partner_id'}" />
-						<separator orientation="vertical"/>
+                        <separator orientation="vertical"/>
                         <filter string="Project"  icon="terp-folder-blue" domain="[]"
                             context="{'group_by':'project_id'}" />
                         <filter string="Version" icon="terp-gtk-jump-to-rtl"
-                            domain="[]" context="{'group_by':'type_id'}" />
-						<separator orientation="vertical"/>
-						<filter string="Category" icon="terp-stock_symbol-selection" domain="[]"
+                            domain="[]" context="{'group_by':'version_id'}" />
+                        <separator orientation="vertical"/>
+                        <filter string="Category" icon="terp-stock_symbol-selection" domain="[]"
                             context="{'group_by':'categ_id'}" />
-						<filter string="Priority" icon="terp-rating-rated" domain="[]"
+                        <filter string="Priority" icon="terp-rating-rated" domain="[]"
                             context="{'group_by':'priority'}" />
                         <filter string="Stage" icon="terp-stage" domain="[]"
                             context="{'group_by':'stage_id'}" />
@@ -267,7 +296,7 @@
                         states="open,draft,pending,done,cancel" />
                     <button icon="gtk-go-forward" string="" name="stage_next" type="object"
                         states="open,draft,pending,done,cancel" />
-                    <field name="type_id" string="Version"/>
+                    <field name="version_id"/>
                     <field name="user_id"/>
                     <field name="state"/>
                     <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
@@ -306,7 +335,7 @@
             </field>
         </record>
 
-	# ------------------------------------------------------
+    # ------------------------------------------------------
     # Project
     # ------------------------------------------------------
 
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 97a340851ef..e0fe629e62d 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -86,7 +86,7 @@ class project_issue_report(osv.osv):
         'company_id' : fields.many2one('res.company', 'Company'),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'project_id':fields.many2one('project.project', 'Project',readonly=True),
-        'type_id': fields.many2one('crm.case.resource.type', 'Version'),
+        'version_id': fields.many2one('project.issue.version', 'Version'),
         'assigned_to' : fields.many2one('res.users', 'Assigned to',readonly=True),
         'partner_id': fields.many2one('res.partner','Partner',domain="[('object_id.model', '=', 'project.issue')]"),
         'canal_id': fields.many2one('res.partner.canal', 'Channel',readonly=True),
@@ -116,7 +116,7 @@ class project_issue_report(osv.osv):
                     c.company_id as company_id,
                     c.priority as priority,
                     c.project_id as project_id,
-                    c.type_id as type_id,
+                    c.version_id as version_id,
                     1 as nbr,
                     c.assigned_to,
                     c.partner_id,
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index d1b421d59ca..9003bd608a7 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -12,7 +12,7 @@
                     <field name="month" invisible="1"/>
                     <field name="project_id" invisible="1"/>
                     <field name="stage_id" invisible="1"/>
-                    <field name="type_id" string="Version" invisible="1"/>
+                    <field name="version_id" string="Version" invisible="1"/>
                     <field name="priority" invisible="1"/>
                     <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                     <field name="section_id" invisible="1"/>
@@ -52,45 +52,45 @@
             <field name="model">project.issue.report</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-				<search string="Search">
+                <search string="Search">
                   <group col="16" colspan="8">
-                   		<filter string="Year" icon="terp-go-year" help="Current Year"
+                           <filter string="Year" icon="terp-go-year" help="Current Year"
                         domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        />                   			
+                        />                               
 
                        <filter string="Month" icon="terp-go-month" name="This Month"
-                        domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"                    	   
+                        domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"                           
                         />
                        <filter icon="terp-go-week" string="Month-1" separator="1" help="Previous Month"
                             domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
                         />
 
-                   		<separator orientation="vertical" />
+                           <separator orientation="vertical" />
                         <filter  icon="terp-camera_test"
-                    		string="Current"
-                    		domain="[('state','in',('draft','open'))]"/>
+                            string="Current"
+                            domain="[('state','in',('draft','open'))]"/>
                        <filter icon="terp-gtk-media-pause"
-                    		string="Pending"
-                    		domain="[('state','=','pending')]"/>
+                            string="Pending"
+                            domain="[('state','=','pending')]"/>
                        <filter icon="terp-dialog-close"
-                    		string="Done"
-                    		domain="[('state','=','done')]"/>
+                            string="Done"
+                            domain="[('state','=','done')]"/>
 
-                   		<separator orientation="vertical" />
-                   		<field name="section_id"
-                   			string="Sale Team	"
-                   			default="context.get('section_id', False)"
-                   			widget="selection"
-                   			context="{'invisible_section': False}">
+                           <separator orientation="vertical" />
+                           <field name="section_id"
+                               string="Sale Team    "
+                               default="context.get('section_id', False)"
+                               widget="selection"
+                               context="{'invisible_section': False}">
 
-                   			<filter icon="terp-crm"
-                   				context="{'invisible_section': False}"
-                   				domain="[('section_id.user_id','=',uid)]"
-                   				help="My Sale Team" />
+                               <filter icon="terp-crm"
+                                   context="{'invisible_section': False}"
+                                   domain="[('section_id.user_id','=',uid)]"
+                                   help="My Sale Team" />
 
-                   		</field>
-                  			<field name="project_id"/>
-                      	<field name="user_id"  select="1" widget="selection"/>
+                           </field>
+                              <field name="project_id"/>
+                          <field name="user_id"  select="1" widget="selection"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
@@ -99,7 +99,7 @@
                        <separator orientation="vertical"/>
                        <field name="priority" />
                        <separator orientation="vertical"/>
-                       <field name="type_id" widget="selection" />
+                       <field name="version_id" widget="selection" />
                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
                        <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]" />
                        <separator orientation="vertical"/>
@@ -111,40 +111,40 @@
                    </group>
                    <newline/>
                    <group  expand="1" string="Group By..." colspan="4" col="8">
-                   		<filter name="User" string="Responsible" icon="terp-personal"
+                           <filter name="User" string="Responsible" icon="terp-personal"
                         domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Assigned to" name="Responsible" icon="terp-personal"
                         domain="[]" context="{'group_by':'assigned_to'}" />
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
-						<separator orientation="vertical" />
-						<filter string="Sale Team" icon="terp-personal+"
-                        	domain="[]"
-                        	context="{'group_by':'section_id'}" />
-						<separator orientation="vertical" />
+                        <separator orientation="vertical" />
+                        <filter string="Sale Team" icon="terp-personal+"
+                            domain="[]"
+                            context="{'group_by':'section_id'}" />
+                        <separator orientation="vertical" />
                         <filter string="Project"  name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}" />
                         <filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
                         <separator orientation="vertical" />
                         <filter string="Category" icon="terp-stock_symbol-selection"
-                        	domain="[]" context="{'group_by':'categ_id'}" />
-                        <filter string="Version"  icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
-						<separator orientation="vertical" />
-						<filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
+                            domain="[]" context="{'group_by':'categ_id'}" />
+                        <filter string="Version"  icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'version_id'}"/>
+                        <separator orientation="vertical" />
+                        <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize"
-                        	domain="[]" context="{'group_by':'state'}" />
+                            domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical"/>
                         <filter string="Company" icon="terp-go-home"
-                        	domain="[]"
-                        	context="{'group_by':'company_id'}" />
+                            domain="[]"
+                            context="{'group_by':'company_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-go-today"
-                        	domain="[]" context="{'group_by':'day'}" help="Current Day"/>
+                            domain="[]" context="{'group_by':'day'}" help="Current Day"/>
 
                         <filter string="Month" icon="terp-go-month"
-                        	domain="[]" context="{'group_by':'month'}" help="Current Month"/>
+                            domain="[]" context="{'group_by':'month'}" help="Current Month"/>
 
                         <filter string="Year" icon="terp-go-year"
-                        	domain="[]" context="{'group_by':'name'}" help="Current Year"/>
+                            domain="[]" context="{'group_by':'name'}" help="Current Year"/>
 
                   </group>
                </search>
@@ -155,26 +155,26 @@
             <field name="name">Issue Analysis</field>
             <field name="res_model">project.issue.report</field>
             <field name="view_type">form</field>
-  			<field name="view_mode">graph,tree</field>
-  			<field name="context">{'search_default_This Month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
+              <field name="view_mode">graph,tree</field>
+              <field name="context">{'search_default_This Month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_id" ref="view_project_issue_report_tree"/>
             <field name="search_view_id" ref="view_project_issue_report_filter"/>
             <field name="help">Track your projects issues and fixing delay with a high accuracy. A multicriteria search tool allows fine-grained analysis.</field>
         </record>
 
 
-       	<record model="ir.actions.act_window.view" id="action_project_issue_report_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_project_issue_report_tree"/>
-	        <field name="act_window_id" ref="action_project_issue_report"/>
-	    </record>
+           <record model="ir.actions.act_window.view" id="action_project_issue_report_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_project_issue_report_tree"/>
+            <field name="act_window_id" ref="action_project_issue_report"/>
+        </record>
         <record model="ir.actions.act_window.view" id="action_project_issue_report_graph">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">graph</field>
-	        <field name="view_id" ref="view_project_issue_report_graph"/>
-	        <field name="act_window_id" ref="action_project_issue_report"/>
-	    </record>
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_project_issue_report_graph"/>
+            <field name="act_window_id" ref="action_project_issue_report"/>
+        </record>
         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
         <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
         <menuitem action="action_project_issue_report" id="menu_project_issue_report_tree" parent="base.menu_project_report" groups="project.group_project_manager"/>
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index 4d76b713cac..1fe83d68c28 100755
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -6,8 +6,8 @@
 "access_project_issue_report","project.issue.report","model_project_issue_report","project_issue.group_project_supporter",1,1,1,1
 "access_crm_case_categ_id","crm.case.categ","crm.model_crm_case_categ","project.group_project_manager",1,1,1,1
 "access_crm_case_categ_supp","crm.case.categ","crm.model_crm_case_categ","project_issue.group_project_supporter",1,0,0,0
-"access_crm_case_resource_type_project","crm_case_resource_type manager","crm.model_crm_case_resource_type","project.group_project_manager",1,1,1,1
-"access_crm_case_resource_supp","crm_case_resource_type manager","crm.model_crm_case_resource_type","project_issue.group_project_supporter",1,0,0,0
+"access_project_issue_version_project","project_issue_version manager","model_project_issue_version","project.group_project_manager",1,1,1,1
+"access_project_issue_version","project_issue_version manager","model_project_issue_version","project_issue.group_project_supporter",1,0,0,0
 "access_crm_case_stage_manager_suppo","crm.case.stage","crm.model_crm_case_stage","project_issue.group_project_supporter",1,0,0,0
 "access_project_issue_system","project.issue system","model_project_issue","base.group_system",1,0,0,0
 "access_crm_case_stage_manager_system","crm.case.stage system","crm.model_crm_case_stage","base.group_system",1,1,1,1