diff --git a/ChangeLog b/ChangeLog index f87741a3d0e..ecbe713df84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -105,6 +105,7 @@ Fix: [ bug #1033 ] SUPPLIER REF disappeared Fix: update extrafield do not display immediatly after update Fix: Fix bug with canvas thirdparty Fix: [ bug #1037 ] Consumption> Supplier invoices related +Fix: User group name do not display in card (view or edit mode) ***** ChangeLog for 3.4 compared to 3.3.* ***** diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index 8da493de97e..8d85e323f5c 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -2,6 +2,7 @@ /* Copyright (c) 2005 Rodolphe Quiedeville * Copyright (c) 2005-2012 Laurent Destailleur * Copyright (c) 2005-2012 Regis Houssin + * Copyright (C) 2012 Florian Henry * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -97,6 +98,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 ff7028ab2cf..65e67b01af0 100644 --- a/htdocs/user/group/fiche.php +++ b/htdocs/user/group/fiche.php @@ -3,6 +3,7 @@ * Copyright (C) 2005-2011 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2011 Herve Prot + * Copyright (C) 2012 Florian Henry * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -298,7 +299,7 @@ else // Name print ''.$langs->trans("Name").''; - print ''.$object->nom; + print ''.$object->name; if (empty($object->entity)) { print img_picto($langs->trans("GlobalGroup"),'redstar'); @@ -480,7 +481,7 @@ else print ''; print ''; - print '\n"; // Multicompany
'.$langs->trans("Name").''; + print ''; print "