From a878fa0903d5b3750cedefc97b07767c9cb98c09 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 13 Jan 2010 15:07:24 +0530
Subject: [PATCH] [IMP]: rename  then name category2_id field to type_id and
 remove the msg_new function

bzr revid: sbh@tinyerp.com-20100113093724-ggajsvixeg99n0gn
---
 addons/crm/crm.py                   | 114 +---------------------------
 addons/crm/crm_claim.py             |  36 +++++----
 addons/crm/crm_claims_data.xml      |  14 ++--
 addons/crm/crm_claims_demo.xml      |  14 ++--
 addons/crm/crm_claims_view.xml      |  39 +++++++++-
 addons/crm/crm_fund_data.xml        |   8 +-
 addons/crm/crm_fund_demo.xml        |  16 ++--
 addons/crm/crm_fund_view.xml        |  41 +++++++++-
 addons/crm/crm_fundraising.py       |  21 ++++-
 addons/crm/crm_helpdesk.py          |  18 -----
 addons/crm/crm_helpdesk_data.xml    |   4 -
 addons/crm/crm_helpdesk_view.xml    |   3 -
 addons/crm/crm_lead.py              |  35 ++++-----
 addons/crm/crm_lead_data.xml        |  28 +++----
 addons/crm/crm_lead_demo.xml        |  14 ++--
 addons/crm/crm_lead_view.xml        |  40 +++++++++-
 addons/crm/crm_opportunity.py       |  37 +++++----
 addons/crm/crm_opportunity_data.xml |  27 +++----
 addons/crm/crm_opportunity_demo.xml |   8 +-
 addons/crm/crm_opportunity_view.xml |  40 +++++++++-
 addons/crm/crm_phonecall.py         |  33 ++++----
 addons/crm/crm_phonecall_data.xml   |  11 +--
 addons/crm/crm_phonecall_view.xml   |  35 +++++++++
 addons/crm/crm_view.xml             |  77 ++-----------------
 24 files changed, 345 insertions(+), 368 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index ff9e945af74..d5f689ae4ee 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -101,18 +101,7 @@ class crm_case_section(osv.osv):
         return res
 crm_case_section()
 
-class crm_case_categ(osv.osv):
-    _name = "crm.case.categ"
-    _description = "Category of case"
-    _columns = {
-        'name': fields.char('Case Category Name', size=64, required=True, translate=True),
-        'probability': fields.float('Probability (%)', required=True),
-        'section_id': fields.many2one('crm.case.section', 'Case Section'),
-    }
-    _defaults = {
-        'probability': lambda *args: 0.0
-    }
-crm_case_categ()
+
 
 class crm_case_rule(osv.osv):
     _name = "crm.case.rule"
@@ -137,7 +126,8 @@ class crm_case_rule(osv.osv):
         'trg_date_range_type': fields.selection([('minutes', 'Minutes'),('hour','Hours'),('day','Days'),('month','Months')], 'Delay type'),
 
         'trg_section_id': fields.many2one('crm.case.section', 'Section'),
-        'trg_categ_id':  fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',trg_section_id)]"),
+    
+        #'trg_categ_id':  fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',trg_section_id)]"),
         'trg_user_id':  fields.many2one('res.users', 'Responsible'),
 
         'trg_partner_id': fields.many2one('res.partner', 'Partner'),
@@ -221,33 +211,6 @@ def _links_get(self, cr, uid, context={}):
     return [(r['object'], r['name']) for r in res]
 
 
-class crm_case_category2(osv.osv):
-    _name = "crm.case.category2"
-    _description = "Category2 of case"
-    _rec_name = "name"
-    _columns = {
-        'name': fields.char('Case Category2 Name', size=64, required=True, translate=True),
-        'section_id': fields.many2one('crm.case.section', 'Case Section'),
-    }
-
-crm_case_category2()
-
-
-class crm_case_stage(osv.osv):
-    _name = "crm.case.stage"
-    _description = "Stage of 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_case_stage()
-
 class crm_case(osv.osv):
     _name = "crm.case"
     _description = "Case"
@@ -551,6 +514,7 @@ class crm_case(osv.osv):
 
 
     def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, context={}):
+       
         for case in cases:
             data = {
                 'name': keyword,
@@ -770,76 +734,6 @@ class crm_case(osv.osv):
         return True
 crm_case()
 
-class crm_menu_config_wizard(osv.osv_memory):
-    _name = 'crm.menu.config_wizard'
-    _columns = {
-        'name': fields.char('Name', size=64),
-        'meeting': fields.boolean('Calendar of Meetings', help="Manages the calendar of meetings of the users."),
-        'lead': fields.boolean('Leads', help="Allows you to track and manage leads which are pre-sales requests or contacts, the very first contact with a customer request."),
-        'opportunity': fields.boolean('Business Opportunities', help="Tracks identified business opportunities for your sales pipeline."),
-        'jobs': fields.boolean('Jobs Hiring Process', help="Helps you to organise the jobs hiring process: evaluation, meetings, email integration..."),
-        'document_ics': fields.boolean('Shared Calendar', help=" Will allow you to synchronise your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."),
-        'bugs': fields.boolean('Bug Tracking', help="Used by companies to track bugs and support requests on software"),
-        'helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."),
-        'fund': fields.boolean('Fund Raising Operations', help="This may help associations in their fund raising process and tracking."),
-        'claims': fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."),
-        'phonecall': fields.boolean('Phone Calls', help="Helps you to encode the result of a phone call or to plan a list of phone calls to process."),
-    }
-    _defaults = {
-        'meeting': lambda *args: True,
-        'opportunity': lambda *args: True,
-        'phonecall': lambda *args: True,
-    }
-
-    def action_create(self, cr, uid, ids, context=None):
-        module_proxy = self.pool.get('ir.module.module')
-        modid = module_proxy.search(cr, uid, [('name', '=', 'crm')])
-        moddemo = module_proxy.browse(cr, uid, modid[0]).demo
-        lst = ('data', 'menu')
-        if moddemo:
-            lst = ('data', 'menu', 'demo')
-        res = self.read(cr, uid, ids)[0]
-        idref = {}
-        for section in ['meeting', 'lead', 'opportunity', 'jobs', 'bugs', 'fund', 'helpdesk', 'claims', 'phonecall']:
-            if (not res[section]):
-                continue
-            for fname in lst:
-                file_name = 'crm_' + section + '_' + fname + '.xml'
-                try:
-                    fp = tools.file_open(os.path.join('crm', file_name))
-                except IOError, e:
-                    fp = None
-                if fp:
-                    tools.convert_xml_import(cr, 'crm', fp, idref, 'init', noupdate=True)
-        cr.commit()
-        modobj = self.pool.get('ir.module.module')
-        modids = modobj.search(cr, uid, [('name', '=', 'crm')])
-        modobj.update_translations(cr, 1, modids, None)
-
-        if res['document_ics']:
-            ids = module_proxy.search(cr, uid, [('name', '=', 'document_ics')])
-            module_proxy.button_install(cr, uid, ids, context=context)
-            cr.commit()
-            db, pool = pooler.restart_pool(cr.dbname, update_module=True)
-
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-         }
-
-    def action_cancel(self, cr, uid, ids, context=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-         }
-
-crm_menu_config_wizard()
 
 class crm_case_log(osv.osv):
     _name = "crm.case.log"
