From 0d2f8c19fa3ab066c8c6eb46c60d34a3d9623884 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 29 May 2012 16:23:33 +0200
Subject: [PATCH] [IMP] crm_claim, crm_helpdesk: crm_base -> base_stage.

bzr revid: tde@openerp.com-20120529142333-nxgkmmxy433j5fpt
---
 addons/crm/crm_lead.py              |  2 +-
 addons/crm_claim/crm_claim.py       |  3 ++-
 addons/crm_helpdesk/crm_helpdesk.py | 16 ++++++++--------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index d28df3a05fc..1384dc4a57a 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -20,8 +20,8 @@
 ##############################################################################
 
 import binascii
-import crm
 from base_status.base_stage import base_stage
+import crm
 from datetime import datetime
 from mail.mail_message import to_email
 from osv import fields, osv
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 4aa4cc9263b..557f048a3eb 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+from base_status.base_stage import base_stage
 from osv import fields, osv
 from crm import crm
 import time
@@ -35,7 +36,7 @@ CRM_CLAIM_PENDING_STATES = (
 )
 
 
-class crm_claim(crm.crm_case, osv.osv):
+class crm_claim(base_stage, osv.osv):
     """ Crm claim
     """
     _name = "crm.claim"
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 6bffb1ffb7b..050cd80d5e4 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
+from base_status.base_stage import base_stage
 from crm import crm
-from osv import fields, osv
-import time
 from crm import wizard
+from osv import fields, osv
 import tools
 from tools.translate import _
 
@@ -34,7 +34,7 @@ CRM_HELPDESK_STATES = (
 
 wizard.mail_compose_message.SUPPORTED_MODELS.append('crm.helpdesk')
 
-class crm_helpdesk(crm.crm_case, osv.osv):
+class crm_helpdesk(base_stage, osv.osv):
     """ Helpdesk Cases """
 
     _name = "crm.helpdesk"
@@ -82,12 +82,12 @@ class crm_helpdesk(crm.crm_case, osv.osv):
 
     _defaults = {
         'active': lambda *a: 1,
-        'user_id': crm.crm_case._get_default_user,
-        'partner_id': crm.crm_case._get_default_partner,
-        'email_from': crm.crm_case._get_default_email,
+        'user_id': lambda s, cr, uid, c: s._get_default_user(cr, uid, c),
+        'partner_id': lambda s, cr, uid, c: s._get_default_partner(cr, uid, c),
+        'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
         'state': lambda *a: 'draft',
-        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'section_id': crm.crm_case._get_default_section_id,
+        'date': lambda *a: fields.datetime.now(),
+        'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }