From 492747e5a6098d302c95b938fd6b9ae52438681d Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Wed, 13 Jan 2016 13:01:06 +0100
Subject: Merge: display address for persons and organizations

---
 ishtar_common/models.py                            | 23 ++++++++++++++++++++++
 .../templates/ishtar/merge_organization.html       |  6 ++++--
 ishtar_common/templates/ishtar/merge_person.html   |  6 ++++--
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index af1c70dce..2745bf4b6 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -1069,6 +1069,29 @@ class Address(BaseHistorizedItem):
     class Meta:
         abstract = True
 
+    def address_lbl(self):
+        lbl = ''
+        if self.address:
+            lbl += self.address
+        if self.address_complement:
+            if lbl:
+                lbl += "\n"
+            lbl += self.address_complement
+        if self.postal_code or self.town:
+            if lbl:
+                lbl += "\n"
+            lbl += "{}{}{}".format(
+                self.postal_code or '',
+                " " if self.postal_code and self.town else '',
+                self.town or '')
+        if self.phone:
+            lbl += "{}{}".format(_("Tel:"), self.phone)
+        if self.mobile_phone:
+            lbl += "{}{}".format(_("Mobile: "), self.mobile_phone)
+        if self.email:
+            lbl += "{}{}".format(_("Email: "), self.email)
+        return lbl
+
 
 class Merge(models.Model):
     merge_key = models.CharField(_("Merge key"), max_length=300,
diff --git a/ishtar_common/templates/ishtar/merge_organization.html b/ishtar_common/templates/ishtar/merge_organization.html
index 4118ee6d5..e4ca430a1 100644
--- a/ishtar_common/templates/ishtar/merge_organization.html
+++ b/ishtar_common/templates/ishtar/merge_organization.html
@@ -7,13 +7,15 @@
           <a href="#" onclick="load_window('{% url 'show-organization' form.instance.from_organization.pk '' %}', 'organization');" class="display_details">Détails</a>
         </td>
         <td>
-          {{form.instance.from_organization}} ({{form.instance.from_organization.pk}})
+          {{form.instance.from_organization}} ({{form.instance.from_organization.pk}})<br />
+          {{form.instance.from_organization.address_lbl|linebreaksbr}}
         </td>
         <td>
           <a href="#" onclick="load_window('{% url 'show-organization' form.instance.to_organization.pk '' %}', 'organization');" class="display_details">Détails</a>
         </td>
         <td>
-          {{form.instance.to_organization}} ({{form.instance.to_organization.pk}})
+          {{form.instance.to_organization}} ({{form.instance.to_organization.pk}})<br />
+          {{form.instance.to_organization.address_lbl|linebreaksbr}}
         </td>
         <td class='check'>{{form.b_is_duplicate_a}}</td>
         <td class='check'>{{form.a_is_duplicate_b}}</td>
diff --git a/ishtar_common/templates/ishtar/merge_person.html b/ishtar_common/templates/ishtar/merge_person.html
index e5087fe48..f677a5cf3 100644
--- a/ishtar_common/templates/ishtar/merge_person.html
+++ b/ishtar_common/templates/ishtar/merge_person.html
@@ -7,13 +7,15 @@
           <a href="#" onclick="load_window('{% url 'show-person' form.instance.from_person.pk '' %}', 'person');" class="display_details">Détails</a>
         </td>
         <td>
-          {{form.instance.from_person}} ({{form.instance.from_person.pk}})
+          {{form.instance.from_person}} ({{form.instance.from_person.pk}})<br/>
+          {{form.instance.from_person.address_lbl|linebreaksbr}}
         </td>
         <td>
           <a href="#" onclick="load_window('{% url 'show-person' form.instance.to_person.pk '' %}', 'person');" class="display_details">Détails</a>
         </td>
         <td>
-          {{form.instance.to_person}} ({{form.instance.to_person.pk}})
+          {{form.instance.to_person}} ({{form.instance.to_person.pk}})<br/>
+          {{form.instance.to_person.address_lbl|linebreaksbr}}
         </td>
         <td class='check'>{{form.b_is_duplicate_a}}</td>
         <td class='check'>{{form.a_is_duplicate_b}}</td>
-- 
cgit v1.2.3