diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 28830bfc5cd..00f477a75d7 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -40,7 +40,7 @@ class crm_lead(crm_case, osv.osv): _name = "crm.lead" _description = "Lead/Opportunity" _order = "priority,date_action,id desc" - _inherit = ['ir.needaction', 'mail.thread','res.partner'] + _inherit = ['ir.needaction_mixin', 'mail.thread','res.partner'] def _read_group_stage_ids(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None): access_rights_uid = access_rights_uid or uid diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py index 3577be4878f..d3b427246e3 100644 --- a/addons/crm/crm_meeting.py +++ b/addons/crm/crm_meeting.py @@ -42,7 +42,7 @@ class crm_meeting(crm_base, osv.osv): _name = 'crm.meeting' _description = "Meeting" _order = "id desc" - _inherit = ["calendar.event", 'ir.needaction', "mail.thread"] + _inherit = ["calendar.event", 'ir.needaction_mixin', "mail.thread"] _columns = { # From crm.case 'name': fields.char('Summary', size=124, required=True, states={'done': [('readonly', True)]}), diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index 26cbd7e8698..f63291c156b 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -32,7 +32,7 @@ class crm_phonecall(crm_base, osv.osv): _name = "crm.phonecall" _description = "Phonecall" _order = "id desc" - _inherit = ['ir.needaction', 'mail.thread'] + _inherit = ['ir.needaction_mixin', 'mail.thread'] _columns = { # From crm.case 'id': fields.integer('ID', readonly=True), diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index 4dd191c73a7..a877ed5caa8 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -93,7 +93,7 @@ class hr_holidays(osv.osv): _name = "hr.holidays" _description = "Leave" _order = "type desc, date_from asc" - _inherit = ['ir.needaction', 'mail.thread'] + _inherit = ['ir.needaction_mixin', 'mail.thread'] def _employee_get(self, cr, uid, context=None): ids = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context) diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index 1e261bfe52f..c33a8b88151 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -96,7 +96,7 @@ class hr_applicant(crm.crm_case, osv.osv): _name = "hr.applicant" _description = "Applicant" _order = "id desc" - _inherit = ['ir.needaction', 'mail.thread'] + _inherit = ['ir.needaction_mixin', 'mail.thread'] def _compute_day(self, cr, uid, ids, fields, args, context=None): """ diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 8e550ba4119..9ff3a648af9 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -406,7 +406,7 @@ class mrp_production(osv.osv): _name = 'mrp.production' _description = 'Manufacturing Order' _date_name = 'date_planned' - _inherit = ['ir.needaction', 'mail.thread'] + _inherit = ['ir.needaction_mixin', 'mail.thread'] def _production_calc(self, cr, uid, ids, prop, unknow_none, context=None): """ Calculates total hours and total no. of cycles for a production order. diff --git a/addons/project/project.py b/addons/project/project.py index 21677a234bf..0335b7cb540 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -53,7 +53,7 @@ class project(osv.osv): _name = "project.project" _description = "Project" _inherits = {'account.analytic.account': "analytic_account_id"} - _inherit = ['ir.needaction', 'mail.thread'] + _inherit = ['ir.needaction_mixin', 'mail.thread'] def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False): if user == 1: @@ -500,7 +500,7 @@ class task(osv.osv): _description = "Task" _log_create = True _date_name = "date_start" - _inherit = ['ir.needaction', 'mail.thread'] + _inherit = ['ir.needaction_mixin', 'mail.thread'] def _resolve_project_id_from_context(self, cr, uid, context=None): diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index ab1ee801cec..e61af235d42 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -46,7 +46,7 @@ class project_issue(crm.crm_case, osv.osv): _name = "project.issue" _description = "Project Issue" _order = "priority, create_date desc" - _inherit = ['ir.needaction', 'mail.thread'] + _inherit = ['ir.needaction_mixin', 'mail.thread'] def _compute_day(self, cr, uid, ids, fields, args, context=None): """ diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index a7e516853e7..7e2dafcb4dc 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -219,7 +219,7 @@ class purchase_order(osv.osv): ('name_uniq', 'unique(name, company_id)', 'Order Reference must be unique per Company!'), ] _name = "purchase.order" - _inherit = ['mail.thread'] + _inherit = ['ir.needaction_mixin', 'mail.thread'] _description = "Purchase Order" _order = "name desc" @@ -649,9 +649,10 @@ class purchase_order(osv.osv): wf_service.trg_validate(uid, 'purchase.order', old_id, 'purchase_cancel', cr) return orders_info - # ----------------------------- - # OpenChatter and notifications - # ----------------------------- + # -------------------------------------- + # OpenChatter methods and notifications + # -------------------------------------- + def get_needaction_user_ids(self, cr, uid, ids, context=None): result = dict.fromkeys(ids, []) for obj in self.browse(cr, uid, ids, context=context): diff --git a/addons/sale/sale.py b/addons/sale/sale.py index e925a9c4c9f..e7067019b90 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -48,7 +48,7 @@ sale_shop() class sale_order(osv.osv): _name = "sale.order" - _inherit = ['mail.thread'] + _inherit = ['ir.needaction_mixin', 'mail.thread'] _description = "Sales Order"