From 75194ddb577c78f21b6dcbba852fb6991a8f9376 Mon Sep 17 00:00:00 2001 From: fhenry Date: Sat, 20 Apr 2013 07:05:31 +0200 Subject: [PATCH] Ifo user visibility and maxlength product label regarding db column size --- htdocs/core/lib/usergroups.lib.php | 7 ++++--- htdocs/product/fiche.php | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index b9f12ca3f6c..ab53f0272dc 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -78,14 +78,15 @@ function user_prepare_head($object) $head[$h][2] = 'clicktodial'; $h++; } - + print $user->societe_id; // Show more tabs from modules // Entries must be declared in modules descriptor with line // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab // $this->tabs = array('entity:-tabname); to remove a tab complete_head_from_modules($conf,$langs,$object,$head,$h,'user'); - - if (! empty($user->societe_id)) + + //Info on users is visible only by internal user + if (empty($user->societe_id)) { $head[$h][0] = DOL_URL_ROOT.'/user/note.php?id='.$object->id; $head[$h][1] = $langs->trans("Note"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index e8775f44621..143ed6e9551 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -693,7 +693,7 @@ else print ''; // Label - print ''.$langs->trans("Label").''; + print ''.$langs->trans("Label").''; // On sell print ''.$langs->trans("Status").' ('.$langs->trans("Sell").')'; @@ -866,7 +866,7 @@ else print ''.$langs->trans("Ref").''; // Label - print ''.$langs->trans("Label").''; + print ''.$langs->trans("Label").''; // Status print ''.$langs->trans("Status").' ('.$langs->trans("Sell").')';