diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-06-14 19:19:14 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-06-14 19:19:14 +0200 |
| commit | a53bea49fe4005e3faaa3e63888da65a45281dd5 (patch) | |
| tree | 26d660d75973cc9fbd9c770258537d0fee0eb619 /addons | |
| parent | 803df909b1b35441450e02e65008559200d1a2e7 (diff) | |
| parent | 7c8f335988749773f1dc42d3b6c100402e91be80 (diff) | |
[MERGE] forward port branch saas-14 up to 7c8f3359887
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/event/models/res_partner.py | 2 | ||||
| -rw-r--r-- | addons/sale/__manifest__.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/addons/event/models/res_partner.py b/addons/event/models/res_partner.py index d534f3749f2..009b182c1ae 100644 --- a/addons/event/models/res_partner.py +++ b/addons/event/models/res_partner.py @@ -9,6 +9,8 @@ class ResPartner(models.Model): event_count = fields.Integer("Events", compute='_compute_event_count', help="Number of events the partner has participated.") def _compute_event_count(self): + if not self.user_has_groups('event.group_event_user'): + return for partner in self: partner.event_count = self.env['event.event'].search_count([('registration_ids.partner_id', 'child_of', partner.ids)]) diff --git a/addons/sale/__manifest__.py b/addons/sale/__manifest__.py index 9d3637e0998..d1be4a05528 100644 --- a/addons/sale/__manifest__.py +++ b/addons/sale/__manifest__.py @@ -54,7 +54,6 @@ The Dashboard for the Sales Manager will include 'security/sale_security.xml', 'security/ir.model.access.csv', 'wizard/sale_make_invoice_advance_views.xml', - 'views/account_config_settings_views.xml', 'views/sale_views.xml', 'views/sales_team_views.xml', 'views/res_partner_views.xml', |