From 6f8a705fbb31f4909a9ddd30508ab4ccf79f836b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 15 Jan 2023 15:16:14 +0100
Subject: [PATCH] Set border to avatar images

We use circle for individuals and rounded for group like companies.
---
 modules/party_avatar/view/company_list.xml         | 2 +-
 modules/party_avatar/view/employee_list.xml        | 2 +-
 modules/party_avatar/view/party_form.xml           | 2 +-
 modules/party_avatar/view/party_list.xml           | 2 +-
 modules/web_user/view/user_form.xml                | 2 +-
 modules/web_user/view/user_list.xml                | 6 ++++--
 trytond/trytond/res/view/user_form.xml             | 2 +-
 trytond/trytond/res/view/user_form_preferences.xml | 2 +-
 trytond/trytond/res/view/user_list.xml             | 2 +-
 9 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/modules/party_avatar/view/company_list.xml b/modules/party_avatar/view/company_list.xml
index 439a879a44..ad6bd31ef7 100644
--- a/modules/party_avatar/view/company_list.xml
+++ b/modules/party_avatar/view/company_list.xml
@@ -3,6 +3,6 @@
 this repository contains the full copyright notices and license terms. -->
 <data>
     <xpath expr="//field[@name='party']" position="inside">
-        <prefix id="avatar" icon="avatar_url" icon_type="url" url_size="s"/>
+        <prefix id="avatar" icon="avatar_url" icon_type="url" url_size="s" border="rounded"/>
     </xpath>
 </data>
diff --git a/modules/party_avatar/view/employee_list.xml b/modules/party_avatar/view/employee_list.xml
index 439a879a44..4aa6ee438c 100644
--- a/modules/party_avatar/view/employee_list.xml
+++ b/modules/party_avatar/view/employee_list.xml
@@ -3,6 +3,6 @@
 this repository contains the full copyright notices and license terms. -->
 <data>
     <xpath expr="//field[@name='party']" position="inside">
-        <prefix id="avatar" icon="avatar_url" icon_type="url" url_size="s"/>
+        <prefix id="avatar" icon="avatar_url" icon_type="url" url_size="s" border="circle"/>
     </xpath>
 </data>
diff --git a/modules/party_avatar/view/party_form.xml b/modules/party_avatar/view/party_form.xml
index 1a99d83aeb..3305366707 100644
--- a/modules/party_avatar/view/party_form.xml
+++ b/modules/party_avatar/view/party_form.xml
@@ -3,6 +3,6 @@
 this repository contains the full copyright notices and license terms. -->
 <data>
     <xpath expr="//group[@id='header']" position="after">
-        <field name="avatar" widget="image" height="100" width="100" xexpand="0"/>
+        <field name="avatar" widget="image" height="100" width="100" xexpand="0" border="circle"/>
     </xpath>
 </data>
diff --git a/modules/party_avatar/view/party_list.xml b/modules/party_avatar/view/party_list.xml
index 4db62c69b8..290706e314 100644
--- a/modules/party_avatar/view/party_list.xml
+++ b/modules/party_avatar/view/party_list.xml
@@ -3,6 +3,6 @@
 this repository contains the full copyright notices and license terms. -->
 <data>
     <xpath expr="//field[@name='name']" position="inside">
-        <prefix id="avatar" icon="avatar_url" icon_type="url" url_size="s"/>
+        <prefix id="avatar" icon="avatar_url" icon_type="url" url_size="s" border="circle"/>
     </xpath>
 </data>
diff --git a/modules/web_user/view/user_form.xml b/modules/web_user/view/user_form.xml
index 16a87b8ce9..1fb187063e 100644
--- a/modules/web_user/view/user_form.xml
+++ b/modules/web_user/view/user_form.xml
@@ -12,7 +12,7 @@ this repository contains the full copyright notices and license terms. -->
         <field name="email" widget="email"/>
         <newline/>
     </group>
-    <field name="avatar" widget="image" height="100" width="100" xexpand="0"/>
+    <field name="avatar" widget="image" height="100" width="100" xexpand="0" border="circle"/>
 
     <label name="password"/>
     <field name="password" widget="password"/>
diff --git a/modules/web_user/view/user_list.xml b/modules/web_user/view/user_list.xml
index aaa019cf33..d5ca69fab0 100644
--- a/modules/web_user/view/user_list.xml
+++ b/modules/web_user/view/user_list.xml
@@ -2,9 +2,11 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree>
-    <field name="party" expand="2"/>
-    <field name="email" expand="1"/>
+    <field name="email" expand="1">
+        <prefix id="avatar" icon="avatar_url" icon_type="url" url_size="s" border="circle"/>
+    </field>
     <field name="email_valid"/>
+    <field name="party" expand="2"/>
     <button name="validate_email" string="Validate E-mail"/>
     <button name="reset_password" string="Reset Password"/>
 </tree>
diff --git a/trytond/trytond/res/view/user_form.xml b/trytond/trytond/res/view/user_form.xml
index 90d5aa2c66..e3fe9bdde8 100644
--- a/trytond/trytond/res/view/user_form.xml
+++ b/trytond/trytond/res/view/user_form.xml
@@ -17,7 +17,7 @@ this repository contains the full copyright notices and license terms. -->
         <field name="password" widget="password"/>
         <button name="reset_password" colspan="2" />
     </group>
-    <field name="avatar" widget="image" height="100" width="100" xexpand="0"/>
+    <field name="avatar" widget="image" height="100" width="100" xexpand="0" border="circle"/>
     <notebook colspan="4">
         <page string="User" id="user">
             <separator name="signature" colspan="4"/>
diff --git a/trytond/trytond/res/view/user_form_preferences.xml b/trytond/trytond/res/view/user_form_preferences.xml
index b68ccb6428..f9f6fc623c 100644
--- a/trytond/trytond/res/view/user_form_preferences.xml
+++ b/trytond/trytond/res/view/user_form_preferences.xml
@@ -12,7 +12,7 @@ this repository contains the full copyright notices and license terms. -->
         <label name="password"/>
         <field name="password" widget="password"/>
     </group>
-    <field name="avatar" widget="image" height="100" width="100" xexpand="0"/>
+    <field name="avatar" widget="image" height="100" width="100" xexpand="0" border="circle"/>
     <notebook colspan="4">
         <page string="User" id="user">
             <separator name="signature" colspan="4"/>
diff --git a/trytond/trytond/res/view/user_list.xml b/trytond/trytond/res/view/user_list.xml
index d09d227268..ad64db1f26 100644
--- a/trytond/trytond/res/view/user_list.xml
+++ b/trytond/trytond/res/view/user_list.xml
@@ -3,7 +3,7 @@
 this repository contains the full copyright notices and license terms. -->
 <tree>
     <field name="name" expand="2">
-        <prefix id="avatar" icon="avatar_url" icon_type="url" url_size="s"/>
+        <prefix id="avatar" icon="avatar_url" icon_type="url" url_size="s" border="circle"/>
     </field>
     <field name="login" expand="1"/>
     <field name="sessions"/>