From f17474a8de3448e40da8d31c00019bd4bfafb13f Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Mon, 11 Jan 2021 16:56:19 +0100
Subject: [PATCH 1/2] 12.0 FIX Translation Permission777 FR

---
 htdocs/langs/fr_FR/admin.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index c4025fb1577..097f2227790 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -848,6 +848,7 @@ Permission773=Supprimer les notes de frais
 Permission774=Lire toutes les notes de frais (même pour les utilisateurs en dehors de ma hierarchie)
 Permission775=Approuver les notes de frais
 Permission776=Payer les notes de frais
+Permission777=Lire les notes de frais de tout le monde
 Permission779=Exporter les notes de frais
 Permission1001=Consulter les stocks
 Permission1002=Créer/modifier entrepôts

From 77f213832ec9fbc1ec2925066739355b9e85fe27 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 11 Jan 2021 19:40:44 +0100
Subject: [PATCH 2/2] fix: update group name

---
 htdocs/user/class/usergroup.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 4d858ffbaf9..2c29db85fc7 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -675,6 +675,10 @@ class UserGroup extends CommonObject
 	{
 		global $user, $conf;
 
+		if (empty($this->nom) && !empty($this->name)) {
+			$this->nom = $this->name;
+		}
+
 		$entity = $conf->entity;
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1)
 		{