lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: bug #17236

Browse Source 
Modif: on cache les onglets "note", "notifications" et "info" de la fiche socit pour
 un utilisateur externe.
This commit is contained in:
Regis Houssin 2006-07-30 18:03:59 +00:00
parent 1edb516b88
commit e854700da5
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/comm/fiche.php
View File

@ -81,7 +81,7 @@ if ($_GET["action"] == 'attribute_prefix')
$societe->attribute_prefix($db, $_GET["socid"]);
}
// conditions de règlement
if ($_POST["action"] == 'setconditions')
if ($_POST["action"] == 'setconditions' && (!$user->societe_id > 0))
{
$societe = new Societe($db, $_GET["socid"]);
@ -92,7 +92,7 @@ if ($_POST["action"] == 'setconditions')
if (! $result) dolibarr_print_error($result);
}
// mode de règlement
if ($_POST["action"] == 'setmode')
if ($_POST["action"] == 'setmode' && (!$user->societe_id > 0))
{
$societe = new Societe($db, $_GET["socid"]);
$societe->mode_reglement=$_POST['mode_reglement_id'];
@ -102,7 +102,7 @@ if ($_POST["action"] == 'setmode')
if (! $result) dolibarr_print_error($result);
}
// assujétissement à la TVA
if ($_POST["action"] == 'setassujtva')
if ($_POST["action"] == 'setassujtva' && (!$user->societe_id > 0))
{
$societe = new Societe($db, $_GET["socid"]);
$societe->tva_assuj=$_POST['assujtva_value'];

10
htdocs/compta/fiche.php
View File

@ -178,7 +178,10 @@ if ($socid > 0)
print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
print $langs->trans("CustomerRelativeDiscountShort");
print '<td><td align="right">';
print '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$societe->id.'">'.img_edit($langs->trans("Modify")).'</a>';
if (!$user->societe_id > 0)
{
print '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$societe->id.'">'.img_edit($langs->trans("Modify")).'</a>';
}
print '</td></tr></table>';
print '</td><td colspan="3">'.($societe->remise_client?$societe->remise_client.'%':$langs->trans("DiscountNone")).'</td>';
print '</tr>';
@ -189,7 +192,10 @@ if ($socid > 0)
print '<tr><td nowrap>';
print $langs->trans("CustomerAbsoluteDiscountShort");
print '<td><td align="right">';
print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$societe->id.'">'.img_edit($langs->trans("Modify")).'</a>';
if (!$user->societe_id > 0)
{
print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$societe->id.'">'.img_edit($langs->trans("Modify")).'</a>';
}
print '</td></tr></table>';
print '</td>';
print '<td colspan="3">';

20
htdocs/lib/company.lib.php
View File

@ -71,10 +71,13 @@ function societe_prepare_head($objsoc)
$h++;
}
$head[$h][0] = DOL_URL_ROOT.'/socnote.php?socid='.$objsoc->id;
$head[$h][1] = $langs->trans("Note");
$head[$h][2] = 'note';
$h++;
if ($user->societe_id == 0)
{
$head[$h][0] = DOL_URL_ROOT.'/socnote.php?socid='.$objsoc->id;
$head[$h][1] = $langs->trans("Note");
$head[$h][2] = 'note';
$h++;
}
if ($user->societe_id == 0)
{
@ -84,18 +87,21 @@ function societe_prepare_head($objsoc)
$h++;
}
if (! $conf->global->SOCIETE_DISABLE_NOTIFICATIONS)
if (! $conf->global->SOCIETE_DISABLE_NOTIFICATIONS && $user->societe_id == 0)
{
$head[$h][0] = DOL_URL_ROOT.'/societe/notify/fiche.php?socid='.$objsoc->id;
$head[$h][1] = $langs->trans("Notifications");
$head[$h][2] = 'notify';
$h++;
}
}
if ($user->societe_id == 0)
{
$head[$h][0] = DOL_URL_ROOT.'/societe/info.php?socid='.$objsoc->id;
$head[$h][1] = $langs->trans("Info");
$head[$h][2] = 'info';
$h++;
}
if ($conf->bookmark->enabled && $user->rights->bookmark->creer)
{