diff --git a/addons/crm/crm_claim.py b/addons/crm/crm_claim.py
index aa8bc6d6423..64971c21a32 100644
--- a/addons/crm/crm_claim.py
+++ b/addons/crm/crm_claim.py
@@ -64,6 +64,21 @@ class crm_claim_type(osv.osv):
 
 crm_claim_type()
 
+class crm_claim_stage(osv.osv):
+    _name = "crm.claim.stage"
+    _description = "Stage of claim 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_claim_stage()
+
 class crm_claim(osv.osv):
     _name = "crm.claim"
     _description = "Claim Cases"
@@ -82,35 +97,18 @@ class crm_claim(osv.osv):
                                                                        "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
         'categ_id': fields.many2one('crm.claim.categ','Category', domain="[('section_id','=',section_id)]"),
         'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'),
-        'category2_id': fields.many2one('crm.claim.type', 'Claim Type', domain="[('section_id','=',section_id)]"),
+        'type_id': fields.many2one('crm.claim.type', 'Claim 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.case.stage', 'Stage', domain="[('section_id','=',section_id)]"),
+        'stage_id': fields.many2one ('crm.claim.stage', 'Stage', domain="[('section_id','=',section_id)]"),
     }
     
     _defaults = {
                  'priority': lambda *a: AVAILABLE_PRIORITIES[2][0],
     }
 
-    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
-
 crm_claim()
 
 
diff --git a/addons/crm/crm_claims_data.xml b/addons/crm/crm_claims_data.xml
index b4c8479c04d..9566e28f52a 100644
--- a/addons/crm/crm_claims_data.xml
+++ b/addons/crm/crm_claims_data.xml
@@ -21,11 +21,11 @@
 	<!--
 	Case Category2
 	-->
-	<record model="crm.claim.type" id="category_claim1">
+	<record model="crm.claim.type" id="type_claim1">
 		<field name="name">Corrective</field>
 		<field name="section_id" ref="section_sales_department"/>
 	</record>	
-	<record model="crm.claim.type" id="category_claim2">
+	<record model="crm.claim.type" id="type_claim2">
 		<field name="name">Preventive</field>
 		<field name="section_id" ref="section_sales_department"/>
 	</record>
@@ -33,23 +33,23 @@
 	<!--
 	Case Stage
 	-->
-	<record model="crm.case.stage" id="stage_claim1">
+	<record model="crm.claim.stage" id="stage_claim1">
 		<field name="name">Accepted as Claim</field>
 		<field name="section_id" ref="section_sales_department"/>
 	</record>	
-	<record model="crm.case.stage" id="stage_claim2">
+	<record model="crm.claim.stage" id="stage_claim2">
 		<field name="name">Fixed</field>
 		<field name="section_id" ref="section_sales_department"/>
 	</record>	
-	<record model="crm.case.stage" id="stage_claim3">
+	<record model="crm.claim.stage" id="stage_claim3">
 		<field name="name">Won't fix</field>
 		<field name="section_id" ref="section_sales_department"/>
 	</record>	
-	<record model="crm.case.stage" id="stage_claim4">
+	<record model="crm.claim.stage" id="stage_claim4">
 		<field name="name">Invalid</field>
 		<field name="section_id" ref="section_sales_department"/>
 	</record>	
-	<record model="crm.case.stage" id="stage_claim5">
+	<record model="crm.claim.stage" id="stage_claim5">
 		<field name="name">Awaiting Response</field>
 		<field name="section_id" ref="section_sales_department"/>
 	</record>
diff --git a/addons/crm/crm_claims_demo.xml b/addons/crm/crm_claims_demo.xml
index b957d286d85..525998c02ff 100644
--- a/addons/crm/crm_claims_demo.xml
+++ b/addons/crm/crm_claims_demo.xml
@@ -7,7 +7,7 @@
 		<record id="crm_case_claim01" model="crm.claim">
 			<field name="partner_address_id" ref="base.res_partner_address_15"/>
 			<field eval="time.strftime('%Y-%m-04 10:45:36')" name="date"/>
-			<field name="category2_id" ref="crm.category_claim1"/>
+			<field name="type_id" ref="crm.type_claim1"/>
 			<field name="partner_id" ref="base.res_partner_11"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
@@ -23,7 +23,7 @@
 		<record id="crm_case_claim02" model="crm.claim">
 			<field name="partner_address_id" ref="base.res_partner_address_6"/>
 			<field eval="time.strftime('%Y-%m-11 11:19:25')" name="date"/>
