diff options
Diffstat (limited to 'addons/crm')
| -rw-r--r-- | addons/crm/models/crm_lead.py | 2 | ||||
| -rw-r--r-- | addons/crm/models/res_config_settings.py | 1 | ||||
| -rw-r--r-- | addons/crm/views/crm_lead_views.xml | 16 | ||||
| -rw-r--r-- | addons/crm/views/res_config_settings_views.xml | 11 | ||||
| -rw-r--r-- | addons/crm/wizard/crm_lead_to_opportunity_views.xml | 4 |
5 files changed, 15 insertions, 19 deletions
diff --git a/addons/crm/models/crm_lead.py b/addons/crm/models/crm_lead.py index 177d6aa8048..df5a0e0cfce 100644 --- a/addons/crm/models/crm_lead.py +++ b/addons/crm/models/crm_lead.py @@ -65,7 +65,7 @@ class Lead(models.Model): name = fields.Char('Opportunity', required=True, index=True) partner_id = fields.Many2one('res.partner', string='Customer', track_visibility='onchange', track_sequence=1, index=True, - help="Linked partner (optional). Usually created when converting the lead.") + help="Linked partner (optional). Usually created when converting the lead. You can find a partner by its Name, TIN, Email or Internal Reference.") active = fields.Boolean('Active', default=True, track_visibility=True) date_action_last = fields.Datetime('Last Action', readonly=True) email_from = fields.Char('Email', help="Email address of the contact", track_visibility='onchange', track_sequence=4, index=True) diff --git a/addons/crm/models/res_config_settings.py b/addons/crm/models/res_config_settings.py index c2ca5a60735..33386434f2a 100644 --- a/addons/crm/models/res_config_settings.py +++ b/addons/crm/models/res_config_settings.py @@ -11,7 +11,6 @@ class ResConfigSettings(models.TransientModel): generate_lead_from_alias = fields.Boolean('Manual Assignation of Emails', config_parameter='crm.generate_lead_from_alias') group_use_lead = fields.Boolean(string="Leads", implied_group='crm.group_use_lead') module_crm_phone_validation = fields.Boolean("Phone Formatting") - module_web_clearbit = fields.Boolean("Customer Autocomplete") def _find_default_lead_alias_id(self): alias = self.env.ref('crm.mail_alias_lead_info', False) diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml index f4a5ba6ca19..04b29c6153c 100644 --- a/addons/crm/views/crm_lead_views.xml +++ b/addons/crm/views/crm_lead_views.xml @@ -68,7 +68,9 @@ <group> <!-- Preload all the partner's information --> <field name="partner_id" string="Customer" - context="{'default_name': contact_name, 'default_street': street, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_function': function, 'default_phone': phone, 'default_mobile': mobile, 'default_email': email_from, 'default_user_id': user_id, 'default_team_id': team_id, 'default_website': website}" groups="base.group_no_one"/> + widget="res_partner_many2one" + context="{'default_name': contact_name, 'default_street': street, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_function': function, 'default_phone': phone, 'default_mobile': mobile, 'default_email': email_from, 'default_user_id': user_id, 'default_team_id': team_id, 'default_website': website, 'show_vat': True}" + groups="base.group_no_one"/> <field name="partner_name" string="Company Name"/> <label for="street" string="Address"/> <div class="o_address_format"> @@ -240,7 +242,7 @@ <group> <group> <field name="name" string="Opportunity Title" placeholder="e.g. Customer Deal"/> - <field name="partner_id" domain="[('customer', '=', True)]" context="{'search_default_customer': 1}"/> + <field name="partner_id" widget="res_partner_many2one" domain="[('customer', '=', True)]" context="{'search_default_customer': 1, 'show_vat': True}"/> <field name="partner_name" invisible="1"/> <field name="street" invisible="1"/> <field name="street2" invisible="1"/> @@ -298,7 +300,7 @@ <form> <group> <field name="name"/> - <field name="partner_id" domain="[('customer', '=', True)]" context="{'search_default_customer': 1}"/> + <field name="partner_id" widget="res_partner_many2one" domain="[('customer', '=', True)]" context="{'search_default_customer': 1, 'show_vat': True}"/> <field name="planned_revenue" widget="monetary" options="{'currency_field': 'company_currency'}"/> <field name="company_currency" invisible="1"/> <field name="company_id" invisible="1"/> @@ -370,7 +372,7 @@ </div> </div> </div> - <div class="oe_clear"></div> + <div class="oe_clear"/> </div> </t> </templates> @@ -493,6 +495,7 @@ <group> <group> <field name="partner_id" + widget="res_partner_many2one" string="Customer" domain="[('customer', '=', True)]" context="{'search_default_customer': 1, 'default_name': partner_name, 'default_street': street, @@ -501,7 +504,10 @@ 'default_country_id': country_id, 'default_function': function, 'default_phone': phone, 'default_mobile': mobile, 'default_email': email_from, - 'default_user_id': user_id, 'default_team_id': team_id, 'default_website': website}"/> + 'default_user_id': user_id, 'default_team_id': team_id, 'default_website': website, + 'show_vat': True, + }" + /> <field name="is_blacklisted" invisible="1"/> <field name="partner_is_blacklisted" invisible="1"/> <label for="email_from" class="oe_inline"/> diff --git a/addons/crm/views/res_config_settings_views.xml b/addons/crm/views/res_config_settings_views.xml index a32b08a63f2..e37b01336a4 100644 --- a/addons/crm/views/res_config_settings_views.xml +++ b/addons/crm/views/res_config_settings_views.xml @@ -66,17 +66,6 @@ </div> </div> </div> - <div class="col-12 col-lg-6 o_setting_box" title="When populating your address book, Odoo relies on Clearbit’s API to provide you with a list of matching contacts or companies.When selecting one item, the partner name, logo and website get automatically set."> - <div class="o_setting_left_pane"> - <field name="module_web_clearbit" widget="upgrade_boolean"/> - </div> - <div class="o_setting_right_pane"> - <label for="module_web_clearbit"/> - <div class="text-muted"> - Look up company information (name, logo, etc.) - </div> - </div> - </div> </div> </div> </xpath> diff --git a/addons/crm/wizard/crm_lead_to_opportunity_views.xml b/addons/crm/wizard/crm_lead_to_opportunity_views.xml index c12587a5fb0..97a06862ab1 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity_views.xml +++ b/addons/crm/wizard/crm_lead_to_opportunity_views.xml @@ -32,7 +32,7 @@ <group name="action" attrs="{'invisible': [('name', '!=', 'convert')]}" string="Customers" col="1"> <field name="action" nolabel="1" widget="radio"/> <group col="2"> - <field name="partner_id" domain="[('customer', '=', True)]" context="{'search_default_customer': 1}" attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"/> + <field name="partner_id" widget="res_partner_many2one" domain="[('customer', '=', True)]" context="{'search_default_customer': 1, 'show_vat': True}" attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"/> </group> </group> <footer> @@ -79,7 +79,9 @@ <field name="action" class="oe_inline" widget="radio"/> <group col="2"> <field name="partner_id" + widget="res_partner_many2one" attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}" + context="{'show_vat': True}" class="oe_inline"/> </group> </group> |