Skip to content

Commit

Permalink
[FIX] sale_ux: backport 15 to 13 user_id allow not only internal users
Browse files Browse the repository at this point in the history
closes #660

Signed-off-by: Juan Ignacio Rivero <jr@adhoc.com.ar>
  • Loading branch information
matiasperalta1 committed May 8, 2023
1 parent 37a307d commit fa96c48
Show file tree
Hide file tree
Showing 6 changed files with 77 additions and 1 deletion.
6 changes: 5 additions & 1 deletion sale_ux/__manifest__.py
Expand Up @@ -19,7 +19,7 @@
##############################################################################
{
'name': 'Sale UX',
'version': "13.0.1.11.0",
'version': "13.0.1.12.0",
'category': 'Sales',
'sequence': 14,
'summary': '',
Expand All @@ -29,6 +29,7 @@
'images': [
],
'depends': [
'crm',
'sale',
'account_ux',
'sale_management',
Expand All @@ -39,6 +40,9 @@
'wizards/sale_advance_payment_inv_views.xml',
'security/sale_ux_security.xml',
'views/sale_order_views.xml',
'views/res_partner_views.xml',
'views/crm_lead_views.xml',
'views/crm_team_views.xml',
'views/sale_order_line_views.xml',
'views/account_move_views.xml',
'views/sale_reports.xml',
Expand Down
1 change: 1 addition & 0 deletions sale_ux/models/__init__.py
Expand Up @@ -2,6 +2,7 @@
# For copyright and license notices, see __manifest__.py file in module root
# directory
##############################################################################
from . import crm_lead
from . import sale_order
from . import sale_order_line
from . import account_move
Expand Down
21 changes: 21 additions & 0 deletions sale_ux/models/crm_lead.py
@@ -0,0 +1,21 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

from odoo import api, fields, models, _


class Lead(models.Model):
_inherit = 'crm.lead'

user_company_ids = fields.Many2many(
'res.company', compute='_compute_user_company_ids',
help='UX: Limit to lead company or all if no company')

@api.depends('company_id')
def _compute_user_company_ids(self):
all_companies = self.env['res.company'].search([])
for lead in self:
if not lead.company_id:
lead.user_company_ids = all_companies
else:
lead.user_company_ids = lead.company_id
19 changes: 19 additions & 0 deletions sale_ux/views/crm_lead_views.xml
@@ -0,0 +1,19 @@
<?xml version="1.0"?>
<odoo>
<!-- This will be deprecated in v15 -->
<record id="crm_lead_view_form" model="ir.ui.view">
<field name="name">crm.lead.form.inherit</field>
<field name="model">crm.lead</field>
<field name="inherit_id" ref="crm.crm_lead_view_form"/>
<field name="groups_id" eval="[(4, ref('group_allow_any_user_as_salesman'))]"/>
<field name="arch" type="xml">
<field name="user_id" position="before">
<field name="user_company_ids" invisible="1"/>
</field>
<field name="user_id" position="attributes">
<attribute name="domain">[('company_ids', 'in', user_company_ids)]</attribute>
</field>
</field>
</record>

</odoo>
16 changes: 16 additions & 0 deletions sale_ux/views/crm_team_views.xml
@@ -0,0 +1,16 @@
<?xml version="1.0"?>
<odoo>
<!-- This will be deprecated in v15 -->
<record id="crm_team_view_form" model="ir.ui.view">
<field name="name">crm.team.form.inherit</field>
<field name="model">crm.team</field>
<field name="inherit_id" ref="sales_team.crm_team_view_form"/>
<field name="groups_id" eval="[(4, ref('group_allow_any_user_as_salesman'))]"/>
<field name="arch" type="xml">
<field name="user_id" position="attributes">
<attribute name="domain">[]</attribute>
</field>
</field>
</record>

</odoo>
15 changes: 15 additions & 0 deletions sale_ux/views/res_partner_views.xml
@@ -0,0 +1,15 @@
<?xml version="1.0"?>
<odoo>
<record id="view_contact_allow_any_user_as_salesman" model="ir.ui.view">
<field name="name">res.partner.form.salesman</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="groups_id" eval="[(4, ref('group_allow_any_user_as_salesman'))]"/>
<field name="arch" type="xml">
<xpath expr="//group/field[@name='user_id']" position='attributes'>
<attribute name="domain">[]</attribute>
</xpath>
</field>
</record>

</odoo>

0 comments on commit fa96c48

Please sign in to comment.