From 160ddc0240cee594e4a245fe5b9df689828200a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 2 Jul 2014 11:35:39 +0200
Subject: [PATCH] [IMP] crm (sales_team), hr_recruitment, project: fixed
 display of alias on kanban view. The alias is not shown when not having
 alias_name (left part) or alias_domain (right part) defined. Indeed only
 using alias_id.value is not correct, as we could have '<alias_name>' or
 'Inactive Alias', depending on the missing part.

---
 addons/crm/sales_team_view.xml                | 4 +++-
 addons/hr_recruitment/hr_recruitment_view.xml | 6 ++++--
 addons/project/project_view.xml               | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/addons/crm/sales_team_view.xml b/addons/crm/sales_team_view.xml
index f1a4334b311..5064e3b6d6d 100644
--- a/addons/crm/sales_team_view.xml
+++ b/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">
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 2b33d4916a2..06eefb77cf2 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/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>
 
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 38decfdd429..7d7b309fa81 100644
--- a/addons/project/project_view.xml
+++ b/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">