From ff1b4fd3f09022e7700a38e30cb03065e2203153 Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Mon, 24 May 2010 13:41:17 +0530
Subject: [MERGE] Merged from main branch.

bzr revid: vra@tinyerp.com-20100524081117-s63vktc1m3grcu8v
---
 addons/project_issue/project_issue.py | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'addons/project_issue/project_issue.py')

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 2de1b9f6b59..f67986526cd 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -36,7 +36,7 @@ class project_issue(osv.osv, crm.crm_case):
     _name = "project.issue"
     _description = "Project Issue"
     _order = "priority, id desc"
-    _inherit = 'mailgate.thread'
+    _inherits = {'mailgate.thread': 'thread_id'}
 
     def case_open(self, cr, uid, ids, *args):
         """
@@ -110,6 +110,10 @@ class project_issue(osv.osv, crm.crm_case):
         return res
 
     _columns = {
+        'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
+        'id': fields.integer('ID'),  
+        'name': fields.char('Name', size=128, required=True), 
+        'active': fields.boolean('Active', required=False), 
         'create_date': fields.datetime('Creation Date' , readonly=True), 
         'write_date': fields.datetime('Update Date' , readonly=True), 
         'date_deadline': fields.date('Deadline'), 
@@ -138,9 +142,6 @@ class project_issue(osv.osv, crm.crm_case):
         'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
  will receive a copy of the future" \
 " communication between partner and users by email"), 
-        'stage_id': fields.many2one('crm.case.stage', 'Stage', \
-                            domain="[('section_id','=',section_id),\
-                            ('object_id.model', '=', 'crm.phonecall')]"), 
         'date_open': fields.datetime('Opened', readonly=True),
         # Project Issue fields
         'date_closed': fields.datetime('Closed', readonly=True),
@@ -164,13 +165,26 @@ class project_issue(osv.osv, crm.crm_case):
                                 method=True, multi='day_close', type="float", store=True),
         'assigned_to' : fields.many2one('res.users', 'Assigned to'),
     }
-
+    
     def _get_project(self, cr, uid, context):
        user = self.pool.get('res.users').browse(cr,uid,uid, context=context)
        if user.context_project_id:
            return user.context_project_id.id
        return False
 
+    _defaults = {
+        'active': lambda *a: 1, 
+        'user_id': crm.crm_case._get_default_user, 
+        'partner_id': crm.crm_case._get_default_partner, 
+        'partner_address_id': crm.crm_case._get_default_partner_address, 
+        'email_from': crm.crm_case. _get_default_email, 
+        'state': lambda *a: 'draft',
+        'section_id': crm.crm_case. _get_section, 
+        '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], 
+        'project_id':_get_project,
+    }
+
     def convert_issue_task(self, cr, uid, ids, context=None):
         case_obj = self.pool.get('project.issue')
         data_obj = self.pool.get('ir.model.data')
@@ -249,9 +263,5 @@ class project_issue(osv.osv, crm.crm_case):
             return {'value':{}}
         return {'value':{}}
 
-    _defaults = {
-        'project_id':_get_project,
-    }
-
 project_issue()
 
-- 
cgit v1.2.3