[FIX] crm,hr_expense: Give 2 different names for alias prefix

Purpose
=======

Now that the res.config model have been merged into a single model, the 2 alias prefixes should have different names to avoid conflicts.

addons/crm/models/res_config_settings.py

@@ -9,7 +9,7 @@ class ResConfigSettings(models.TransientModel):
 
     company_id = fields.Many2one('res.company', string='Company', required=True,
         default=lambda self: self.env.user.company_id)
-    alias_prefix = fields.Char('Default Alias Name for Leads')
+    crm_alias_prefix = fields.Char('Default Alias Name for Leads')
     alias_domain = fields.Char('Alias Domain', default=lambda self: self.env["ir.config_parameter"].sudo().get_param("mail.catchall.domain"))
     generate_lead_from_alias = fields.Boolean('Manual Assignation of Emails')
     group_use_lead = fields.Boolean(string="Leads", implied_group='crm.group_use_lead')
@@ -37,14 +37,14 @@ class ResConfigSettings(models.TransientModel):
 
     @api.onchange('generate_lead_from_alias')
     def _onchange_generate_lead_from_alias(self):
-        self.alias_prefix = 'info' if self.generate_lead_from_alias else False
+        self.crm_alias_prefix = 'info' if self.generate_lead_from_alias else False
 
     @api.model
     def get_values(self):
         res = super(ResConfigSettings, self).get_values()
         alias = self._find_default_lead_alias_id()
         res.update(
-            alias_prefix=alias.alias_name if alias else False,
+            crm_alias_prefix=alias.alias_name if alias else False,
             generate_lead_from_alias=self.env['ir.config_parameter'].sudo().get_param('crm.generate_lead_from_alias')
         )
         return res
@@ -55,8 +55,8 @@ class ResConfigSettings(models.TransientModel):
         self.env['ir.config_parameter'].sudo().set_param('crm.generate_lead_from_alias', self.generate_lead_from_alias)
         alias = self._find_default_lead_alias_id()
         if alias:
-            alias.write({'alias_name': self.alias_prefix})
+            alias.write({'alias_name': self.crm_alias_prefix})
         else:
             self.env['mail.alias'].with_context(
                 alias_model_name='crm.lead',
-                alias_parent_model_name='crm.team').create({'alias_name': self.alias_prefix})
+                alias_parent_model_name='crm.team').create({'alias_name': self.crm_alias_prefix})

addons/crm/views/res_config_settings_views.xml

@@ -39,7 +39,7 @@
                                 <div class="content-group" attrs="{'invisible': [('generate_lead_from_alias','=',False)]}">
                                     <div class="mt16">
                                         <label string="Alias" class="o_light_label"/>
-                                        <field name="alias_prefix" class="oe_inline"
+                                        <field name="crm_alias_prefix" class="oe_inline"
                                             attrs="{'required': [('generate_lead_from_alias', '=', True)]}"/>
                                         <span>@</span>
                                         <field name="alias_domain" readonly="1" class="oe_inline"/>

addons/hr_expense/models/res_config_settings.py

@@ -6,7 +6,7 @@ from odoo import api, fields, models
 class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
-    alias_prefix = fields.Char('Default Alias Name for Expenses')
+    expense_alias_prefix = fields.Char('Default Alias Name for Expenses')
     alias_domain = fields.Char('Alias Domain', default=lambda self: self.env["ir.config_parameter"].sudo().get_param("mail.catchall.domain"))
     use_mailgateway = fields.Boolean(string='Let your employees record expenses by email')
     module_sale = fields.Boolean(string="Customer Billing")
@@ -15,7 +15,7 @@ class ResConfigSettings(models.TransientModel):
     def get_values(self):
         res = super(ResConfigSettings, self).get_values()
         res.update(
-            alias_prefix=self.env.ref('hr_expense.mail_alias_expense').alias_name,
+            expense_alias_prefix=self.env.ref('hr_expense.mail_alias_expense').alias_name,
             use_mailgateway=self.env['ir.config_parameter'].sudo().get_param('hr_expense.use_mailgateway'),
         )
         return res
@@ -23,10 +23,10 @@ class ResConfigSettings(models.TransientModel):
     @api.multi
     def set_values(self):
         super(ResConfigSettings, self).set_values()
-        self.env.ref('hr_expense.mail_alias_expense').write({'alias_name': self.alias_prefix})
+        self.env.ref('hr_expense.mail_alias_expense').write({'alias_name': self.expense_alias_prefix})
         self.env['ir.config_parameter'].sudo().set_param('hr_expense.use_mailgateway', self.use_mailgateway)
 
     @api.onchange('use_mailgateway')
     def _onchange_use_mailgateway(self):
         if not self.use_mailgateway:
-            self.alias_prefix = False
+            self.expense_alias_prefix = False

addons/hr_expense/views/res_config_settings_views.xml

@@ -23,7 +23,7 @@
                                     <div class="content-group" attrs="{'invisible': ['|', ('use_mailgateway', '=',  False), ('alias_domain', 'in', ['localhost', '', False])]}">
                                         <div class="mt16">
                                             <label string="Email Alias" class="o_light_label"/>
-                                            <field name="alias_prefix" class="oe_inline"/>
+                                            <field name="expense_alias_prefix" class="oe_inline"/>
                                             <span>@</span>
                                             <field name="alias_domain"  class="oe_inline" readonly="1"/>
                                         </div>