-			<field name="category2_id" ref="crm.category_claim2"/>
+			<field name="type_id" ref="crm.type_claim2"/>
 			<field name="partner_id" ref="base.res_partner_6"/>
 			<field eval="&quot;4&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
@@ -39,7 +39,7 @@
 		<record id="crm_case_claim03" model="crm.claim">
 			<field name="partner_address_id" ref="base.res_partner_address_2"/>
 			<field eval="time.strftime('%Y-%m-15 17:44:12')" name="date"/>
-			<field name="category2_id" ref="crm.category_claim1"/>
+			<field name="type_id" ref="crm.type_claim1"/>
 			<field name="partner_id" ref="base.res_partner_10"/>
 			<field eval="&quot;2&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_demo"/>
@@ -55,7 +55,7 @@
 		</record>
 		<record id="crm_case_claim04" model="crm.claim">
 			<field eval="time.strftime('%Y-%m-21 14:10:23')" name="date"/>
-			<field name="category2_id" ref="crm.category_claim2"/>
+			<field name="type_id" ref="crm.type_claim2"/>
 			<field name="partner_id" ref="base.res_partner_tinyatwork"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
@@ -71,7 +71,7 @@
 		<record id="crm_case_claim05" model="crm.claim">
 			<field name="partner_address_id" ref="base.res_partner_address_10"/>
 			<field eval="time.strftime('%Y-%m-28 16:20:43')" name="date"/>
-			<field name="category2_id" ref="crm.category_claim1"/>
+			<field name="type_id" ref="crm.type_claim1"/>
 			<field name="partner_id" ref="base.res_partner_5"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
@@ -87,7 +87,7 @@
 		<record id="crm_case_claim06" model="crm.claim">
 			<field name="partner_address_id" ref="base.res_partner_address_1"/>
 			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm.category_claim2"/>
+			<field name="type_id" ref="crm.type_claim2"/>
 			<field name="partner_id" ref="base.res_partner_9"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
@@ -103,7 +103,7 @@
 		</record>
 		<record id="crm_case_claims07" model="crm.claim">
 			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm.category_claim1"/>
+			<field name="type_id" ref="crm.type_claim1"/>
 			<field name="partner_id" ref="base.res_partner_seagate"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index 6c02d463a66..66a6c4a1971 100644
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -38,7 +38,42 @@
         <field name="view_type">form</field>
         <field name="view_id" ref="crm_claim_categ_view_tree"/>
     </record>
-
+    
+		# ------------------------------------------------------ 
+	    # Stage
+	    # ------------------------------------------------------ 
+	    <record model="ir.ui.view" id="crm_claim_stage_tree">
+	        <field name="name">crm.claim.stage.tree</field>
+	        <field name="model">crm.claim.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_claim_stage_form">
+	        <field name="name">crm.claim.stage.form</field>
+	        <field name="model">crm.claim.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_claim_stage_act" model="ir.actions.act_window">
+	        <field name="name">Claim Stages</field>
+	        <field name="res_model">crm.claim.stage</field>
+	        <field name="view_type">form</field>
+	        <field name="view_id" ref="crm_claim_stage_tree"/>
+	    </record>
+	  <menuitem action="crm_claim_stage_act" id="menu_crm_claim_stage_act" parent="crm.menu_crm_case_stage"/>
+	    
 	<!-- Claims	-->
     <record model="ir.ui.view" id="crm_case_claims_tree_view">
         <field name="name">CRM - Claims Tree</field>
@@ -86,7 +121,7 @@
                     <field name="planned_cost" string="Claim Cost"/>
                     <newline/>
                     <field name="priority"/>
-                    <field name="category2_id" string="Type of Action" select="1"/>
+                    <field name="type_id" string="Type of Action" select="1"/>
                     <field name="ref"/>
                     <field name="ref2"/>
                     <separator colspan="4" string="Claim/Action Description"/>
diff --git a/addons/crm/crm_fund_data.xml b/addons/crm/crm_fund_data.xml
index f76ca888123..08b8d71e5bb 100644
--- a/addons/crm/crm_fund_data.xml
+++ b/addons/crm/crm_fund_data.xml
@@ -26,22 +26,22 @@
 
         <!--    CASE CATEGORY2(category2_id)        -->
         
-    <record model="crm.fundraising.type" id="categ2_fund1">
+    <record model="crm.fundraising.type" id="type_fund1">
         <field name="name">Cash</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
     
-    <record model="crm.fundraising.type" id="categ2_fund2">
+    <record model="crm.fundraising.type" id="type_fund2">
         <field name="name">Cheque</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>        
 
-    <record model="crm.fundraising.type" id="categ2_fund3">
+    <record model="crm.fundraising.type" id="type_fund3">
         <field name="name">Credit Card</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
     
-    <record model="crm.fundraising.type" id="categ2_fund4">
+    <record model="crm.fundraising.type" id="type_fund4">
         <field name="name">Demand Draft</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>    
diff --git a/addons/crm/crm_fund_demo.xml b/addons/crm/crm_fund_demo.xml
index ef8f590954b..23ea6835df1 100644
--- a/addons/crm/crm_fund_demo.xml
+++ b/addons/crm/crm_fund_demo.xml
@@ -5,7 +5,7 @@
             <field eval="50" name="probability"/>
             <field name="partner_address_id" ref="base.res_partner_address_1"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="categ2_fund3"/>
+            <field name="type_id" ref="type_fund3"/>
             <field eval="3.0" name="duration"/>
             <field name="partner_id" ref="base.res_partner_9"/>
             <field eval="&quot;3&quot;" name="priority"/>
@@ -24,7 +24,7 @@
             <field eval="80" name="probability"/>
             <field name="partner_address_id" ref="base.main_address"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="categ2_fund4"/>
+            <field name="type_id" ref="type_fund4"/>
             <field name="partner_id" ref="base.main_partner"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
@@ -41,7 +41,7 @@
         <record id="crm_case_donatingbookstoschoollibraries0" model="crm.fundraising">
             <field name="partner_address_id" ref="base.res_partner_address_zen"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="categ2_fund1"/>
