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

Add trigger for agenda module to track events

Browse Source 
Move permission on commercial read of third parties into third party module
This commit is contained in:
Laurent Destailleur 2008-02-26 17:02:21 +00:00
parent e9ede02c0a
commit 25169f16bc
8 changed files with 79 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/includes/menus/barre_left/eldy_backoffice.php
View File

@ -352,7 +352,7 @@ class MenuLeft {
}
// Interventions
if ($conf->fichinter->enabled )
if ($conf->fichinter->enabled)
{
$langs->load("interventions");
$newmenu->add(DOL_URL_ROOT."/fichinter/index.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->ficheinter->lire);

36
htdocs/includes/menus/barre_top/eldy_backoffice.php
View File

@ -162,24 +162,28 @@ class MenuTop {
*/
// Commercial
if ($conf->commercial->enabled)
/*$showcommercial=0;
if ($conf->societe->enabled) $showcommercial=1;
if ($conf->propal->enabled) $showcommercial=1;
if ($conf->commande->enabled) $showcommercial=1;
if ($conf->contrat->enabled) $showcommercial=1;
if ($conf->fichinter->enabled) $showcommercial=1;
if ($showcommercial)*/
if ($conf->commercial->enabled)
{
$langs->load("commercial");
$langs->load("commercial");
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial")
{
$class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
$class = 'class="tmenu"';
}
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial")
{
$class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
$class = 'class="tmenu"';
}
if ($user->rights->commercial->main->lire)
print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Commercial").'</a></td>';
else
print '<td class="tmenu"><font class="tmenudisabled">'.$langs->trans("Commercial").'</font></td>';
print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Commercial").'</a></td>';
}
// Financial

38
htdocs/includes/menus/barre_top/eldy_frontoffice.php
View File

@ -161,24 +161,28 @@ class MenuTop {
}
*/
// Commercial
if ($conf->commercial->enabled)
/*$showcommercial=0;
if ($conf->societe->enabled) $showcommercial=1;
if ($conf->propal->enabled) $showcommercial=1;
if ($conf->commande->enabled) $showcommercial=1;
if ($conf->contrat->enabled) $showcommercial=1;
if ($conf->fichinter->enabled) $showcommercial=1;
if ($showcommercial)*/
if ($conf->commercial->enabled)
{
$langs->load("commercial");
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial")
{
$class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
$class = 'class="tmenu"';
}
if ($user->rights->commercial->main->lire)
print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Commercial").'</a></td>';
else
print '<td class="tmenu"><font class="tmenudisabled">'.$langs->trans("Commercial").'</font></td>';
$langs->load("commercial");
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial")
{
$class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
$class = 'class="tmenu"';
}
print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Commercial").'</a></td>';
}
// Financial

10
htdocs/includes/menus/barre_top/rodolphe.php
View File

@ -113,7 +113,14 @@ class MenuTop {
}
// Commercial
if ($conf->commercial->enabled && $user->rights->commercial->main->lire)
/*$showcommercial=0;
if ($conf->societe->enabled) $showcommercial=1;
if ($conf->propal->enabled) $showcommercial=1;
if ($conf->commande->enabled) $showcommercial=1;
if ($conf->contrat->enabled) $showcommercial=1;
if ($conf->fichinter->enabled) $showcommercial=1;
if ($showcommercial)*/
if ($conf->commercial->enabled)
{
$langs->load("commercial");
@ -133,7 +140,6 @@ class MenuTop {
}
print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Commercial").'</a></td>';
}
// Compta/treso (sert pour banque, tva, entites a facturer...)

16
htdocs/includes/modules/modCommercial.class.php
View File

@ -72,11 +72,6 @@ class modCommercial extends DolibarrModules
// Boxes
$this->boxes = array();
$this->boxes[0][0] = "Derniers clients";
$this->boxes[0][1] = "box_clients.php";
$this->boxes[1][0] = "Derniers prospects enregistr<74>s";
$this->boxes[1][1] = "box_prospect.php";
// Permissions
$this->rights = array();
@ -85,21 +80,12 @@ class modCommercial extends DolibarrModules
// 261 : Permission generale
$this->rights[$r][0] = 261;
$this->rights[$r][1] = 'Consulter informations commerciales';
$this->rights[$r][1] = 'Consulter menu commercial';
$this->rights[$r][2] = 'r';
$this->rights[$r][3] = 1;
$this->rights[$r][4] = 'main';
$this->rights[$r][5] = 'lire';
$r++;
// 262 : Resteindre l'acces des commerciaux
$this->rights[$r][0] = 262;
$this->rights[$r][1] = 'Consulter tous les tiers par utilisateurs internes (sinon uniquement si contact commercial). Non effectif pour utilisateurs externes (tjs limités à eux-meme).';
$this->rights[$r][2] = 'r';
$this->rights[$r][3] = 1;
$this->rights[$r][4] = 'client';
$this->rights[$r][5] = 'voir';
$r++;
}
/**

17
htdocs/includes/modules/modSociete.class.php
View File

@ -100,7 +100,12 @@ class modSociete extends DolibarrModules
// Boxes
$this->boxes = array();
$r=0;
$this->boxes[$r][1] = "box_clients.php";
$r++;
$this->boxes[$r][1] = "box_prospect.php";
$r++;
// Permissions
$this->rights = array();
$this->rights_class = 'societe';
@ -165,6 +170,16 @@ class modSociete extends DolibarrModules
$this->rights[$r][3] = 0; // La permission est-elle une permission par d<>faut
$this->rights[$r][4] = 'contact';
$this->rights[$r][5] = 'export';
// 262 : Resteindre l'acces des commerciaux
$this->rights[$r][0] = 262;
$this->rights[$r][1] = 'Consulter tous les tiers par utilisateurs internes (sinon uniquement si contact commercial). Non effectif pour utilisateurs externes (tjs limités à eux-meme).';
$this->rights[$r][2] = 'r';
$this->rights[$r][3] = 1;
$this->rights[$r][4] = 'client';
$this->rights[$r][5] = 'voir';
$r++;
// Exports
//--------

12
htdocs/langs/en_US/admin.lang
View File

@ -331,10 +331,10 @@ Permission113=Setup financiel accounts (create, manage categories)
Permission114=Consolidate transactions
Permission115=Exporte transactions et account statements
Permission116=Transfers between acounts
Permission121=Read companies
Permission122=Create/modify companies
Permission125=Delete companies
Permission126=Export companies
Permission121=Read third parties linked to user
Permission122=Create/modify third parties linked to user
Permission125=Delete third parties linked to user
Permission126=Export third parties
Permission151=Read standing orders
Permission152=Setup standing orders
Permission153=Read standing orders receipts
@ -371,8 +371,8 @@ Permission253=Modify other users password
Permission254=Delete or disable other users
Permission255=Create/modify his own user information
Permission256=Modify his own password
Permission261=Read commercial informations
Permission262=Read all third parties for internal users (otherwise require to be a commercial contact). Not affective for external users (always limited to themselves).
Permission261=Access commercial menu
Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves).
Permission281=Read contacts
Permission282=Create/modify contacts
Permission283=Delete contacts

12
htdocs/langs/fr_FR/admin.lang
View File

@ -330,10 +330,10 @@ Permission113=Configurer les comptes financiers (cr
Permission114=Rapprocher les écritures bancaires
Permission115=Exporter transactions et relevés
Permission116=Saisir virements entre comptes
Permission121=Consulter les sociétés
Permission122=Créer/modifier les sociétés
Permission125=Supprimer les sociétés
Permission126=Exporter les societes
Permission121=Consulter les tiers (sociétés) liés à l'utilisateur
Permission122=Créer/modifier les tiers (sociétés) liés à l'utilisateur
Permission125=Supprimer les tiers (sociétés) liés à l'utilisateur
Permission126=Exporter les tiers (sociétés)
Permission151=Consulter les prélèvements
Permission152=Configurer les prélèvements
Permission153=Consulter les bons de prélèvements
@ -370,8 +370,8 @@ Permission253=Modifier mot de passe des autres utilisateurs
Permission254=Supprimer ou désactiver les autres utilisateurs
Permission255=Créer/modifier ses propres infos utilisateur
Permission256=Modifier son propre mot de passe
Permission261=Consulter informations commerciales
Permission262=Consulter tous les tiers par utilisateurs internes (sinon requiert d'etre contact commercial). Non effectif pour utilisateurs externes (tjs limités à eux-meme).
Permission261=Accéder au menu commercial
Permission262=Etendre l'accès à tous les tiers (Pas seulement ceux liés à l'utilisateur). Non effectif pour utilisateurs externes (tjs limités à eux-meme).
Permission281=Consulter les contacts
Permission282=Créer/modifier les contacts
Permission283=Supprimer les contacts