From ba4fde20ce1baf820804a7c1dd75ca5f3312dbfc Mon Sep 17 00:00:00 2001
From: Florian Henry <florian.henry@open-concept.pro>
Date: Wed, 21 Aug 2013 17:03:13 +0200
Subject: [PATCH] Fix UserGroup name not display in card view or edit

---
 ChangeLog                             | 1 +
 htdocs/user/class/usergroup.class.php | 1 +
 htdocs/user/group/fiche.php           | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2900cbac807..97ca1ba8d07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ Fix: Supplier invoice and supplier order are not displayed into object link into
 Fix: [ bug #1033 ] SUPPLIER REF disappeared
 Fix: update extrafield do not display immediatly after update
 Fix: Fix bug with canvas thirdparty
+Fix: User group name do not display in card (view or edit mode)
 
 ***** ChangeLog for 3.4 compared to 3.3.* *****
 For users:
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 8da493de97e..d4c314edbed 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -97,6 +97,7 @@ class UserGroup extends CommonObject
 				$this->ref = $obj->rowid;
 				$this->entity = $obj->entity;
 				$this->name = $obj->name;
+				$this->nom = $obj->name; //Deprecated
 				$this->note = $obj->note;
 				$this->datec = $obj->datec;
 				$this->datem = $obj->datem;
diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php
index 201922e7a87..10da3f197b1 100644
--- a/htdocs/user/group/fiche.php
+++ b/htdocs/user/group/fiche.php
@@ -298,7 +298,7 @@ else
 
 			// Name
 			print '<tr><td width="25%" valign="top">'.$langs->trans("Name").'</td>';
-			print '<td width="75%" class="valeur">'.$object->nom;
+			print '<td width="75%" class="valeur">'.$object->name;
 			if (empty($object->entity))
 			{
 				print img_picto($langs->trans("GlobalGroup"),'redstar');
@@ -480,7 +480,7 @@ else
 
             print '<table class="border" width="100%">';
             print '<tr><td width="25%" valign="top" class="fieldrequired">'.$langs->trans("Name").'</td>';
-            print '<td width="75%" class="valeur"><input size="15" type="text" name="group" value="'.$object->nom.'">';
+            print '<td width="75%" class="valeur"><input size="15" type="text" name="group" value="'.$object->name.'">';
             print "</td></tr>\n";
 
             // Multicompany