Merge pull request #1186 from FHenry/3.4

Fix UserGroup name not display in card view or edit
This commit is contained in:
Juanjo Menent 2013-08-21 08:48:31 -07:00
commit 7e27b9f221
3 changed files with 5 additions and 2 deletions

View File

@ -9,6 +9,8 @@ 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.* *****
For users:

View File

@ -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;

View File

@ -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