diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 09ca54b8251..f20df08edb3 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -1002,7 +1002,7 @@ class calendar_event(osv.osv): _columns = { 'id': fields.integer('ID'), 'sequence': fields.integer('Sequence'), - 'name': fields.char('Description', size=64, required=True), + 'name': fields.char('Description', size=64, required=False), 'date': fields.datetime('Date'), 'date_deadline': fields.datetime('Deadline'), 'create_date': fields.datetime('Created', readonly=True), diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py index a535efbdb81..d9a7a2b34c0 100644 --- a/addons/crm_claim/crm_claim.py +++ b/addons/crm_claim/crm_claim.py @@ -29,10 +29,15 @@ class crm_claim(osv.osv, crm.crm_case): _name = "crm.claim" _description = "Claim Cases" _order = "id desc" - _inherit = 'mailgate.thread' + _inherits = {'mailgate.thread': 'thread_id'} + _columns = { + 'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 'id': fields.integer('ID', readonly=True), 'name': fields.char('Name', size=128, required=True), + 'active': fields.boolean('Active', required=False), + 'date_action_last': fields.datetime('Last Action', readonly=1), + 'date_action_next': fields.datetime('Next Action', readonly=1), 'description': fields.text('Description'), 'create_date': fields.datetime('Creation Date' , readonly=True), 'write_date': fields.datetime('Update Date' , readonly=True), diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py index 4650528fa72..356c3baec73 100644 --- a/addons/crm_fundraising/crm_fundraising.py +++ b/addons/crm_fundraising/crm_fundraising.py @@ -28,11 +28,15 @@ class crm_fundraising(osv.osv, crm.crm_case): _name = "crm.fundraising" _description = "Fund Raising Cases" _order = "id desc" - _inherit ='mailgate.thread' + _inherits = {'mailgate.thread': 'thread_id'} _columns = { + 'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 'id': fields.integer('ID'), - 'name': fields.char('Name', size=128, required=True), + 'name': fields.char('Name', size=128, required=True), + 'active': fields.boolean('Active', required=False), + 'date_action_last': fields.datetime('Last Action', readonly=1), + 'date_action_next': fields.datetime('Next Action', readonly=1), 'description': fields.text('Description'), 'create_date': fields.datetime('Creation Date' , readonly=True), 'write_date': fields.datetime('Update Date' , readonly=True), diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py index 4329ef7d73b..d07d2261013 100644 --- a/addons/crm_helpdesk/crm_helpdesk.py +++ b/addons/crm_helpdesk/crm_helpdesk.py @@ -28,11 +28,15 @@ class crm_helpdesk(osv.osv, crm.crm_case): _name = "crm.helpdesk" _description = "Helpdesk Cases" _order = "id desc" - _inherit = 'mailgate.thread' + _inherits = {'mailgate.thread': 'thread_id'} _columns = { + 'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 'id': fields.integer('ID', readonly=True), 'name': fields.char('Name', size=128, required=True), + 'active': fields.boolean('Active', required=False), + 'date_action_last': fields.datetime('Last Action', readonly=1), + 'date_action_next': fields.datetime('Next Action', readonly=1), 'description': fields.text('Description'), 'create_date': fields.datetime('Creation Date' , readonly=True), 'write_date': fields.datetime('Update Date' , readonly=True), diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index eac882874c7..5411dd9ff05 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -43,9 +43,11 @@ class hr_applicant(osv.osv, crm.crm_case): _name = "hr.applicant" _description = "Applicant Cases" _order = "id desc" - _inherit ='mailgate.thread' + _inherits = {'mailgate.thread': 'thread_id'} _columns = { + 'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), + 'name': fields.char('Name', size=128, required=True), 'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."), 'description': fields.text('Description'), 'section_id': fields.many2one('crm.case.section', 'Sales Team', \ @@ -89,6 +91,16 @@ class hr_applicant(osv.osv, crm.crm_case): 'survey' : fields.related('job_id', 'survey_id', type='many2one', relation='survey', string='Survey'), 'response' : fields.integer("Response"), } + + _defaults = { + 'active': lambda *a: 1, + 'user_id': crm.crm_case._get_default_user, + '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], + } def onchange_job(self,cr, uid, ids, job, context={}): result = {} diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index b0ca2433b78..42e37124515 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): """ @@ -109,7 +109,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'), @@ -164,13 +167,26 @@ class project_issue(osv.osv, crm.crm_case): method=True, multi='day_close', type="integer", 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 +265,5 @@ class project_issue(osv.osv, crm.crm_case): return {'value':{}} return {'value':{}} - _defaults = { - 'project_id':_get_project, - } - project_issue()