From 21db045488fc1f84586092150e5043bddc575603 Mon Sep 17 00:00:00 2001 From: Fabien BOURGEOIS Date: Sat, 10 Mar 2018 07:15:30 +0100 Subject: [PATCH] [FIX]Yaltik CRM Action : refactoring and fixing actions opening from partners --- yaltik_crm_action/__manifest__.py | 2 +- yaltik_crm_action/models/res_partner.py | 9 +++++---- yaltik_crm_action/views/res_partner_views.xml | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/yaltik_crm_action/__manifest__.py b/yaltik_crm_action/__manifest__.py index 7727455..464ec2b 100644 --- a/yaltik_crm_action/__manifest__.py +++ b/yaltik_crm_action/__manifest__.py @@ -18,7 +18,7 @@ { 'name': 'CRM Actions', 'summary': 'Action management, instead of new activity, in CRM', - 'version': '10.0.1.3.2', + 'version': '10.0.1.3.3', 'category': 'Sales', 'author': 'Fabien BOURGEOIS - Yaltik', 'license': 'AGPL-3', diff --git a/yaltik_crm_action/models/res_partner.py b/yaltik_crm_action/models/res_partner.py index e1fa8d8..741a8f3 100644 --- a/yaltik_crm_action/models/res_partner.py +++ b/yaltik_crm_action/models/res_partner.py @@ -45,11 +45,11 @@ class ResPartner(models.Model): partner.action_count = u'{} / {}'.format(draft_count, action_count) - @api.model + @api.multi def partner_actions(self): """ Return action for active partner and its parent and childs """ - active_id = self._context.get('active_id') - partner = self.env['res.partner'].browse(active_id) + self.ensure_one() + partner = self[0] parent_id = partner.parent_id.id if partner.parent_id else partner.id domain = [('partner_id', 'child_of', parent_id)] @@ -57,5 +57,6 @@ class ResPartner(models.Model): 'name': _('Actions'), 'view_mode': 'tree,form,calendar', 'res_model': 'crm.action', - 'context': {'default_partner_id': partner.id}, + 'context': {'default_partner_id': partner.id, + 'search_default_partner_id': partner.id}, 'domain': domain} diff --git a/yaltik_crm_action/views/res_partner_views.xml b/yaltik_crm_action/views/res_partner_views.xml index 4640e57..1372acd 100644 --- a/yaltik_crm_action/views/res_partner_views.xml +++ b/yaltik_crm_action/views/res_partner_views.xml @@ -28,8 +28,8 @@ along with this program. If not, see . @@ -42,7 +42,7 @@ along with this program. If not, see . Actions code - action = env['res.partner'].partner_actions() + action = self.partner_actions()