+            <field name="type_id" ref="type_fund1"/>
             <field eval="5.0" name="duration"/>
             <field name="partner_id" ref="base.res_partner_3"/>
             <field eval="&quot;3&quot;" name="priority"/>
@@ -58,7 +58,7 @@
         <record id="crm_case_renovatinggovernmentschools0" model="crm.fundraising">
             <field name="partner_address_id" ref="base.res_partner_address_7"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="categ2_fund2"/>
+            <field name="type_id" ref="type_fund2"/>
             <field eval="3.0" name="duration"/>
             <field name="partner_id" ref="base.res_partner_4"/>
             <field eval="&quot;3&quot;" name="priority"/>
@@ -76,7 +76,7 @@
         <record id="crm_case_donatingambulancestohospitals0" model="crm.fundraising">
             <field name="partner_address_id" ref="base.res_partner_address_13"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="categ2_fund4"/>
+            <field name="type_id" ref="type_fund4"/>
             <field name="partner_id" ref="base.res_partner_14"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
@@ -93,7 +93,7 @@
         <record id="crm_case_donatinghospitalequipments0" model="crm.fundraising">
             <field name="partner_address_id" ref="base.res_partner_address_2"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="categ2_fund3"/>
+            <field name="type_id" ref="type_fund3"/>
             <field name="partner_id" ref="base.res_partner_10"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
@@ -111,7 +111,7 @@
         <record id="crm_case_encouragingarts0" model="crm.fundraising">
             <field name="partner_address_id" ref="base.res_partner_address_14"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="categ2_fund2"/>
+            <field name="type_id" ref="type_fund2"/>
             <field eval="7.0" name="duration"/>
             <field name="partner_id" ref="base.res_partner_15"/>
             <field eval="&quot;3&quot;" name="priority"/>
@@ -129,7 +129,7 @@
             <field eval="10" name="probability"/>
             <field name="partner_address_id" ref="base.res_partner_address_1"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="categ2_fund1"/>
+            <field name="type_id" ref="type_fund1"/>
             <field eval="6.0" name="duration"/>
             <field name="partner_id" ref="base.res_partner_9"/>
             <field eval="&quot;3&quot;" name="priority"/>
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index 57b29f7b2c5..5161dae753c 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -36,7 +36,42 @@
         <field name="view_type">form</field>
         <field name="view_id" ref="crm_fund_categ_view_tree"/>
     </record>
-
+    
+    # ------------------------------------------------------
+    # Fund Stage
+    # ------------------------------------------------------
+	    <record model="ir.ui.view" id="crm_fundraising_stage_tree">
+	        <field name="name">crm.fundraising.stage.tree</field>
+	        <field name="model">crm.fundraising.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_fundraising_stage_form">
+	        <field name="name">crm.fundraising.stage.form</field>
+	        <field name="model">crm.fundraising.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_fundraising_stage_act" model="ir.actions.act_window">
+	        <field name="name">Fundraising Stages</field>
+	        <field name="res_model">crm.claim.stage</field>
+	        <field name="view_type">form</field>
+	        <field name="view_id" ref="crm_fundraising_stage_tree"/>
+	    </record>
+	  <menuitem action="crm_fundraising_stage_act" id="menu_crm_fundraising_stage_act" parent="crm.menu_crm_case_stage"/>
+	    
     # ------------------------------------------------------
     # Fund Raising
     # ------------------------------------------------------
@@ -49,7 +84,7 @@
                 <field name="id"/>
                 <field name="name" string="Funds"/>
                 <field name="categ_id"/>
-                <field name="category2_id" string="Payment Mode"/>
+                <field name="type_id" string="Payment Mode"/>
                 <field name="planned_cost" string="Amount"/>
                 <field name="probability"/>
                 <field name="user_id"/>
@@ -76,7 +111,7 @@
                     <newline/>
                     <field name="date" string="Next Meeting"/>
                     <field name="duration"/>
-                    <field name="category2_id" select="1" string="Payment Mode"/>
+                    <field name="type_id" select="1" string="Payment Mode"/>
                 </group>
                 <notebook colspan="4">
                 <page string="Funds">
diff --git a/addons/crm/crm_fundraising.py b/addons/crm/crm_fundraising.py
index 86f3cf1e52e..5bb74150088 100644
--- a/addons/crm/crm_fundraising.py
+++ b/addons/crm/crm_fundraising.py
@@ -70,6 +70,22 @@ class crm_fundraising_type(osv.osv):
 
 crm_fundraising_type()
 
+class crm_fundraising_stage(osv.osv):
+    _name = "crm.fundraising.stage"
+    _description = "Stage of fundraising 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_fundraising_stage()
+
+
 class crm_fundraising(osv.osv):
     _name = "crm.fundraising"
     _description = "Fund Raising Cases"
@@ -86,10 +102,9 @@ class crm_fundraising(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.fundraising.type', 'Fundraising Type', domain="[('section_id','=',section_id)]"),
+            'stage_id': fields.many2one ('crm.fundraising.stage', 'Stage', domain="[('section_id','=',section_id)]"),
+            'type_id': fields.many2one('crm.fundraising.type', 'Fundraising Type', domain="[('section_id','=',section_id)]"),
             'duration': fields.float('Duration'),
-            'case_id': fields.many2one('crm.case', 'Related fundraising'),
             '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." \
diff --git a/addons/crm/crm_helpdesk.py b/addons/crm/crm_helpdesk.py
index ac94f5e6d98..172ad585726 100644
--- a/addons/crm/crm_helpdesk.py
+++ b/addons/crm/crm_helpdesk.py
@@ -79,26 +79,8 @@ class crm_helpdesk(osv.osv):
                                                                    "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
             'categ_id': fields.many2one('crm.helpdesk.categ', 'Category', domain="[('section_id','=',section_id)]"),
             'duration': fields.float('Duration'),
-            'case_id': fields.many2one('crm.case', 'Related Helpdesk'),
     }
     
-    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
-
 crm_helpdesk()
 
 
