Merge branch 'master' into master-pos-restaurant-fva

addons/auth_oauth/auth_oauth.py

@@ -8,15 +8,15 @@ class auth_oauth_provider(osv.osv):
     _order = 'name'
 
     _columns = {
-        'name' : fields.char('Provider name'),               # Name of the OAuth2 entity, Google, LinkedIn, etc
+        'name' : fields.char('Provider name', required=True),               # Name of the OAuth2 entity, Google, LinkedIn, etc
         'client_id' : fields.char('Client ID'),              # Our identifier
-        'auth_endpoint' : fields.char('Authentication URL'), # OAuth provider URL to authenticate users
+        'auth_endpoint' : fields.char('Authentication URL', required=True), # OAuth provider URL to authenticate users
         'scope' : fields.char('Scope'),                                     # OAUth user data desired to access
-        'validation_endpoint' : fields.char('Validation URL'),              # OAuth provider URL to validate tokens
+        'validation_endpoint' : fields.char('Validation URL', required=True),# OAuth provider URL to validate tokens
         'data_endpoint' : fields.char('Data URL'),
         'enabled' : fields.boolean('Allowed'),
         'css_class' : fields.char('CSS class'),
-        'body' : fields.char('Body'),
+        'body' : fields.char('Body', required=True),
         'sequence' : fields.integer(),
     }
     _defaults = {

addons/crm/sales_team_view.xml

@@ -87,13 +87,15 @@
                 <data>
                     <xpath expr="//templates" position="before">
                         <field name="alias_id"/>
+                        <field name="alias_name"/>
+                        <field name="alias_domain"/>
                         <field name="use_leads"/>
                         <field name="use_opportunities"/>
                         <field name="monthly_open_leads"/>
                         <field name="monthly_planned_revenue"/>
                     </xpath>
                     <xpath expr="//h4[@name='name']" position="after">
-                        <div class="oe_kanban_alias oe_center" t-if="record.use_leads.raw_value and record.alias_id.value">
+                        <div class="oe_kanban_alias oe_center" t-if="record.use_leads.raw_value and record.alias_name.value and record.alias_domain.value">
                             <small><span class="oe_e oe_e_alias" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
                         </div>
                         <div class="oe_items_list">

addons/hr_recruitment/hr_recruitment_view.xml

@@ -392,6 +392,8 @@
             <field name="arch" type="xml">
                 <kanban class="oe_background_grey">
                     <field name="name"/>
+                    <field name="alias_name"/>
+                    <field name="alias_domain"/>
                     <field name="department_id"/>
                     <field name="no_of_recruitment"/>
                     <field name="color"/>
@@ -417,7 +419,7 @@
                                         <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                     </ul>
                                 </div>
-                                <div class = "oe_kanban_content">
+                                <div class="oe_kanban_content">
                                     <t t-if="record.user_id.raw_value">
                                         <img t-att-src="kanban_image('res.users', 'image_medium', record.user_id.raw_value[0])" t-att-title="record.user_id.value" class="oe_kanban_avatar oe_job_avatar"/>
                                     </t>
@@ -434,7 +436,7 @@
                                                 (<t t-esc="record.manager_id.value"/>)
                                             </span>
                                         </div>
-                                        <div class="oe_job_alias oe_kanban_ellipsis" t-if=" record.alias_id.value and record.state.raw_value == 'recruit'">
+                                        <div class="oe_job_alias oe_kanban_ellipsis" t-if=" record.alias_name.value and record.alias_domain.value and record.state.raw_value == 'recruit'">
                                             <span class="oe_e">%%</span><small><field name="alias_id"/></small>
                                         </div>
 

addons/project/project_view.xml

@@ -242,6 +242,8 @@
                     <field name="task_count"/>
                     <field name="task_ids"/>
                     <field name="alias_id"/>
+                    <field name="alias_name"/>
+                    <field name="alias_domain"/>
                     <field name="doc_count"/>
                     <templates>
                         <t t-name="kanban-box">
@@ -256,7 +258,7 @@
                                 </div>
                                 <div class="oe_kanban_content">
                                     <h4><field name="name"/></h4>
-                                    <div class="oe_kanban_alias" t-if="record.alias_id.value">
+                                    <div class="oe_kanban_alias" t-if="record.alias_name.value and record.alias_domain.value">
                                         <span class="oe_e oe_e_alias">%%</span><small><field name="alias_id"/></small>
                                     </div>
                                     <div class="oe_kanban_project_list">