diff --git a/addons/crm/crm_helpdesk_data.xml b/addons/crm/crm_helpdesk_data.xml
index 50d350e0641..bc3adea8b38 100644
--- a/addons/crm/crm_helpdesk_data.xml
+++ b/addons/crm/crm_helpdesk_data.xml
@@ -4,10 +4,6 @@
     <!--
     Case Sections
     -->
-    <record model="crm.case.section" id="section_support_help">
-        <field name="name">HelpDesk</field>
-        <field name="code">HD</field>
-    </record>
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index c2476e7cd0a..5bd2b15f84b 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -54,9 +54,6 @@
                     <field name="date" select="1"/>
                     <field name="date_deadline" select="2"/>
                     <field name="priority"/>
-                    <group colspan="2">
-                        <field name="case_id" select="1"/>
-                    </group>
                 </group>
                 <notebook colspan="4">
                     <page string="General">
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 1a1bbc62843..5716bb10108 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -69,6 +69,20 @@ class crm_lead_type(osv.osv):
     }
 crm_lead_type()
 
+class crm_lead_stage(osv.osv):
+    _name = "crm.lead.stage"
+    _description = "Stage of claim 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_lead_stage()
 class crm_opportunity(osv.osv):
     _name = "crm.opportunity"
 crm_opportunity()
@@ -80,7 +94,7 @@ class crm_lead(osv.osv):
     _inherit = 'crm.case'    
     _columns = {
             'categ_id': fields.many2one('crm.lead.categ', 'Category', domain="[('section_id','=',section_id)]"),
-            'category2_id': fields.many2one('crm.lead.type', 'Lead Type Name', domain="[('section_id','=',section_id)]"),
+            'type_id': fields.many2one('crm.lead.type', 'Lead Type Name', domain="[('section_id','=',section_id)]"),
             'partner_name': fields.char("Employee's Name", size=64),
             'partner_name2': fields.char('Employee Email', size=64),
             'partner_phone': fields.char('Phone', size=32),
@@ -94,29 +108,12 @@ class crm_lead(osv.osv):
                                                                             " 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'),
-            'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id)]"),
+            'stage_id': fields.many2one ('crm.lead.stage', 'Stage', domain="[('section_id','=',section_id)]"),
             '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)."),
                                                                        
              'opportunity_id': fields.many2one ('crm.opportunity', 'Opportunity'),
     }
-    
-    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
 
 crm_lead()
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 3c329d22a39..bb232abfa52 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -32,61 +32,61 @@
     </record>
 
 <!--        CASE STATUS(stage_id)        -->
-    <record model="crm.case.stage" id="stage_lead1">
+    <record model="crm.lead.stage" id="stage_lead1">
         <field name="name">New</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
-    <record model="crm.case.stage" id="stage_lead2">
+    <record model="crm.lead.stage" id="stage_lead2">
         <field name="name">Assigned</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
-    <record model="crm.case.stage" id="stage_lead3">
+    <record model="crm.lead.stage" id="stage_lead3">
         <field name="name">In Process</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
-    <record model="crm.case.stage" id="stage_lead4">
+    <record model="crm.lead.stage" id="stage_lead4">
         <field name="name">Converted</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
-    <record model="crm.case.stage" id="stage_lead5">
+    <record model="crm.lead.stage" id="stage_lead5">
         <field name="name">Recycled</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
-    <record model="crm.case.stage" id="stage_lead6">
+    <record model="crm.lead.stage" id="stage_lead6">
         <field name="name">Dead</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
 
 <!--        CASE CATEGORY2(category2_id)        -->
-    <record model="crm.lead.type" id="category_lead1">
+    <record model="crm.lead.type" id="type_lead1">
         <field name="name">Telesales</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
-    <record model="crm.lead.type" id="category_lead2">
+    <record model="crm.lead.type" id="type_lead2">
         <field name="name">Mail</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
-    <record model="crm.lead.type" id="category_lead3">
+    <record model="crm.lead.type" id="type_lead3">
         <field name="name">Email</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
-    <record model="crm.lead.type" id="category_lead4">
+    <record model="crm.lead.type" id="type_lead4">
         <field name="name">Print</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
-    <record model="crm.lead.type" id="category_lead5">
+    <record model="crm.lead.type" id="type_lead5">
         <field name="name">Web</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
-    <record model="crm.lead.type" id="category_lead6">
+    <record model="crm.lead.type" id="type_lead6">
         <field name="name">Radio</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
-    <record model="crm.lead.type" id="category_lead7">
+    <record model="crm.lead.type" id="type_lead7">
         <field name="name">Television</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
-    <record model="crm.lead.type" id="category_lead8">
+    <record model="crm.lead.type" id="type_lead8">
         <field name="name">Newsletter</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index bfe9e8ad2e8..affdd2c437a 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -7,7 +7,7 @@
 
     <!--For Leads-->
         <record id="crm_case_itisatelesalescampaign0" model="crm.lead">
-            <field name="category2_id" ref="crm.category_lead1"/>
+            <field name="type_id" ref="crm.type_lead1"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Exhibition ERP 2009&quot;" name="name"/>
@@ -22,7 +22,7 @@
             <field eval="&quot;(769) 703-274&quot;" name="partner_phone"/>
         </record>
         <record id="crm_case_electonicgoodsdealer0" model="crm.lead">
-            <field name="category2_id" ref="crm.category_lead7"/>
+            <field name="type_id" ref="crm.type_lead7"/>
             <field eval="&quot;4&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Exhibition ERP 2009&quot;" name="name"/>
@@ -37,7 +37,7 @@
             <field eval="&quot;(956) 293-2595&quot;" name="partner_phone"/>
         </record>
         <record id="crm_case_developingwebapplications0" model="crm.lead">
-            <field name="category2_id" ref="crm.category_lead5"/>
+            <field name="type_id" ref="crm.type_lead5"/>
             <field eval="&quot;2&quot;" name="priority"/>
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;Exhibition ERP 2009&quot;" name="name"/>
@@ -53,7 +53,7 @@
             <field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
         </record>
         <record id="crm_case_qrecorp0" model="crm.lead">
-            <field name="category2_id" ref="crm.category_lead8"/>
+            <field name="type_id" ref="crm.type_lead8"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Exhibition ERP 2009&quot;" name="name"/>
@@ -67,7 +67,7 @@
             <field eval="&quot;(514) 698-4118&quot;" name="partner_phone"/>
         </record>
         <record id="crm_case_itdeveloper0" model="crm.lead">
-            <field name="category2_id" ref="crm.category_lead4"/>
+            <field name="type_id" ref="crm.type_lead4"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Carrie Helle&quot;" name="name"/>
@@ -84,7 +84,7 @@
         <record id="crm_case_mgroperations0" model="crm.lead">
             <field name="partner_address_id" ref="base.res_partner_address_1"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="crm.category_lead3"/>
+            <field name="type_id" ref="crm.type_lead3"/>
             <field name="partner_id" ref="base.res_partner_9"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
@@ -101,7 +101,7 @@
         </record>
         <record id="crm_case_vpoperations0" model="crm.lead">
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="crm.category_lead8"/>
+            <field name="type_id" ref="crm.type_lead8"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Wendi Baltz&quot;" name="name"/>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 0776699b247..2c0441a7c2f 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -37,7 +37,41 @@
         <field name="view_type">form</field>
         <field name="view_id" ref="crm_lead_categ_view_tree"/>
     </record>
-
+    
+		# ------------------------------------------------------ 
+	    # Stage
+	    # ------------------------------------------------------ 
+	    <record model="ir.ui.view" id="crm_lead_stage_tree">
+	        <field name="name">crm.lead.stage.tree</field>
+	        <field name="model">crm.lead.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_lead_stage_form">
+	        <field name="name">crm.lead.stage.form</field>
+	        <field name="model">crm.lead.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_lead_stage_act" model="ir.actions.act_window">
+	        <field name="name">Lead Stages</field>
+	        <field name="res_model">crm.claim.stage</field>
+	        <field name="view_type">form</field>
+	        <field name="view_id" ref="crm_lead_stage_tree"/>
+	    </record>
+	  <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" parent="crm.menu_crm_case_stage"/>
     # ------------------------------------------------------
     # Leads
     # ------------------------------------------------------   
@@ -59,7 +93,7 @@
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                     </group>
                     <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source"/>
-                    <field name="category2_id" string="Campaign Type" select="1"/>
+                    <field name="type_id" string="Campaign Type" select="1"/>
                 </group>
                 <group colspan="2" col="4">
 	                <field name="opportunity_id" string="Opportunity Case"/>
@@ -143,7 +177,7 @@
                 <field name="partner_name2" string="Contact Name"/>
                 <field name="stage_id"/>
                 <field name="categ_id" string="Lead Source"/>
-                <field name="category2_id" string="Campaign Type"/>
+                <field name="type_id" string="Campaign Type"/>
                 <field name="user_id"/>
                 <field name="state"/>
                 <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 71beabaf144..d6dae096090 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -69,15 +69,30 @@ class crm_opportunity_type(osv.osv):
     }
 crm_opportunity_type()
 
+class crm_opportunity_stage(osv.osv):
+    _name = "crm.opportunity.stage"
+    _description = "Stage of opportunity 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_opportunity_stage()
+
 class crm_opportunity(osv.osv):
     _name = "crm.opportunity"
     _description = "Opportunity Cases"
     _order = "id desc"
     _inherit = 'crm.case'  
     _columns = {        
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id)]"),
+        'stage_id': fields.many2one ('crm.opportunity.stage', 'Stage', domain="[('section_id','=',section_id)]"),
         'categ_id': fields.many2one('crm.opportunity.categ', 'Category', domain="[('section_id','=',section_id)]"),
-        'category2_id': fields.many2one('crm.opportunity.type', 'Opportunity Type', domain="[('section_id','=',section_id)]"),
+        'type_id': fields.many2one('crm.opportunity.type', 'Opportunity Type', domain="[('section_id','=',section_id)]"),
         'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'),
         'probability': fields.float('Probability (%)'),
         'planned_revenue': fields.float('Planned Revenue'),
@@ -92,23 +107,5 @@ class crm_opportunity(osv.osv):
         'date_closed': fields.datetime('Closed', readonly=True),
         'phonecall_id':fields.many2one ('crm.phonecall', 'Phonecall'),
     }
-
-    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
-
 crm_opportunity()
 
diff --git a/addons/crm/crm_opportunity_data.xml b/addons/crm/crm_opportunity_data.xml
index 062d033ceac..bc08064ab92 100644
--- a/addons/crm/crm_opportunity_data.xml
+++ b/addons/crm/crm_opportunity_data.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-    <record model="crm.case.section" id="section_support3">
-        <field name="name">Opportunities</field>
-        <field name="code">oppor</field>
-    </record>
-
     <record model="crm.opportunity.categ" id="categ_oppor1">
         <field name="name">Existing Customer</field>
         <field name="section_id" ref="section_sales_department"/>
@@ -40,41 +35,41 @@
     </record>    
 
 <!--        CASE STATUS(stage_id)        -->
-    <record model="crm.case.stage" id="stage_oppor1">
+    <record model="crm.opportunity.stage" id="stage_oppor1">
         <field name="name">Prospecting</field>
-        <field name="section_id" ref="section_support3"/>
+        <field name="section_id" ref="section_sales_department"/>
     </record>
-    <record model="crm.case.stage" id="stage_oppor2">
+    <record model="crm.opportunity.stage" id="stage_oppor2">
         <field name="name">Needs Analysis</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
-    <record model="crm.case.stage" id="stage_oppor3">
+    <record model="crm.opportunity.stage" id="stage_oppor3">
         <field name="name">Value Proposition</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
-    <record model="crm.case.stage" id="stage_oppor4">
+    <record model="crm.opportunity.stage" id="stage_oppor4">
         <field name="name">Proposal/Price Quote</field>
-        <field name="section_id" ref="section_support3"/>
+        <field name="section_id" ref="section_sales_department"/>
     </record>
-    <record model="crm.case.stage" id="stage_oppor5">
+    <record model="crm.opportunity.stage" id="stage_oppor5">
         <field name="name">Negotiation/Review</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
-    <record model="crm.case.stage" id="stage_oppor6">
+    <record model="crm.opportunity.stage" id="stage_oppor6">
         <field name="name">Closed Won</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
-    <record model="crm.case.stage" id="stage_oppor7">
+    <record model="crm.opportunity.stage" id="stage_oppor7">
         <field name="name">Closed Lost</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
 
 <!--        CASE CATEGORY2(category2_id)        -->
-    <record model="crm.opportunity.type" id="category_oppor1">
+    <record model="crm.opportunity.type" id="type_oppor1">
         <field name="name">Existing Business</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>    
-    <record model="crm.opportunity.type" id="category_oppor2">
+    <record model="crm.opportunity.type" id="type_oppor2">
         <field name="name">New Business</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
diff --git a/addons/crm/crm_opportunity_demo.xml b/addons/crm/crm_opportunity_demo.xml
index ecf6cb1d5c0..08976720a0f 100644
--- a/addons/crm/crm_opportunity_demo.xml
+++ b/addons/crm/crm_opportunity_demo.xml
@@ -12,7 +12,7 @@
             <field name="partner_address_id" ref="base.res_partner_address_zen"/>
             <field eval="1" name="active"/>
             <field eval="17.0" name="duration"/>
-            <field name="category2_id" ref="crm.category_oppor1"/>
+            <field name="type_id" ref="crm.type_oppor1"/>
             <field name="partner_id" ref="base.res_partner_3"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
@@ -28,7 +28,7 @@
         <record id="crm_case_rdroundfundingunits0" model="crm.opportunity">
             <field name="partner_address_id" ref="base.res_partner_address_15"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="crm.category_oppor2"/>
+            <field name="type_id" ref="crm.type_oppor2"/>
             <field name="partner_id" ref="base.res_partner_11"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
@@ -47,7 +47,7 @@
             <field eval="10" name="probability"/>
             <field name="partner_address_id" ref="base.res_partner_address_3"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="crm.category_oppor1"/>
+            <field name="type_id" ref="crm.type_oppor1"/>
             <field name="partner_id" ref="base.res_partner_8"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
@@ -67,7 +67,7 @@
             <field eval="40" name="probability"/>
             <field name="partner_address_id" ref="base.res_partner_address_1"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="crm.category_oppor1"/>
+            <field name="type_id" ref="crm.type_oppor1"/>
             <field name="partner_id" ref="base.res_partner_9"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_demo"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index c6ed8b56f3e..453c25c3d41 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -37,7 +37,43 @@
         <field name="view_type">form</field>
         <field name="view_id" ref="crm_opportunity_categ_view_tree"/>
     </record>
-
+    
+		# ------------------------------------------------------ 
+	    # Stage
+	    # ------------------------------------------------------ 
+	    <record model="ir.ui.view" id="crm_opportunity_stage_tree">
+	        <field name="name">crm.opportunity.stage.tree</field>
+	        <field name="model">crm.opportunity.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_opportunity_stage_form">
+	        <field name="name">crm.opportunity.stage.form</field>
+	        <field name="model">crm.opportunity.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_opportunity_stage_act" model="ir.actions.act_window">
+	        <field name="name">Opportunity Stages</field>
+	        <field name="res_model">crm.claim.stage</field>
+	        <field name="view_type">form</field>
+	        <field name="view_id" ref="crm_opportunity_stage_tree"/>
+	    </record>
+	  <menuitem action="crm_opportunity_stage_act" id="menu_crm_opportunity_stage_act" parent="crm.menu_crm_case_stage"/>
     # ------------------------------------------------------
     # Opportunities
     # ------------------------------------------------------   
@@ -76,7 +112,7 @@
                     <field name="email_from" colspan="2"/>
                     <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Source"/>
                     <field name="priority" string="Priority"/>
-                    <field name="category2_id" select="1" string="Category"/>
+                    <field name="type_id" select="1" string="Type"/>
                     <separator colspan="4" string="Estimates"/>
                     <field name="planned_revenue"/>
                     <field name="planned_cost"/>
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 82af74a5aec..ad449bf837a 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -50,6 +50,22 @@ class crm_phonecall_categ(osv.osv):
         'probability': lambda *args: 0.0
     }
 crm_phonecall_categ()
+
+class crm_phonecall_stage(osv.osv):
+    _name = "crm.phonecall.stage"
+    _description = "Stage of phonecal 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_phonecall_stage()
+
 class crm_phonecall(osv.osv):
     _name = "crm.phonecall"
     _description = "Phonecall Cases"
@@ -72,22 +88,5 @@ class crm_phonecall(osv.osv):
         'opportunity_id':fields.many2one ('crm.opportunity', 'Opportunity'),        
     }
 
-    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
-
 crm_phonecall()
 
diff --git a/addons/crm/crm_phonecall_data.xml b/addons/crm/crm_phonecall_data.xml
index 559825f2e02..a7444ad0b1e 100644
--- a/addons/crm/crm_phonecall_data.xml
+++ b/addons/crm/crm_phonecall_data.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-<!--	<record model="crm.case.section" id="section_support_phone">
-		<field name="name">Phone Calls</field>
-		<field name="code">Phone</field>
-	</record>-->
+->
 	
 	<!--
 	Phonecall Categories
@@ -21,15 +18,15 @@
 	<!--
 	Case Stage
 	-->
-	<record model="crm.case.stage" id="stage_phone1">
+	<record model="crm.phonecall.stage" id="stage_phone1">
 		<field name="name">Planned</field>
 		<field name="section_id" ref="section_sales_department"/>
 	</record>	
-	<record model="crm.case.stage" id="stage_phone2">
+	<record model="crm.phonecall.stage" id="stage_phone2">
 		<field name="name">Held</field>
 		<field name="section_id" ref="section_sales_department"/>
 	</record>	
-	<record model="crm.case.stage" id="stage_phone3">
+	<record model="crm.phonecall.stage" id="stage_phone3">
 		<field name="name">Not Held</field>
 		<field name="section_id" ref="section_sales_department"/>
 	</record>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 8692ac9f110..2a2548b89c8 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -38,6 +38,41 @@
         <field name="view_id" ref="crm_phonecall_categ_view_tree"/>
     </record>
     
+    # ------------------------------------------------------
+    # Fund Stage
+    # ------------------------------------------------------
+	    <record model="ir.ui.view" id="crm_phonecall_stage_tree">
+	        <field name="name">crm.phonecall.stage.tree</field>
+	        <field name="model">crm.phonecall.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_phonecall_stage_form">
+	        <field name="name">crm.phonecall.stage.form</field>
+	        <field name="model">crm.phonecall.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_phonecall_stage_act" model="ir.actions.act_window">
+	        <field name="name">Phonecall Stages</field>
+	        <field name="res_model">crm.phonecall.stage</field>
+	        <field name="view_type">form</field>
+	        <field name="view_id" ref="crm_phonecall_stage_tree"/>
+	    </record>
+	  <menuitem action="crm_phonecall_stage_act" id="menu_crm_phonecall_stage_act" parent="crm.menu_crm_case_stage"/>
+	        
     # ------------------------------------------------------
     # Phone Calls
     # ------------------------------------------------------
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index f1e0fa69c48..f030f6dd79f 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -49,7 +49,8 @@
         </record>
         <menuitem id="next_id_51" name="Cases" parent="crm.menu_crm_configuration"/>
         <menuitem action="crm_case_section_act" id="menu_crm_case_section_act" parent="next_id_51"/>
-
+ 		<menuitem id="menu_crm_case_stage" name="Stages" parent="crm.menu_crm_configuration"/>
+ 		
         <menuitem id="next_id_52" name="All Cases" parent="crm.menu_crm" sequence="1"/>
         <record id="crm_case_section_act_tree" model="ir.actions.act_window">
             <field name="name">Cases by section</field>
@@ -60,39 +61,6 @@
         </record>
         <menuitem action="crm_case_section_act_tree" id="menu_crm_case_section_act_tree" parent="next_id_52"/>
 
-        <!-- Case Categories 
-        <record id="crm_case_categ-view" model="ir.ui.view">
-            <field name="name">crm.case.categ.form</field>
-            <field name="model">crm.case.categ</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Case Category">
-                    <field name="name" select="1"/>
-                    <field name="section_id" select="1" widget="selection"/>
-                    <field name="probability"/>
-                </form>
-            </field>
-        </record>
-        <record id="crm_case_categ_tree-view" model="ir.ui.view">
-            <field name="name">crm.case.categ.tree</field>
-            <field name="model">crm.case.categ</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Case Category">
-                    <field name="name"/>
-                    <field name="section_id"/>
-                    <field name="probability"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="crm_case_categ-act" model="ir.actions.act_window">
-            <field name="name">Categories</field>
-            <field name="res_model">crm.case.categ</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="crm_case_categ_tree-view"/>
-        </record>
-        <menuitem action="crm_case_categ-act" id="menu_crm_case_categ-act" parent="crm.next_id_51"/-->
 
         <!-- Case rules -->
         <record id="crm_case_rule-view" model="ir.ui.view">
@@ -112,7 +80,7 @@
                             <separator colspan="4" string="Conditions on Case Fields"/>
                             <field name="regex_name" string="Regex on Case Name" colspan="2"/>
                             <field name="trg_section_id" select="1" widget="selection"/>
-                            <field name="trg_categ_id"/>
+                            <!--<field name="trg_categ_id"/>-->
                             <field name="trg_user_id" select="2"/>
                             <separator colspan="4" string="Conditions on Case Partner"/>
                             <field name="trg_partner_id"/>
@@ -225,40 +193,7 @@
             <field name="target">new</field>
         </record>
 
-		# ------------------------------------------------------ 
-	    # Stage
-	    # ------------------------------------------------------ 
-	    <record model="ir.ui.view" id="crm_case_stage_tree">
-	        <field name="name">crm.case.stage.tree</field>
-	        <field name="model">crm.case.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_case_stage_form">
-	        <field name="name">crm.case.stage.form</field>
-	        <field name="model">crm.case.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_case_stage_act" model="ir.actions.act_window">
-	        <field name="name">Stages</field>
-	        <field name="res_model">crm.case.stage</field>
-	        <field name="view_type">form</field>
-	        <field name="view_id" ref="crm_case_stage_tree"/>
-	    </record>
-	    <menuitem action="crm_case_stage_act" id="menu_crm_case_stage_act" parent="crm.next_id_51"/>
+
 
         <!-- Cases -->
         <record id="crm_case_log_tree-view" model="ir.ui.view">
@@ -620,8 +555,8 @@
 
         <act_window domain="[('section_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_crm_case_section_crm_case_opened" name="Open cases" res_model="crm.case" src_model="crm.case.section" view_mode="tree,form,calendar" view_type="form"/>
 
-        <act_window domain="[('categ_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_crm_case_categ_crm_case_opened" name="Open cases" res_model="crm.case" src_model="crm.case.categ" view_mode="tree,form,calendar" view_type="form"/>
-
+       <!-- <act_window domain="[('categ_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_crm_case_categ_crm_case_opened" name="Open cases" res_model="crm.case" src_model="crm.case.categ" view_mode="tree,form,calendar" view_type="form"/>
+-->
         <act_window domain="[('partner_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_partner_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.partner" view_mode="tree,form,calendar" view_type="form"/>
 
         <act_window domain="[('canal_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_partner_canal_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.partner.canal" view_mode="tree,form,calendar" view_type="form"/>