Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Restore changes after 27 may due to from savannah Crash.

Browse Source
This commit is contained in:
Laurent Destailleur
2009-06-03 23:05:52 +00:00
parent d4a3038240
commit 3c591db844
25 changed files with 428 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/menubase.class.php
View File

@@ -655,14 +655,7 @@ class Menubase
$perms = $this->verifCond($objm->perms); $perms = $this->verifCond($objm->perms);
} }
// Define $constraint // Define $enabled
$constraint = true;
if ($objm->action)
{
$constraint = $this->verifCond($objm->action);
}
// Define $constraint
$enabled = true; $enabled = true;
if ($objm->enabled) if ($objm->enabled)
{ {

22
htdocs/fichinter/fiche.php
View File

@@ -269,7 +269,7 @@ if ($_POST['action'] == 'updateligne' && $user->rights->ficheinter->creer && $_P
dol_print_error($db); dol_print_error($db);
exit; exit;
} }
$desc=$_POST['desc']; $desc=$_POST['np_desc'];
$date_intervention = dol_mktime($_POST["dihour"], $_POST["dimin"], 0, $_POST["dimonth"], $_POST["diday"], $_POST["diyear"]); $date_intervention = dol_mktime($_POST["dihour"], $_POST["dimin"], 0, $_POST["dimonth"], $_POST["diday"], $_POST["diyear"]);
$duration = ConvertTime2Seconds($_POST['durationhour'],$_POST['durationmin']); $duration = ConvertTime2Seconds($_POST['durationhour'],$_POST['durationmin']);
@@ -277,7 +277,12 @@ if ($_POST['action'] == 'updateligne' && $user->rights->ficheinter->creer && $_P
$fichinterline->desc=$desc; $fichinterline->desc=$desc;
$fichinterline->duration=$duration; $fichinterline->duration=$duration;
$result = $fichinterline->update(); $result = $fichinterline->update();
if ($result < 0)
{
dol_print_error($db);
exit;
}
$outputlangs = $langs; $outputlangs = $langs;
if (! empty($_REQUEST['lang_id'])) if (! empty($_REQUEST['lang_id']))
{ {
@@ -286,6 +291,13 @@ if ($_POST['action'] == 'updateligne' && $user->rights->ficheinter->creer && $_P
} }
fichinter_create($db, $fichinter, $fichinter->modelpdf, $outputlangs); fichinter_create($db, $fichinter, $fichinter->modelpdf, $outputlangs);
unset($_POST['dihour']);
unset($_POST['dimin']);
unset($_POST['dimonth']);
$dateintervention='';
unset($_POST['np_desc']);
unset($_POST['durationhour']);
unset($_POST['durationmin']);
} }
/* /*
@@ -689,16 +701,16 @@ elseif ($_GET["id"] > 0)
print '<td>'; print '<td>';
print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
// <EFBFBD>diteur wysiwyg // Editeur wysiwyg
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS) if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
$doleditor=new DolEditor('desc',$objp->description,164,'dolibarr_details'); $doleditor=new DolEditor('np_desc',$objp->description,164,'dolibarr_details');
$doleditor->Create(); $doleditor->Create();
} }
else else
{ {
print '<textarea name="desc" cols="70" class="flat" rows="'.ROWS_2.'">'.dol_htmlentitiesbr_decode($objp->description).'</textarea>'; print '<textarea name="np_desc" cols="70" class="flat" rows="'.ROWS_2.'">'.dol_htmlentitiesbr_decode($objp->description).'</textarea>';
} }
print '</td>'; print '</td>';

2
htdocs/fichinter/fichinter.class.php
View File

@@ -974,7 +974,7 @@ class FichinterLigne
$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter"; $sql = "UPDATE ".MAIN_DB_PREFIX."fichinter";
$sql.= " SET duree = ".$total_duration; $sql.= " SET duree = ".$total_duration;
$sql.= " WHERE rowid = ".$this->fk_fichinter; $sql.= " WHERE rowid = ".$this->fk_fichinter;
$sql.= " AND entity ".$conf->entity; $sql.= " AND entity = ".$conf->entity;
dol_syslog("FichinterLigne::update_total sql=".$sql); dol_syslog("FichinterLigne::update_total sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);

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

@@ -31,13 +31,12 @@
/** /**
* \class MenuTop * \class MenuTop
* \brief Classe permettant la gestion du menu du haut Eldy * \brief Class to manage top menu Eldy (for internal users)
*/ */
class MenuTop { class MenuTop {
var $require_left=array("eldy_backoffice"); // Si doit etre en phase avec un gestionnaire de menu gauche particulier var $require_left=array("eldy_backoffice"); // Si doit etre en phase avec un gestionnaire de menu gauche particulier
var $hideifnotallowed=false; // Put 0 for back office menu, 1 for front office menu var $hideifnotallowed=0; // Put 0 for back office menu, 1 for front office menu
var $atarget=""; // Valeur du target a utiliser dans les liens var $atarget=""; // Valeur du target a utiliser dans les liens
@@ -52,7 +51,7 @@ class MenuTop {
/** /**
* \brief Affiche le menu * \brief Show menu
*/ */
function showmenu() function showmenu()
{ {
@@ -76,8 +75,10 @@ class MenuTop {
{ {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="home" '; $idsel='id="mainmenu_home" ';
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/index.php?mainmenu=home&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Home").'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/index.php?mainmenu=home&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Home").'</a>';
print '</td>';
// Third parties // Third parties
@@ -96,15 +97,22 @@ class MenuTop {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="companies" '; $idsel='id="mainmenu_companies" ';
if (($conf->societe->enabled && $user->rights->societe->lire) if (($conf->societe->enabled && $user->rights->societe->lire)
|| ($conf->fournisseur->enabled && $user->rights->fournisseur->lire)) || ($conf->fournisseur->enabled && $user->rights->fournisseur->lire))
{ {
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/index.php?mainmenu=companies&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("ThirdParties").'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/index.php?mainmenu=companies&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("ThirdParties").'</a>';
print '</td>';
} }
else else
{ {
if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("ThirdParties").'</a></td>'; if (! $this->hideifnotallowed)
{
print '<td class="tmenu">';
print '<a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("ThirdParties").'</a>';
print '</td>';
}
} }
} }
@@ -128,14 +136,21 @@ class MenuTop {
if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; } if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; }
if ($conf->service->enabled) { $chaine.=$langs->trans("Services"); } if ($conf->service->enabled) { $chaine.=$langs->trans("Services"); }
$idsel='id="products" '; $idsel='id="mainmenu_products" ';
if ($user->rights->produit->lire) if ($user->rights->produit->lire)
{ {
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/product/index.php?mainmenu=products&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$chaine.'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/product/index.php?mainmenu=products&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$chaine.'</a>';
print '</td>';
} }
else else
{ {
if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$chaine.'</a></td>'; if (! $this->hideifnotallowed)
{
print '<td class="tmenu">';
print '<a class="tmenudisabled" '.$idsel.'href="#">'.$chaine.'</a>';
print '</td>';
}
} }
} }
@@ -154,14 +169,21 @@ class MenuTop {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="commercial" '; $idsel='id="mainmenu_commercial" ';
if($user->rights->societe->lire || $user->rights->societe->contact->lire) if($user->rights->societe->lire || $user->rights->societe->contact->lire)
{ {
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Commercial").'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Commercial").'</a>';
print '</td>';
} }
else else
{ {
if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("Commercial").'</a></td>'; if (! $this->hideifnotallowed)
{
print '<td class="tmenu">';
print '<a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("Commercial").'</a>';
print '</td>';
}
} }
} }
@@ -181,15 +203,22 @@ class MenuTop {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="accountancy" '; $idsel='id="mainmenu_accountancy" ';
if ($user->rights->compta->resultat->lire || $user->rights->comptaexpert->plancompte->lire if ($user->rights->compta->resultat->lire || $user->rights->comptaexpert->plancompte->lire
|| $user->rights->facture->lire || $user->rights->banque->lire) || $user->rights->facture->lire || $user->rights->banque->lire)
{ {
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/compta/index.php?mainmenu=accountancy&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("MenuFinancial").'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/compta/index.php?mainmenu=accountancy&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("MenuFinancial").'</a>';
print '</td>';
} }
else else
{ {
if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("MenuFinancial").'</a></td>'; if (! $this->hideifnotallowed)
{
print '<td class="tmenu">';
print '<a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("MenuFinancial").'</a>';
print '</td>';
}
} }
} }
@@ -208,14 +237,21 @@ class MenuTop {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="project" '; $idsel='id="mainmenu_project" ';
if ($user->rights->projet->lire) if ($user->rights->projet->lire)
{ {
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/projet/index.php?mainmenu=project&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Projects").'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/projet/index.php?mainmenu=project&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Projects").'</a>';
print '</td>';
} }
else else
{ {
if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("Projects").'</a></td>'; if (! $this->hideifnotallowed)
{
print '<td class="tmenu">';
print '<a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("Projects").'</a>';
print '</td>';
}
} }
} }
@@ -234,14 +270,21 @@ class MenuTop {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="tools" '; $idsel='id="mainmenu_tools" ';
if ($user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire) if ($user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire)
{ {
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/index.php?mainmenu=tools&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Tools").'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/index.php?mainmenu=tools&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Tools").'</a>';
print '</td>';
} }
else else
{ {
if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("Tools").'</a></td>'; if (! $this->hideifnotallowed)
{
print '<td class="tmenu">';
print '<a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("Tools").'</a>';
print '</td>';
}
} }
} }
@@ -258,8 +301,10 @@ class MenuTop {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="telephonie" '; $idsel='id="mainmenu_telephonie" ';
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/telephonie/index.php?mainmenu=telephonie"'.($this->atarget?" target=$this->atarget":"").'>Telephonie</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/telephonie/index.php?mainmenu=telephonie"'.($this->atarget?" target=$this->atarget":"").'>Telephonie</a>';
print '</td>';
} }
// Energie // Energie
@@ -276,8 +321,10 @@ class MenuTop {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="energie" '; $idsel='id="mainmenu_energie" ';
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/energie/index.php?mainmenu=energie"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Energy").'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/energie/index.php?mainmenu=energie"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Energy").'</a>';
print '</td>';
} }
// OSCommerce 1 // OSCommerce 1
@@ -295,8 +342,10 @@ class MenuTop {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="shop" '; $idsel='id="mainmenu_shop" ';
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/boutique/index.php?mainmenu=shop&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("OSCommerce").'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/boutique/index.php?mainmenu=shop&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("OSCommerce").'</a>';
print '</td>';
} }
// OSCommerce WS // OSCommerce WS
@@ -314,8 +363,10 @@ class MenuTop {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="shop" '; $idsel='id="mainmenu_shop" ';
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/oscommerce_ws/index.php?mainmenu=shop&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("OSCommerce").'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/oscommerce_ws/index.php?mainmenu=shop&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("OSCommerce").'</a>';
print '</td>';
} }
// Members // Members
@@ -333,14 +384,21 @@ class MenuTop {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="members" '; $idsel='id="mainmenu_members" ';
if ($user->rights->adherent->lire) if ($user->rights->adherent->lire)
{ {
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/adherents/index.php?mainmenu=members&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("MenuMembers").'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/adherents/index.php?mainmenu=members&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("MenuMembers").'</a>';
print '</td>';
} }
else else
{ {
if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("MenuMembers").'</a></td>'; if (! $this->hideifnotallowed)
{
print '<td class="tmenu">';
print '<a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("MenuMembers").'</a>';
print '</td>';
}
} }
} }
@@ -348,14 +406,14 @@ class MenuTop {
require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php");
$menuArbo = new Menubase($this->db,'eldy','top'); $menuArbo = new Menubase($this->db,'eldy','top');
$tabMenu = $menuArbo->menuTopCharger(0,$_SESSION['mainmenu'],'eldy'); $tabMenu = $menuArbo->menuTopCharger($this->hideifnotallowed,$_SESSION['mainmenu'],'eldy');
for($i=0; $i<count($tabMenu); $i++) for($i=0; $i<count($tabMenu); $i++)
{ {
if ($tabMenu[$i]['enabled'] == true) if ($tabMenu[$i]['enabled'] == true)
{ {
$idsel=(empty($tabMenu[$i]['mainmenu'])?'id="none" ':'id="'.$tabMenu[$i]['mainmenu'].'" '); $idsel=(empty($tabMenu[$i]['mainmenu'])?'none':$tabMenu[$i]['mainmenu']);
if ($tabMenu[$i]['right'] == true) if ($tabMenu[$i]['right'] == true) // Is allowed
{ {
if (eregi($tabMenu[$i]['url'],"^(http:\/\/|https:\/\/)")) if (eregi($tabMenu[$i]['url'],"^(http:\/\/|https:\/\/)"))
{ {
@@ -364,20 +422,30 @@ class MenuTop {
else else
{ {
$url=DOL_URL_ROOT.$tabMenu[$i]['url']; $url=DOL_URL_ROOT.$tabMenu[$i]['url'];
if (! eregi('\?',DOL_URL_ROOT.$tabMenu[$i]['url'])) $url.='?'; if (! eregi('\?',$url)) $url.='?';
else $url.='&'; else $url.='&';
$url.='mainmenu='.$tabMenu[$i]['mainmenu'].'&leftmenu='; if (! eregi('mainmenu',$url) || ! eregi('leftmenu',$url))
$url.="&idmenu=".$tabMenu[$i]['rowid']; {
$url.='mainmenu='.$tabMenu[$i]['mainmenu'].'&leftmenu=&';
}
$url.="idmenu=".$tabMenu[$i]['rowid'];
} }
if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"'; if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"';
else $class='class="tmenu"'; else $class='class="tmenu"';
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":"").'>'; print '<td class="tmenu" id="td_'.$idsel.'">';
print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":"").'>';
print $tabMenu[$i]['titre']; print $tabMenu[$i]['titre'];
print '</a></td>'; print '</a>';
print '</td>';
} }
else else
{ {
if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$tabMenu[$i]['titre'].'</a></td>'; if (! $this->hideifnotallowed)
{
print '<td class="tmenu" id="td_'.$idsel.'">';
print '<a class="tmenudisabled" id="mainmenu_'.$idsel.'" href="#">'.$tabMenu[$i]['titre'].'</a>';
print '</td>';
}
} }
} }
} }

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

@@ -31,13 +31,12 @@
/** /**
* \class MenuTop * \class MenuTop
* \brief Classe permettant la gestion du menu du haut Eldy * \brief Class to manage top menu Eldy (for external users)
*/ */
class MenuTop { class MenuTop {
var $require_left=array("eldy_frontoffice"); // Si doit etre en phase avec un gestionnaire de menu gauche particulier var $require_left=array("eldy_frontoffice"); // Si doit etre en phase avec un gestionnaire de menu gauche particulier
var $hideifnotallowed=true; // Put 0 for back office menu, 1 for front office menu var $hideifnotallowed=1; // Put 0 for back office menu, 1 for front office menu
var $atarget=""; // Valeur du target a utiliser dans les liens var $atarget=""; // Valeur du target a utiliser dans les liens
@@ -52,7 +51,7 @@ class MenuTop {
/** /**
* \brief Affiche le menu * \brief Show menu
*/ */
function showmenu() function showmenu()
{ {
@@ -76,8 +75,10 @@ class MenuTop {
{ {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="home" '; $idsel='id="mainmenu_home" ';
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/index.php?mainmenu=home&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Home").'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/index.php?mainmenu=home&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Home").'</a>';
print '</td>';
// Third parties // Third parties
@@ -96,15 +97,22 @@ class MenuTop {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="companies" '; $idsel='id="mainmenu_companies" ';
if (($conf->societe->enabled && $user->rights->societe->lire) if (($conf->societe->enabled && $user->rights->societe->lire)
|| ($conf->fournisseur->enabled && $user->rights->fournisseur->lire)) || ($conf->fournisseur->enabled && $user->rights->fournisseur->lire))
{ {
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/index.php?mainmenu=companies&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("ThirdParties").'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/index.php?mainmenu=companies&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("ThirdParties").'</a>';
print '</td>';
} }
else else
{ {
if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("ThirdParties").'</a></td>'; if (! $this->hideifnotallowed)
{
print '<td class="tmenu">';
print '<a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("ThirdParties").'</a>';
print '</td>';
}
} }
} }
@@ -128,14 +136,21 @@ class MenuTop {
if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; } if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; }
if ($conf->service->enabled) { $chaine.=$langs->trans("Services"); } if ($conf->service->enabled) { $chaine.=$langs->trans("Services"); }
$idsel='id="products" '; $idsel='id="mainmenu_products" ';
if ($user->rights->produit->lire) if ($user->rights->produit->lire)
{ {
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/product/index.php?mainmenu=products&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$chaine.'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/product/index.php?mainmenu=products&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$chaine.'</a>';
print '</td>';
} }
else else
{ {
if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$chaine.'</a></td>'; if (! $this->hideifnotallowed)
{
print '<td class="tmenu">';
print '<a class="tmenudisabled" '.$idsel.'href="#">'.$chaine.'</a>';
print '</td>';
}
} }
} }
@@ -154,14 +169,21 @@ class MenuTop {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="commercial" '; $idsel='id="mainmenu_commercial" ';
if($user->rights->societe->lire || $user->rights->societe->contact->lire) if($user->rights->societe->lire || $user->rights->societe->contact->lire)
{ {
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Commercial").'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Commercial").'</a>';
print '</td>';
} }
else else
{ {
if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("Commercial").'</a></td>'; if (! $this->hideifnotallowed)
{
print '<td class="tmenu">';
print '<a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("Commercial").'</a>';
print '</td>';
}
} }
} }
@@ -181,15 +203,22 @@ class MenuTop {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="accountancy" '; $idsel='id="mainmenu_accountancy" ';
if ($user->rights->compta->resultat->lire || $user->rights->comptaexpert->plancompte->lire if ($user->rights->compta->resultat->lire || $user->rights->comptaexpert->plancompte->lire
|| $user->rights->facture->lire || $user->rights->banque->lire) || $user->rights->facture->lire || $user->rights->banque->lire)
{ {
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/compta/index.php?mainmenu=accountancy&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("MenuFinancial").'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/compta/index.php?mainmenu=accountancy&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("MenuFinancial").'</a>';
print '</td>';
} }
else else
{ {
if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("MenuFinancial").'</a></td>'; if (! $this->hideifnotallowed)
{
print '<td class="tmenu">';
print '<a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("MenuFinancial").'</a>';
print '</td>';
}
} }
} }
@@ -208,14 +237,21 @@ class MenuTop {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="project" '; $idsel='id="mainmenu_project" ';
if ($user->rights->projet->lire) if ($user->rights->projet->lire)
{ {
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/projet/index.php?mainmenu=project&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Projects").'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/projet/index.php?mainmenu=project&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Projects").'</a>';
print '</td>';
} }
else else
{ {
if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("Projects").'</a></td>'; if (! $this->hideifnotallowed)
{
print '<td class="tmenu">';
print '<a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("Projects").'</a>';
print '</td>';
}
} }
} }
@@ -234,14 +270,21 @@ class MenuTop {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="tools" '; $idsel='id="mainmenu_tools" ';
if ($user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire) if ($user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire)
{ {
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/index.php?mainmenu=tools&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Tools").'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/index.php?mainmenu=tools&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Tools").'</a>';
print '</td>';
} }
else else
{ {
if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("Tools").'</a></td>'; if (! $this->hideifnotallowed)
{
print '<td class="tmenu">';
print '<a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("Tools").'</a>';
print '</td>';
}
} }
} }
@@ -258,8 +301,10 @@ class MenuTop {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="telephonie" '; $idsel='id="mainmenu_telephonie" ';
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/telephonie/index.php?mainmenu=telephonie"'.($this->atarget?" target=$this->atarget":"").'>Telephonie</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/telephonie/index.php?mainmenu=telephonie"'.($this->atarget?" target=$this->atarget":"").'>Telephonie</a>';
print '</td>';
} }
// Energie // Energie
@@ -276,8 +321,10 @@ class MenuTop {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="energie" '; $idsel='id="mainmenu_energie" ';
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/energie/index.php?mainmenu=energie"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Energy").'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/energie/index.php?mainmenu=energie"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Energy").'</a>';
print '</td>';
} }
// OSCommerce 1 // OSCommerce 1
@@ -295,8 +342,10 @@ class MenuTop {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="shop" '; $idsel='id="mainmenu_shop" ';
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/boutique/index.php?mainmenu=shop&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("OSCommerce").'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/boutique/index.php?mainmenu=shop&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("OSCommerce").'</a>';
print '</td>';
} }
// OSCommerce WS // OSCommerce WS
@@ -314,8 +363,10 @@ class MenuTop {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="shop" '; $idsel='id="mainmenu_shop" ';
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/oscommerce_ws/index.php?mainmenu=shop&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("OSCommerce").'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/oscommerce_ws/index.php?mainmenu=shop&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("OSCommerce").'</a>';
print '</td>';
} }
// Members // Members
@@ -333,30 +384,36 @@ class MenuTop {
$class = 'class="tmenu"'; $class = 'class="tmenu"';
} }
$idsel='id="members" '; $idsel='id="mainmenu_members" ';
if ($user->rights->adherent->lire) if ($user->rights->adherent->lire)
{ {
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/adherents/index.php?mainmenu=members&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("MenuMembers").'</a></td>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/adherents/index.php?mainmenu=members&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("MenuMembers").'</a>';
print '</td>';
} }
else else
{ {
if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("MenuMembers").'</a></td>'; if (! $this->hideifnotallowed)
{
print '<td class="tmenu">';
print '<a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("MenuMembers").'</a>';
print '</td>';
}
} }
} }
// Affichage des menus personnalises // Affichage des menus personnalises
require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php");
$menuArbo = new Menubase($this->db,'eldy','top'); $menuArbo = new Menubase($this->db,'eldy','top');
$tabMenu = $menuArbo->menuTopCharger(0,$_SESSION['mainmenu'],'eldy'); $tabMenu = $menuArbo->menuTopCharger($this->hideifnotallowed,$_SESSION['mainmenu'],'eldy');
for($i=0; $i<count($tabMenu); $i++) for($i=0; $i<count($tabMenu); $i++)
{ {
if ($tabMenu[$i]['enabled'] == true) if ($tabMenu[$i]['enabled'] == true)
{ {
$idsel=(empty($tabMenu[$i]['mainmenu'])?'id="none" ':'id="'.$tabMenu[$i]['mainmenu'].'" '); $idsel=(empty($tabMenu[$i]['mainmenu'])?'none':$tabMenu[$i]['mainmenu']);
if ($tabMenu[$i]['right'] == true) if ($tabMenu[$i]['right'] == true) // Is allowed
{ {
if (eregi($tabMenu[$i]['url'],"^(http:\/\/|https:\/\/)")) if (eregi($tabMenu[$i]['url'],"^(http:\/\/|https:\/\/)"))
{ {
@@ -365,27 +422,37 @@ class MenuTop {
else else
{ {
$url=DOL_URL_ROOT.$tabMenu[$i]['url']; $url=DOL_URL_ROOT.$tabMenu[$i]['url'];
if (! eregi('\?',DOL_URL_ROOT.$tabMenu[$i]['url'])) $url.='?'; if (! eregi('\?',$url)) $url.='?';
else $url.='&'; else $url.='&';
$url.='mainmenu='.$tabMenu[$i]['mainmenu'].'&leftmenu='; if (! eregi('mainmenu',$url) || ! eregi('leftmenu',$url))
$url.="&idmenu=".$tabMenu[$i]['rowid']; {
$url.='mainmenu='.$tabMenu[$i]['mainmenu'].'&leftmenu=&';
}
$url.="idmenu=".$tabMenu[$i]['rowid'];
} }
if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"'; if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"';
else $class='class="tmenu"'; else $class='class="tmenu"';
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":"").'>'; print '<td class="tmenu" id="td_'.$idsel.'">';
print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":"").'>';
print $tabMenu[$i]['titre']; print $tabMenu[$i]['titre'];
print '</a></td>'; print '</a>';
print '</td>';
} }
else else
{ {
if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$tabMenu[$i]['titre'].'</a></td>'; if (! $this->hideifnotallowed)
{
print '<td class="tmenu" id="td_'.$idsel.'">';
print '<a class="tmenudisabled" id="mainmenu_'.$idsel.'" href="#">'.$tabMenu[$i]['titre'].'</a>';
print '</td>';
}
} }
} }
} }
print '</tr></table>'; print '</tr></table>';
} }
} }
?> ?>

25
htdocs/includes/menus/barre_top/empty.php
View File

@@ -54,13 +54,19 @@ class MenuTop {
print '<table class="tmenu" summary="topmenu"><tr class="tmenu">'; print '<table class="tmenu" summary="topmenu"><tr class="tmenu">';
// Menu Home // Menu Home
print '<td class="tmenu"><a href="'.DOL_URL_ROOT.'/index.php?mainmenu=home">'.$langs->trans("Home").'</a></td>'; print '<td class="tmenu">';
print '<a href="'.DOL_URL_ROOT.'/index.php?mainmenu=home">'.$langs->trans("Home").'</a>';
print '</td>';
// Put here top menu entries // Put here top menu entries
// ***** START ***** // ***** START *****
// print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/thepage1.php>My menu entry 1</a></td>'; // print '<td class="tmenu">';
// print '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/thepage2.php>My menu entry 2</a></td>'; // print '<a '.$class.' href="'.DOL_URL_ROOT.'/thepage1.php>My menu entry 1</a>';
// print '</td>';
// print '<td class="tmenu">';
// print '<a '.$class.' href="'.DOL_URL_ROOT.'/thepage2.php>My menu entry 2</a>';
// print '</td>';
// ... // ...
// ***** END ***** // ***** END *****
@@ -86,13 +92,20 @@ class MenuTop {
$url.="&idmenu=".$tabMenu[$i]['rowid']; $url.="&idmenu=".$tabMenu[$i]['rowid'];
if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"'; if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"';
else $class='class="tmenu"'; else $class='class="tmenu"';
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.$url.'"'.($this->atarget?" target=$this->atarget":"").'>'; print '<td class="tmenu">';
print '<a '.$class.' '.$idsel.'href="'.$url.'"'.($this->atarget?" target=$this->atarget":"").'>';
print $tabMenu[$i]['titre']; print $tabMenu[$i]['titre'];
print '</a></td>'; print '</a>';
print '</td>';
} }
else else
{ {
if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$tabMenu[$i]['titre'].'</a></td>'; if (! $this->hideifnotallowed)
{
print '<td class="tmenu">';
print '<a class="tmenudisabled" '.$idsel.'href="#">'.$tabMenu[$i]['titre'].'</a>';
print '</td>';
}
} }
} }
} }

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

@@ -19,7 +19,7 @@
/** /**
\file htdocs/includes/menus/barre_top/rodolphe.php \file htdocs/includes/menus/barre_top/rodolphe.php
\brief Gestionnaire nomme eldy du menu du haut \brief Gestionnaire nomme rodolphe du menu du haut
\version $Id$ \version $Id$
\remarks La construction d'un gestionnaire pour le menu du haut est simple: \remarks La construction d'un gestionnaire pour le menu du haut est simple:

73
htdocs/includes/menus/init_menu_auguria.sql
View File

@@ -13,14 +13,14 @@ delete from llx_menu where menu_handler='auguria';
-- --
-- table `llx_menu` -- table `llx_menu`
-- --
insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$user->admin', 1__+MAX_llx_menu__, 'auguria', 'top', 'home', '', 0, '/index.php?mainmenu=home&amp;leftmenu=', 'Home', -1, '', '', '', 2, 1, __ENTITY__); insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('1', 1__+MAX_llx_menu__, 'auguria', 'top', 'home', '', 0, '/index.php?mainmenu=home&amp;leftmenu=', 'Home', -1, '', '', '', 2, 1, __ENTITY__);
insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->societe->enabled || $conf->fournisseur->enabled', 2__+MAX_llx_menu__, 'auguria', 'top', 'companies', '', 0, '/index.php?mainmenu=companies&amp;leftmenu=', 'ThirdParties', -1, 'companies', '', '', 2, 2, __ENTITY__); insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->societe->enabled || $conf->fournisseur->enabled', 2__+MAX_llx_menu__, 'auguria', 'top', 'companies', '', 0, '/index.php?mainmenu=companies&amp;leftmenu=', 'ThirdParties', -1, 'companies', '', '', 2, 2, __ENTITY__);
insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->produit->enabled || $conf->service->enabled', 3__+MAX_llx_menu__, 'auguria', 'top', 'products', '', 0, '/product/index.php?mainmenu=products&amp;leftmenu=', 'Products/Services', -1, 'products', '$user->rights->produit->lire', '', 0, 3, __ENTITY__); insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->produit->enabled || $conf->service->enabled', 3__+MAX_llx_menu__, 'auguria', 'top', 'products', '', 0, '/product/index.php?mainmenu=products&amp;leftmenu=', 'Products/Services', -1, 'products', '$user->rights->produit->lire', '', 0, 3, __ENTITY__);
insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->fournisseur->enabled', 4__+MAX_llx_menu__, 'auguria', 'top', 'suppliers', '', 0, '/fourn/index.php?mainmenu=suppliers&amp;leftmenu=', 'Suppliers', -1, 'suppliers', '$user->rights->fournisseur->lire', '', 0, 4, __ENTITY__); insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->fournisseur->enabled', 4__+MAX_llx_menu__, 'auguria', 'top', 'suppliers', '', 0, '/fourn/index.php?mainmenu=suppliers&amp;leftmenu=', 'Suppliers', -1, 'suppliers', '$user->rights->fournisseur->lire', '', 0, 4, __ENTITY__);
insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->societe->enabled', 5__+MAX_llx_menu__, 'auguria', 'top', 'commercial', '', 0, '/comm/index.php?mainmenu=commercial&amp;leftmenu=', 'Commercial', -1, 'commercial', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 5, __ENTITY__); insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->societe->enabled', 5__+MAX_llx_menu__, 'auguria', 'top', 'commercial', '', 0, '/comm/index.php?mainmenu=commercial&amp;leftmenu=', 'Commercial', -1, 'commercial', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 5, __ENTITY__);
insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled || $conf->facture->enabled', 6__+MAX_llx_menu__, 'auguria', 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&amp;leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->plancompte->lire || $user->rights->commande->lire || $user->rights->facture->lire || $user->rights->banque->lire', '', 2, 6, __ENTITY__); insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled || $conf->facture->enabled', 6__+MAX_llx_menu__, 'auguria', 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&amp;leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->plancompte->lire || $user->rights->commande->lire || $user->rights->facture->lire || $user->rights->banque->lire', '', 2, 6, __ENTITY__);
insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->projet->enabled', 7__+MAX_llx_menu__, 'auguria', 'top', 'project', '', 0, '/projet/index.php?mainmenu=project&amp;leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 0, 7, __ENTITY__); insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->projet->enabled', 7__+MAX_llx_menu__, 'auguria', 'top', 'project', '', 0, '/projet/index.php?mainmenu=project&amp;leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 0, 7, __ENTITY__);
insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->mailing->enabled || $conf->export->enabled || $conf->global->MAIN_MODULE_IMPORT || $conf->global->MAIN_MODULE_DOMAIN', 'auguria', 'top', 'tools', '', 0, '/index.php?mainmenu=tools&amp;leftmenu=', 'Tools', -1, 'other', '$user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire', '', 2, 8, __ENTITY__); insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->mailing->enabled || $conf->export->enabled || $conf->global->MAIN_MODULE_IMPORT || $conf->global->MAIN_MODULE_DOMAIN', 8__+MAX_llx_menu__, 'auguria', 'top', 'tools', '', 0, '/index.php?mainmenu=tools&amp;leftmenu=', 'Tools', -1, 'other', '$user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire', '', 2, 8, __ENTITY__);
insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('! empty($conf->telephonie->enabled) && $user->rights->telephonie->lire', 9__+MAX_llx_menu__, 'auguria', 'top', 'telephony', '', 0, '/telephonie/index.php?mainmenu=telephony&amp;leftmenu=', 'Telephony', -1, 'telephony', '$user->rights->telephonie->lire', '', 2, 9, __ENTITY__); insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('! empty($conf->telephonie->enabled) && $user->rights->telephonie->lire', 9__+MAX_llx_menu__, 'auguria', 'top', 'telephony', '', 0, '/telephonie/index.php?mainmenu=telephony&amp;leftmenu=', 'Telephony', -1, 'telephony', '$user->rights->telephonie->lire', '', 2, 9, __ENTITY__);
insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('! empty($conf->energie->enabled)', 10__+MAX_llx_menu__, 'auguria', 'top', 'energy', '', 0, '/energie/index.php?mainmenu=energy&amp;leftmenu=', 'Energy', -1, 'energy', '', '', 2, 10, __ENTITY__); insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('! empty($conf->energie->enabled)', 10__+MAX_llx_menu__, 'auguria', 'top', 'energy', '', 0, '/energie/index.php?mainmenu=energy&amp;leftmenu=', 'Energy', -1, 'energy', '', '', 2, 10, __ENTITY__);
insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('! empty($conf->boutique->enabled)', 11__+MAX_llx_menu__, 'auguria', 'top', 'shop', '', 0, '/boutique/index.php?mainmenu=shop&amp;leftmenu=', 'OSCommerce', -1, 'shop', '', '', 0, 11, __ENTITY__); insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('! empty($conf->boutique->enabled)', 11__+MAX_llx_menu__, 'auguria', 'top', 'shop', '', 0, '/boutique/index.php?mainmenu=shop&amp;leftmenu=', 'OSCommerce', -1, 'shop', '', '', 0, 11, __ENTITY__);
@@ -28,45 +28,44 @@ insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`,
insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->cashdesk->enabled', 14__+MAX_llx_menu__, 'auguria', 'top', 'cashdesk', '', 0, '/cashdesk/index.php?mainmenu=cashdesk&amp;leftmenu=', 'CashDesk', -1, 'cashdesk', '', '', 2, 13, __ENTITY__); insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->cashdesk->enabled', 14__+MAX_llx_menu__, 'auguria', 'top', 'cashdesk', '', 0, '/cashdesk/index.php?mainmenu=cashdesk&amp;leftmenu=', 'CashDesk', -1, 'cashdesk', '', '', 2, 13, __ENTITY__);
insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->adherent->enabled', 13__+MAX_llx_menu__, 'auguria', 'top', 'members', '', 0, '/adherents/index.php?mainmenu=members&amp;leftmenu=', 'Members', -1, 'members', '', '', 2, 15, __ENTITY__); insert into `llx_menu` (`enabled`, `rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->adherent->enabled', 13__+MAX_llx_menu__, 'auguria', 'top', 'members', '', 0, '/adherents/index.php?mainmenu=members&amp;leftmenu=', 'Members', -1, 'members', '', '', 2, 15, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values (1, 'auguria', 'left', 100__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/index.php?leftmenu=setup', 'Setup', 0, 'admin', '', '', 2, 0, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$user->admin', 'auguria', 'left', 100__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/index.php?leftmenu=setup', 'Setup', 0, 'admin', '', '', 2, 0, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 101__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/company.php', 'MenuCompanySetup', 1, 'admin', '', '', 2, 1, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 101__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/company.php?leftmenu=setup', 'MenuCompanySetup', 1, 'admin', '', '', 2, 1, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 102__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/ihm.php', 'GUISetup', 1, 'admin', '', '', 2, 4, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 102__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/ihm.php?leftmenu=setup', 'GUISetup', 1, 'admin', '', '', 2, 4, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 103__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/modules.php', 'Modules', 1, 'admin', '', '', 2, 2, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 103__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/modules.php?leftmenu=setup', 'Modules', 1, 'admin', '', '', 2, 2, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 104__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/boxes.php', 'Boxes', 1, 'admin', '', '', 2, 5, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 104__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/boxes.php?leftmenu=setup', 'Boxes', 1, 'admin', '', '', 2, 5, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 105__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/menus.php', 'Menus', 1, 'admin', '', '', 2, 3, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 105__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/menus.php?leftmenu=setup', 'Menus', 1, 'admin', '', '', 2, 3, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 106__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/delais.php', 'Alerts', 1, 'admin', '', '', 2, 6, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 106__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/delais.php?leftmenu=setup', 'Alerts', 1, 'admin', '', '', 2, 6, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/perms.php', 'Security', 1, 'admin', '', '', 2, 7, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/perms.php?leftmenu=setup', 'Security', 1, 'admin', '', '', 2, 7, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/mails.php', 'Emails', 1, 'admin', '', '', 2, 8, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/mails.php?leftmenu=setup', 'Emails', 1, 'admin', '', '', 2, 8, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 110__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/limits.php', 'MenuLimits', 1, 'admin', '', '', 2, 9, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 110__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/limits.php?leftmenu=setup', 'MenuLimits', 1, 'admin', '', '', 2, 9, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php', 'DictionnarySetup', 1, 'admin', '', '', 2, 10, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?leftmenu=setup', 'DictionnarySetup', 1, 'admin', '', '', 2, 10, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 112__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/const.php', 'OtherSetup', 1, 'admin', '', '', 2, 11, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="setup"', 'auguria', 'left', 112__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/const.php?leftmenu=setup', 'OtherSetup', 1, 'admin', '', '', 2, 11, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values (1, 'auguria', 'left', 200__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/system/index.php?leftmenu=system', 'SystemInfo', 0, 'admin', '', '', 2, 1, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$user->admin', 'auguria', 'left', 200__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/system/index.php?leftmenu=system', 'SystemInfo', 0, 'admin', '', '', 2, 1, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="system"', 'auguria', 'left', 201__+MAX_llx_menu__, 'home', '', 200__+MAX_llx_menu__, '/admin/system/dolibarr.php', 'Dolibarr', 1, 'admin', '', '', 2, 0, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="system"', 'auguria', 'left', 201__+MAX_llx_menu__, 'home', '', 200__+MAX_llx_menu__, '/admin/system/dolibarr.php?leftmenu=system', 'Dolibarr', 1, 'admin', '', '', 2, 0, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="system"', 'auguria', 'left', 202__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/admin/system/constall.php', 'AllParameters', 2, 'admin', '', '', 2, 1, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="system"', 'auguria', 'left', 202__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/admin/system/constall.php?leftmenu=system', 'AllParameters', 2, 'admin', '', '', 2, 1, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="system"', 'auguria', 'left', 207__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/admin/triggers.php', 'Triggers', 2, 'admin', '', '', 2, 2, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="system"', 'auguria', 'left', 207__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/admin/triggers.php?leftmenu=system', 'Triggers', 2, 'admin', '', '', 2, 2, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="system"', 'auguria', 'left', 203__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/about.php', 'About', 2, 'admin', '', '', 2, 3, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="system"', 'auguria', 'left', 203__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/about.php?leftmenu=system', 'About', 2, 'admin', '', '', 2, 3, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="system"', 'auguria', 'left', 204__+MAX_llx_menu__, 'home', '', 200__+MAX_llx_menu__, '/admin/system/os.php', 'OS', 1, 'admin', '', '', 2, 1, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="system"', 'auguria', 'left', 204__+MAX_llx_menu__, 'home', '', 200__+MAX_llx_menu__, '/admin/system/os.php?leftmenu=system', 'OS', 1, 'admin', '', '', 2, 1, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="system"', 'auguria', 'left', 205__+MAX_llx_menu__, 'home', '', 200__+MAX_llx_menu__, '/admin/system/web.php', 'WebServer', 1, 'admin', '', '', 2, 2, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="system"', 'auguria', 'left', 205__+MAX_llx_menu__, 'home', '', 200__+MAX_llx_menu__, '/admin/system/web.php?leftmenu=system', 'WebServer', 1, 'admin', '', '', 2, 2, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="system"', 'auguria', 'left', 206__+MAX_llx_menu__, 'home', '', 200__+MAX_llx_menu__, '/admin/system/phpinfo.php', 'Php', 1, 'admin', '', '', 2, 3, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="system"', 'auguria', 'left', 206__+MAX_llx_menu__, 'home', '', 200__+MAX_llx_menu__, '/admin/system/phpinfo.php?leftmenu=system', 'Php', 1, 'admin', '', '', 2, 3, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="system"', 'auguria', 'left', 210__+MAX_llx_menu__, 'home', '', 200__+MAX_llx_menu__, '/admin/system/database.php', 'Database', 1, 'admin', '', '', 2, 4, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="system"', 'auguria', 'left', 210__+MAX_llx_menu__, 'home', '', 200__+MAX_llx_menu__, '/admin/system/database.php?leftmenu=system', 'Database', 1, 'admin', '', '', 2, 4, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="system"', 'auguria', 'left', 211__+MAX_llx_menu__, 'home', '', 210__+MAX_llx_menu__, '/admin/system/database-tables.php', 'Tables', 2, 'admin', '', '', 2, 0, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="system"', 'auguria', 'left', 211__+MAX_llx_menu__, 'home', '', 210__+MAX_llx_menu__, '/admin/system/database-tables.php?leftmenu=system', 'Tables', 2, 'admin', '', '', 2, 0, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="system"', 'auguria', 'left', 212__+MAX_llx_menu__, 'home', '', 210__+MAX_llx_menu__, '/admin/system/database-tables-contraintes.php', 'Constraints', 2, 'admin', '', '', 2, 1, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="system"', 'auguria', 'left', 212__+MAX_llx_menu__, 'home', '', 210__+MAX_llx_menu__, '/admin/system/database-tables-contraintes.php?leftmenu=system', 'Constraints', 2, 'admin', '', '', 2, 1, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values (1, 'auguria', 'left', 300__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/tools/index.php?leftmenu=admintools', 'SystemTools', 0, 'admin', '', '', 2, 2, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$user->admin', 'auguria', 'left', 300__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/tools/index.php?leftmenu=admintools', 'SystemTools', 0, 'admin', '', '', 2, 2, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="admintools"', 'auguria', 'left', 301__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/dolibarr_export.php', 'Backup', 1, 'admin', '', '', 2, 0, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="admintools"', 'auguria', 'left', 301__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/dolibarr_export.php?leftmenu=admintools', 'Backup', 1, 'admin', '', '', 2, 0, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="admintools"', 'auguria', 'left', 302__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/dolibarr_import.php', 'Restore', 1, 'admin', '', '', 2, 1, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="admintools"', 'auguria', 'left', 302__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/dolibarr_import.php?leftmenu=admintools', 'Restore', 1, 'admin', '', '', 2, 1, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="admintools"', 'auguria', 'left', 305__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/update.php', 'Upgrade', 1, 'admin', '', '', 2, 2, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="admintools"', 'auguria', 'left', 305__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/update.php?leftmenu=admintools', 'Upgrade', 1, 'admin', '', '', 2, 2, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="admintools"', 'auguria', 'left', 304__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/eaccelerator.php', 'EAccelerator', 1, 'admin', '', '', 2, 3, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="admintools"', 'auguria', 'left', 304__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/eaccelerator.php?leftmenu=admintools', 'EAccelerator', 1, 'admin', '', '', 2, 3, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="admintools"', 'auguria', 'left', 306__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/listevents.php', 'Audit', 1, 'admin', '', '', 2, 4, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="admintools"', 'auguria', 'left', 306__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/listevents.php?leftmenu=admintools', 'Audit', 1, 'admin', '', '', 2, 4, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="admintools"', 'auguria', 'left', 303__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/purge.php', 'Purge', 1, 'admin', '', '', 2, 5, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="admintools"', 'auguria', 'left', 303__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/purge.php?leftmenu=admintools', 'Purge', 1, 'admin', '', '', 2, 5, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values (1, 'auguria', 'left', 400__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/user/home.php?leftmenu=users', 'MenuUsersAndGroups', 0, 'users', '', '', 2, 3, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values (1, 'auguria', 'left', 400__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/user/home.php?leftmenu=users', 'MenuUsersAndGroups', 0, 'users', '', '', 2, 3, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="users"', 'auguria', 'left', 401__+MAX_llx_menu__, 'home', '', 400__+MAX_llx_menu__, '/user/index.php', 'Users', 1, 'users', '$user->rights->user->user->lire || $user->admin', '', 2, 0, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="users"', 'auguria', 'left', 401__+MAX_llx_menu__, 'home', '', 400__+MAX_llx_menu__, '/user/index.php?leftmenu=users', 'Users', 1, 'users', '$user->rights->user->user->lire || $user->admin', '', 2, 0, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="users"', 'auguria', 'left', 402__+MAX_llx_menu__, 'home', '', 401__+MAX_llx_menu__, '/user/fiche.php?action=create', 'NewUser', 2, 'users', '$user->rights->user->user->creer || $user->admin', '', 2, 0, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="users"', 'auguria', 'left', 402__+MAX_llx_menu__, 'home', '', 401__+MAX_llx_menu__, '/user/fiche.php?leftmenu=users&action=create', 'NewUser', 2, 'users', '$user->rights->user->user->creer || $user->admin', '', 2, 0, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="users"', 'auguria', 'left', 403__+MAX_llx_menu__, 'home', '', 400__+MAX_llx_menu__, '/user/group/index.php', 'Groups', 1, 'users', '$user->rights->user->user->lire || $user->admin', '', 2, 1, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="users"', 'auguria', 'left', 403__+MAX_llx_menu__, 'home', '', 400__+MAX_llx_menu__, '/user/group/index.php?leftmenu=users', 'Groups', 1, 'users', '$user->rights->user->user->lire || $user->admin', '', 2, 1, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="users"', 'auguria', 'left', 404__+MAX_llx_menu__, 'home', '', 403__+MAX_llx_menu__, '/user/group/fiche.php?action=create', 'NewGroup', 2, 'users', '$user->rights->user->user->creer || $user->admin', '', 2, 0, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$leftmenu=="users"', 'auguria', 'left', 404__+MAX_llx_menu__, 'home', '', 403__+MAX_llx_menu__, '/user/group/fiche.php?leftmenu=users&action=create', 'NewGroup', 2, 'users', '$user->rights->user->user->creer || $user->admin', '', 2, 0, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->societe->enabled', 'auguria', 'left', 500__+MAX_llx_menu__, 'companies', '', 2__+MAX_llx_menu__, '/societe.php', 'ThirdParty', 0, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->societe->enabled', 'auguria', 'left', 500__+MAX_llx_menu__, 'companies', '', 2__+MAX_llx_menu__, '/societe.php', 'ThirdParty', 0, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->societe->enabled', 'auguria', 'left', 501__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/soc.php?action=create', 'MenuNewThirdParty', 1, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->societe->enabled', 'auguria', 'left', 501__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/soc.php?action=create', 'MenuNewThirdParty', 1, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->societe->enabled', 'auguria', 'left', 502__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/groupe/index.php', 'MenuSocGroup', 1, 'companies', '$user->rights->societe->lire', '', 2, 1, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->societe->enabled', 'auguria', 'left', 503__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/fourn/liste.php?leftmenu=suppliers', 'Suppliers', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 2, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->societe->enabled', 'auguria', 'left', 503__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/fourn/liste.php?leftmenu=suppliers', 'Suppliers', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 2, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->societe->enabled', 'auguria', 'left', 504__+MAX_llx_menu__, 'companies', '', 503__+MAX_llx_menu__, '/soc.php?leftmenu=supplier&action=create&type=f', 'NewSupplier', 2, 'suppliers', '$user->rights->societe->lire', '', 2, 0, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->societe->enabled', 'auguria', 'left', 504__+MAX_llx_menu__, 'companies', '', 503__+MAX_llx_menu__, '/soc.php?leftmenu=supplier&action=create&type=f', 'NewSupplier', 2, 'suppliers', '$user->rights->societe->lire', '', 2, 0, __ENTITY__);
insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->societe->enabled', 'auguria', 'left', 505__+MAX_llx_menu__, 'companies', '', 503__+MAX_llx_menu__, '/contact/index.php?leftmenu=suppliers&type=f', 'Contacts', 2, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 1, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position, entity) values ('$conf->societe->enabled', 'auguria', 'left', 505__+MAX_llx_menu__, 'companies', '', 503__+MAX_llx_menu__, '/contact/index.php?leftmenu=suppliers&type=f', 'Contacts', 2, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 1, __ENTITY__);

18
htdocs/includes/modules/DolibarrModules.class.php
View File

@@ -442,7 +442,7 @@ class DolibarrModules
{ {
while (($file = readdir($handle))!==false) while (($file = readdir($handle))!==false)
{ {
if (eregi('\.sql$',$file) && substr($file,0,4) == 'llx_' && substr($file, -8) <> '.key.sql') if (eregi('\.sql$',$file) && ! eregi('\.key\.sql$',$file) && substr($file,0,4) == 'llx_' && substr($file,0,8) != 'llx_data')
{ {
$result=run_sql($dir.$file,1); $result=run_sql($dir.$file,1);
} }
@@ -456,7 +456,21 @@ class DolibarrModules
{ {
while (($file = readdir($handle))!==false) while (($file = readdir($handle))!==false)
{ {
if (eregi('\.sql$',$file) && substr($file,0,4) == 'llx_' && substr($file, -8) == '.key.sql') if (eregi('\.key\.sql$',$file) && substr($file,0,4) == 'llx_' && substr($file,0,8) != 'llx_data')
{
$result=run_sql($dir.$file,1);
}
}
closedir($handle);
}
// Run llx_data.sql files
$handle=@opendir($dir); // Dir may not exist
if ($handle)
{
while (($file = readdir($handle))!==false)
{
if (eregi('\.sql$',$file) && ! eregi('\.key\.sql$',$file) && substr($file,0,8) == 'llx_data')
{ {
$result=run_sql($dir.$file,1); $result=run_sql($dir.$file,1);
} }

24
htdocs/includes/modules/fichinter/pdf_soleil.modules.php
View File

@@ -20,10 +20,10 @@
*/ */
/** /**
\file htdocs/includes/modules/fichinter/pdf_soleil.modules.php * \file htdocs/includes/modules/fichinter/pdf_soleil.modules.php
\ingroup ficheinter * \ingroup ficheinter
\brief Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil * \brief Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil
\version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php");
@@ -31,16 +31,16 @@ require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
/** /**
\class pdf_soleil * \class pdf_soleil
\brief Classe permettant de g<>n<EFBFBD>rer les fiches d'intervention au mod<EFBFBD>le Soleil * \brief Class to build interventions documents with model Soleil
*/ */
class pdf_soleil extends ModelePDFFicheinter class pdf_soleil extends ModelePDFFicheinter
{ {
/** /**
\brief Constructeur * \brief Constructeur
\param db Handler acces base de donnee * \param db Handler acces base de donnee
*/ */
function pdf_soleil($db=0) function pdf_soleil($db=0)
{ {
@@ -74,7 +74,7 @@ class pdf_soleil extends ModelePDFFicheinter
} }
/** /**
* \brief Fonction g<EFBFBD>n<EFBFBD>rant la fiche d'intervention sur le disque * \brief Fonction generant la fiche d'intervention sur le disque
* \param fichinter Object fichinter * \param fichinter Object fichinter
* \param outputlangs Lang output object * \param outputlangs Lang output object
* \return int 1=ok, 0=ko * \return int 1=ok, 0=ko
@@ -265,7 +265,7 @@ class pdf_soleil extends ModelePDFFicheinter
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
$tab_height = 0; $tab_height = 0;
$tab_top=$nexY; $tab_top=$nexY+3;
$pdf->line(10, $nexY, 200, $nexY); $pdf->line(10, $nexY, 200, $nexY);
$pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3. Then writeMultiCell must use 3 also. $pdf->MultiCell(0, 3, '', 0, 'J'); // Set interline to 3. Then writeMultiCell must use 3 also.
@@ -298,10 +298,10 @@ class pdf_soleil extends ModelePDFFicheinter
$i++; $i++;
} }
} }
$pdf->line(10, $tab_top+$tab_height, 200, $tab_top+$tab_height); $pdf->line(10, $tab_top+$tab_height+3, 200, $tab_top+$tab_height+3);
// Rectangle for title and all lines // Rectangle for title and all lines
$pdf->Rect(10, 100, 190, $tab_height+ ($tab_top - 100)); $pdf->Rect(10, 100, 190, $tab_top+$tab_height+3-100);
$pdf->SetXY (10, $pdf->GetY() + 20); $pdf->SetXY (10, $pdf->GetY() + 20);
$pdf->MultiCell(60, 5, '', 0, 'J', 0); $pdf->MultiCell(60, 5, '', 0, 'J', 0);

1
htdocs/langs/ca_ES/admin.lang
View File

@@ -1013,6 +1013,7 @@ DetailTitre = Etiqueta de menú
DetailMainmenu = Grup al qual pertany (obsolet) DetailMainmenu = Grup al qual pertany (obsolet)
DetailUrl = URL de la pàgina cap a la qual el menú apunta DetailUrl = URL de la pàgina cap a la qual el menú apunta
DetailLeftmenu = Condició de visualització o no (obsolet) DetailLeftmenu = Condició de visualització o no (obsolet)
DetailEnabled = Condició de mostrar o no
DetailRight = Condició de visualització completa o vidrossa DetailRight = Condició de visualització completa o vidrossa
DetailLangs = Arxiu langs per a la traducció del títol DetailLangs = Arxiu langs per a la traducció del títol
DetailUser = Intern / Extern / Tots DetailUser = Intern / Extern / Tots

4
htdocs/langs/ca_ES/mails.lang
View File

@@ -62,6 +62,10 @@ EMailTestSubstitutionReplacedByGenericValues = En mode prova, les variables de s
MailingAddFile = Adjuntar aquest arxiu MailingAddFile = Adjuntar aquest arxiu
NoAttachedFiles = Sense fitxers adjunts NoAttachedFiles = Sense fitxers adjunts
BadEMail = E-Mail incorrecte BadEMail = E-Mail incorrecte
CloneEMailing = Clonar E-Mailing
ConfirmCloneEMailing = Esteu segur de voler clonar aquest e-mailing?
CloneContent = Clonar missatge
CloneReceivers = Clonar destinataris
# Libelle des modules de liste de destinataires mailing = = # Libelle des modules de liste de destinataires mailing = =
MailingModuleDescContactCompanies = Contactes de tercers (clients potencials, clients, proveïdors ...) MailingModuleDescContactCompanies = Contactes de tercers (clients potencials, clients, proveïdors ...)
MailingModuleDescDolibarrUsers = Usuaris de Dolibarr que tenen e-mail MailingModuleDescDolibarrUsers = Usuaris de Dolibarr que tenen e-mail

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

@@ -236,6 +236,7 @@ UMaskExplanation=This parameter allow you to define permissions set by default o
SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
UseACacheDelay = Delay for caching export response in seconds (0 or empty for no cache) UseACacheDelay = Delay for caching export response in seconds (0 or empty for no cache)
DisableLinkToHelpCenter=Hide link "Need help or support" on login page DisableLinkToHelpCenter=Hide link "Need help or support" on login page
AddCRIfTooLong=There is no automatic wrapping, so if line is out of page on documents because too long, you must add yourself carriage returns in the textarea.
# Modules # Modules
Module0Name=Users & groups Module0Name=Users & groups

3
htdocs/langs/es_ES/admin.lang
View File

@@ -1,4 +1,4 @@
# Dolibarr language file - es_ES - admin # Dolibarr language file - es_ES - admin
CHARSET = UTF-8 CHARSET = UTF-8
Version = Versión Version = Versión
VersionProgram = Versión programa VersionProgram = Versión programa
@@ -1013,6 +1013,7 @@ DetailTitre = Etiqueta de menú
DetailMainmenu = Grupo al cual pertenece (obsoleto) DetailMainmenu = Grupo al cual pertenece (obsoleto)
DetailUrl = URL de la página hacia la cual el menú apunta DetailUrl = URL de la página hacia la cual el menú apunta
DetailLeftmenu = Condición de visualización o no (obsoleto) DetailLeftmenu = Condición de visualización o no (obsoleto)
DetailEnabled = Condición de mostrar o no
DetailRight = Condición de visualización completa o cristálida DetailRight = Condición de visualización completa o cristálida
DetailLangs = Archivo langs para la traducción del título DetailLangs = Archivo langs para la traducción del título
DetailUser = Interno / Externo / Todos DetailUser = Interno / Externo / Todos

4
htdocs/langs/es_ES/mails.lang
View File

@@ -62,6 +62,10 @@ EMailTestSubstitutionReplacedByGenericValues = En modo prueba, las variables de
MailingAddFile = Adjuntar este archivo MailingAddFile = Adjuntar este archivo
NoAttachedFiles = Sin ficheros adjuntos NoAttachedFiles = Sin ficheros adjuntos
BadEMail = E-Mail incorrecto BadEMail = E-Mail incorrecto
CloneEMailing = Clonar E-Mailing
ConfirmCloneEMailing = ¿ Está seguro de querer clonar este e-mailing ?
CloneContent = Clonar mensaje
CloneReceivers = Clonar destinatarios
# Libelle des modules de liste de destinataires mailing = # Libelle des modules de liste de destinataires mailing =
MailingModuleDescContactCompanies = Contactos de terceros (clientes potenciales, clientes, proveedores...) MailingModuleDescContactCompanies = Contactos de terceros (clientes potenciales, clientes, proveedores...)
MailingModuleDescDolibarrUsers = Usuarios de Dolibarr que tienen e-mail MailingModuleDescDolibarrUsers = Usuarios de Dolibarr que tienen e-mail

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

@@ -236,6 +236,7 @@ UMaskExplanation = Ce paramètre permet de définir les droits des fichiers cré
SeeWikiForAllTeam = Voir le wiki pour le détail de tous les acteurs et leur organisation SeeWikiForAllTeam = Voir le wiki pour le détail de tous les acteurs et leur organisation
UseACacheDelay = Delay de mise en cache de l'export en secondes (0 ou vide pour aucun cache) UseACacheDelay = Delay de mise en cache de l'export en secondes (0 ou vide pour aucun cache)
DisableLinkToHelpCenter=Cacher le lien "Besoin d'un support ou aide" sur la page de login DisableLinkToHelpCenter=Cacher le lien "Besoin d'un support ou aide" sur la page de login
AddCRIfTooLong=Il n'y a pas de coupures de lignes automatiques, aussi si votre texte est trop long sur les documents, il vous faut ajouter par vous-meme des retours chariots dans la zone de saisie du texte.
# Modules = undefined # Modules = undefined
Module0Name = Utilisateurs & groupes Module0Name = Utilisateurs & groupes

8
htdocs/lib/functions.lib.php
View File

@@ -900,9 +900,9 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='')
/** /**
* \brief Affiche picto propre a une notion/module (fonction g<>n<EFBFBD>rique) * \brief Show a picto according to module/object (generic function)
* \param alt Texte sur le alt de l'image * \param alt Text of alt on image
* \param object Objet pour lequel il faut afficher le logo (exemple: user, group, action, bill, contract, propal, product, ...) * \param object Objet pour lequel il faut afficher le logo (example: user, group, action, bill, contract, propal, product, ...)
* \return string Retourne tag img * \return string Retourne tag img
*/ */
function img_object($alt, $object) function img_object($alt, $object)
@@ -2590,7 +2590,7 @@ function dol_nboflines($s,$maxchar=0)
/** /**
* \brief Return nb of lines of a formated text with \n and <br> * \brief Return nb of lines of a formated text with \n and <br>
* \param texte Text * \param texte Text
* \param maxlinesize Largeur de ligne en caracteres(ou 0 si pas de limite - defaut) * \param maxlinesize Largeur de ligne en caracteres (ou 0 si pas de limite - defaut)
* \return int Number of lines * \return int Number of lines
*/ */
function dol_nboflines_bis($texte,$maxlinesize=0) function dol_nboflines_bis($texte,$maxlinesize=0)

4
htdocs/lib/pdf.lib.php
View File

@@ -157,14 +157,14 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
$pdf->SetDrawColor(224,224,224); $pdf->SetDrawColor(224,224,224);
// On positionne le debut du bas de page selon nbre de lignes de ce bas de page // On positionne le debut du bas de page selon nbre de lignes de ce bas de page
$nbofligne=dol_nboflines($ligne); $nbofligne=dol_nboflines_bis($ligne);
//print 'e'.$ligne.'t'.dol_nboflines($ligne);exit; //print 'e'.$ligne.'t'.dol_nboflines($ligne);exit;
$posy=$marge_basse + ($nbofligne*3) + ($ligne1?3:0) + ($ligne2?3:0); $posy=$marge_basse + ($nbofligne*3) + ($ligne1?3:0) + ($ligne2?3:0);
if ($ligne) // Free text if ($ligne) // Free text
{ {
$pdf->SetXY($marge_gauche,-$posy); $pdf->SetXY($marge_gauche,-$posy);
$pdf->MultiCell(190, 3, $ligne, 0, 'L', 0); $pdf->MultiCell(20000, 3, $ligne, 0, 'L', 0); // Use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
$posy-=($nbofligne*3); // 6 of ligne + 3 of MultiCell $posy-=($nbofligne*3); // 6 of ligne + 3 of MultiCell
} }

21
htdocs/main.inc.php
View File

@@ -735,9 +735,9 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
print '<link rel="alternate stylesheet" type="text/css" title="Yellow" href="'.DOL_URL_ROOT.'/theme/yellow/yellow.css">'."\n"; print '<link rel="alternate stylesheet" type="text/css" title="Yellow" href="'.DOL_URL_ROOT.'/theme/yellow/yellow.css">'."\n";
*/ */
print '<link rel="top" title="'.$langs->trans("Home").'" href="'.DOL_URL_ROOT.'/">'."\n"; if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.DOL_URL_ROOT.'">'."\n";
print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n"; if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
print '<link rel="author" title="Dolibarr Development Team" href="http://www.dolibarr.org">'."\n"; if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="http://www.dolibarr.org">'."\n";
// Output javascript links // Output javascript links
if (! $disablejs && $conf->use_javascript_ajax) if (! $disablejs && $conf->use_javascript_ajax)
@@ -853,14 +853,14 @@ function top_menu($head, $title='', $target='')
$text.=$menutop->atarget?(' target="'.$menutop->atarget.'"'):''; $text.=$menutop->atarget?(' target="'.$menutop->atarget.'"'):'';
$text.='>'; $text.='>';
$text.='<img class="login" border="0" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/logout.png"'; $text.='<img class="login" border="0" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/logout.png"';
$text.=' alt="" title=""'; $text.=' alt="'.$langs->trans("Logout").'" title=""';
$text.='>'; $text.='>';
$text.='</a>'; $text.='</a>';
} }
else else
{ {
$text.='<img class="login" border="0" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/logout.png"'; $text.='<img class="login" border="0" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/logout.png"';
$text.=' alt="" title=""'; $text.=' alt="'.$langs->trans("Logout").'" title=""';
$text.='>'; $text.='>';
} }
$htmltext.='<u>'.$langs->trans("User").'</u>'; $htmltext.='<u>'.$langs->trans("User").'</u>';
@@ -915,28 +915,28 @@ function left_menu($menu_array, $helppagename='', $moresearchform='')
{ {
$langs->load("companies"); $langs->load("companies");
$searchform.=printSearchForm(DOL_URL_ROOT.'/societe.php', DOL_URL_ROOT.'/societe.php', $searchform.=printSearchForm(DOL_URL_ROOT.'/societe.php', DOL_URL_ROOT.'/societe.php',
img_object($langs->trans("List"),'company').' '.$langs->trans("Companies"), 'soc', 'socname'); img_object('','company').' '.$langs->trans("Companies"), 'soc', 'socname');
} }
if ($conf->societe->enabled && $conf->global->MAIN_SEARCHFORM_CONTACT && $user->rights->societe->lire) if ($conf->societe->enabled && $conf->global->MAIN_SEARCHFORM_CONTACT && $user->rights->societe->lire)
{ {
$langs->load("companies"); $langs->load("companies");
$searchform.=printSearchForm(DOL_URL_ROOT.'/contact/index.php', DOL_URL_ROOT.'/contact/index.php', $searchform.=printSearchForm(DOL_URL_ROOT.'/contact/index.php', DOL_URL_ROOT.'/contact/index.php',
img_object($langs->trans("List"),'contact').' '.$langs->trans("Contacts"), 'contact', 'contactname'); img_object('','contact').' '.$langs->trans("Contacts"), 'contact', 'contactname');
} }
if (($conf->produit->enabled || $conf->service->enabled) && $conf->global->MAIN_SEARCHFORM_PRODUITSERVICE && $user->rights->produit->lire) if (($conf->produit->enabled || $conf->service->enabled) && $conf->global->MAIN_SEARCHFORM_PRODUITSERVICE && $user->rights->produit->lire)
{ {
$langs->load("products"); $langs->load("products");
$searchform.=printSearchForm(DOL_URL_ROOT.'/product/liste.php', DOL_URL_ROOT.'/product/index.php', $searchform.=printSearchForm(DOL_URL_ROOT.'/product/liste.php', DOL_URL_ROOT.'/product/index.php',
img_object($langs->trans("List"),'product').' '.$langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall'); img_object('','product').' '.$langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall');
} }
if ($conf->adherent->enabled && $conf->global->MAIN_SEARCHFORM_ADHERENT && $user->rights->adherent->lire) if ($conf->adherent->enabled && $conf->global->MAIN_SEARCHFORM_ADHERENT && $user->rights->adherent->lire)
{ {
$langs->load("members"); $langs->load("members");
$searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/liste.php', DOL_URL_ROOT.'/adherents/liste.php', $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/liste.php', DOL_URL_ROOT.'/adherents/liste.php',
img_object($langs->trans("List"),'user').' '.$langs->trans("Members"), 'member', 'sall'); img_object('','user').' '.$langs->trans("Members"), 'member', 'sall');
} }
// Define $bookmarks // Define $bookmarks
@@ -1085,11 +1085,12 @@ function left_menu($menu_array, $helppagename='', $moresearchform='')
function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch='search',$htmlinputname) function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch='search',$htmlinputname)
{ {
global $langs; global $langs;
$ret ='<form action="'.$urlaction.'" method="post">'; $ret='';
$ret.='<div class="menu_titre">'; $ret.='<div class="menu_titre">';
$ret.='<a class="vsmenu" href="'.$urlobject.'">'; $ret.='<a class="vsmenu" href="'.$urlobject.'">';
$ret.=$title.'</a><br>'; $ret.=$title.'</a><br>';
$ret.='</div>'; $ret.='</div>';
$ret.='<form action="'.$urlaction.'" method="post">';
$ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; $ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
$ret.='<input type="hidden" name="mode" value="search">'; $ret.='<input type="hidden" name="mode" value="search">';
$ret.='<input type="hidden" name="mode-search" value="'.$htmlmodesearch.'">'; $ret.='<input type="hidden" name="mode-search" value="'.$htmlmodesearch.'">';

38
htdocs/theme/bluelagoon/bluelagoon.css
View File

@@ -30,7 +30,7 @@ body {
font-family: sans-serif; font-size: 0.95em; font-family: sans-serif; font-size: 0.95em;
} }
/***** Styles par d<EFBFBD>faut *****/ /***** Styles par defaut *****/
input input
{ {
font: 12px helvetica, verdana, arial, sans-serif; font: 12px helvetica, verdana, arial, sans-serif;
@@ -107,12 +107,6 @@ div.tmenu
text-decoration: none; text-decoration: none;
} }
table.tmenu
{
padding: 0px 0px 10px 0px;
margin: 0px 0px 0px 10px;
}
a.tmenu:link a.tmenu:link
{ {
padding: 0em 1em; padding: 0em 1em;
@@ -142,18 +136,25 @@ a.tmenu:hover
} }
/* Pour menu TOP auguria uniquement */ /* Top menu */
table.tmenu
{
padding: 0px 0px 10px 0px;
margin: 0px 0px 0px 10px;
}
* html div.tmenu li a * html div.tmenu li a
{ {
width:40px; width:40px;
} }
div.tmenu ul {
ul.tmenu {
padding: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
list-style: none; list-style: none;
} }
div.tmenu li { li.tmenu {
float: left; float: left;
border-right: solid 1px #000000; border-right: solid 1px #000000;
height: 18px; height: 18px;
@@ -162,7 +163,8 @@ div.tmenu li {
margin:0; margin:0;
padding:0; padding:0;
} }
div.tmenu li a{ li.tmenu a
{
font-size: 13px; font-size: 13px;
color:#000000; color:#000000;
text-decoration:none; text-decoration:none;
@@ -173,29 +175,29 @@ div.tmenu li a{
display: block; display: block;
font-weight: normal; font-weight: normal;
} }
div.tmenu li a.tmenusel li.tmenu a.tmenusel
{ {
background:#FFFFFF; background:#FFFFFF;
color:#000000; color:#000000;
font-weight: normal; font-weight: normal;
} }
div.tmenu li a:visited li.tmenu a:visited
{ {
color:#000000; color:#000000;
font-weight: normal; font-weight: normal;
} }
div.tmenu li a:hover li.tmenu a:hover
{ {
background:#FFFFFF; background:#FFFFFF;
color:#000000; color:#000000;
font-weight: normal; font-weight: normal;
} }
div.tmenu li a:active li.tmenu a:active
{ {
color:#000000; color:#000000;
font-weight: normal; font-weight: normal;
} }
div.tmenu li a:link li.tmenu a:link
{ {
font-weight: normal; font-weight: normal;
} }
@@ -367,7 +369,7 @@ a.tab:hover {
/* /*
* Boutons actions * Boutons actions
* Nouvelle syntaxe <20> utiliser * Nouvelle syntaxe <20> utiliser
*/ */
a.butAction:link { font-weight: normal; font: verdana,arial,helvetica; font-size: 12px; background: white; border: 1px solid #8CACBB; color: #436976; padding: 0em 1em; margin: 0em 0.2em; text-decoration: none; white-space: nowrap; } a.butAction:link { font-weight: normal; font: verdana,arial,helvetica; font-size: 12px; background: white; border: 1px solid #8CACBB; color: #436976; padding: 0em 1em; margin: 0em 0.2em; text-decoration: none; white-space: nowrap; }

2
htdocs/theme/freelug/freelug.css.php
View File

@@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by

39
htdocs/theme/rodolphe/rodolphe.css
View File

@@ -30,7 +30,7 @@ body {
} }
/***** Styles par d<EFBFBD>faut *****/ /***** Styles par defaut *****/
a:link { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: none; } a:link { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: none; }
a:visited { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: none; } a:visited { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: none; }
a:active { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: none; } a:active { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: none; }
@@ -124,15 +124,6 @@ div.tmenu
text-decoration: none; text-decoration: none;
} }
.menu
{
background: #b3c5cc;
font-size: 12px;
color: #000000;
text-decoration: none;
}
a.tmenu:link a.tmenu:link
{ {
color: #234046; color: #234046;
@@ -170,12 +161,19 @@ a.tmenu:hover
} }
/* Pour menu TOP auguria uniquement */ /* Top menu */
div.tmenu ul {
table.tmenu
{
padding: 0px 0px 10px 0px;
margin: 0px 0px 0px 6px;
}
ul.tmenu {
padding: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
} }
div.tmenu li { li.tmenu {
float: left; float: left;
border-right: solid 1px #000000; border-right: solid 1px #000000;
height: 18px; height: 18px;
@@ -184,7 +182,8 @@ div.tmenu li {
margin:0; margin:0;
padding:0; padding:0;
} }
div.tmenu li a{ li.tmenu a
{
font-size: 13px; font-size: 13px;
color:#000000; color:#000000;
text-decoration:none; text-decoration:none;
@@ -195,32 +194,32 @@ div.tmenu li a{
display: block; display: block;
font-weight: normal; font-weight: normal;
} }
* html div.tmenu li a{ * html li.tmenu a{
width:40px; width:40px;
} }
div.tmenu li a.tmenusel li.tmenu a.tmenusel
{ {
background:#FFFFFF; background:#FFFFFF;
color:#000000; color:#000000;
font-weight: normal; font-weight: normal;
} }
div.tmenu li a:visited li.tmenu a:visited
{ {
color:#000000; color:#000000;
font-weight: normal; font-weight: normal;
} }
div.tmenu li a:hover li.tmenu a:hover
{ {
background:#FFFFFF; background:#FFFFFF;
color:#000000; color:#000000;
font-weight: normal; font-weight: normal;
} }
div.tmenu li a:active li.tmenu a:active
{ {
color:#000000; color:#000000;
font-weight: normal; font-weight: normal;
} }
div.tmenu li a:link li.tmenu a:link
{ {
font-weight: normal; font-weight: normal;
} }

39
htdocs/theme/yellow/yellow.css.php
View File

@@ -188,13 +188,6 @@ a.tmenudisabled:active
font-weight: normal; font-weight: normal;
} }
table.tmenu
{
padding: 0px 0px 10px 0px;
margin: 0px 0px 0px 6px;
}
a.tmenu:link a.tmenu:link
{ {
color: #234046; color: #234046;
@@ -230,16 +223,24 @@ a.tmenusel
/* Pour menu TOP auguria uniquement */ /* Top menu */
* html div.tmenu li a
table.tmenu
{
padding: 0px 0px 10px 0px;
margin: 0px 0px 0px 6px;
}
* html li.tmenu a
{ {
width:40px; width:40px;
} }
div.tmenu ul {
ul.tmenu {
padding: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
} }
div.tmenu li { li.tmenu {
float: left; float: left;
border-right: solid 1px #000000; border-right: solid 1px #000000;
height: 18px; height: 18px;
@@ -248,7 +249,7 @@ div.tmenu li {
margin:0; margin:0;
padding:0; padding:0;
} }
div.tmenu li a{ li.tmenu a{
font-size: 13px; font-size: 13px;
color:#000000; color:#000000;
text-decoration:none; text-decoration:none;
@@ -259,29 +260,29 @@ div.tmenu li a{
display: block; display: block;
font-weight: normal; font-weight: normal;
} }
div.tmenu li a.tmenusel li.tmenu a.tmenusel
{ {
background:#FFFFFF; background:#FFFFFF;
color:#000000; color:#000000;
font-weight: normal; font-weight: normal;
} }
div.tmenu li a:visited li.tmenu a:visited
{ {
color:#000000; color:#000000;
font-weight: normal; font-weight: normal;
} }
div.tmenu li a:hover li.tmenu a:hover
{ {
background:#FFFFFF; background:#FFFFFF;
color:#000000; color:#000000;
font-weight: normal; font-weight: normal;
} }
div.tmenu li a:active li.tmenu a:active
{ {
color:#000000; color:#000000;
font-weight: normal; font-weight: normal;
} }
div.tmenu li a:link li.tmenu a:link
{ {
font-weight: normal; font-weight: normal;
} }
@@ -294,7 +295,7 @@ a.login
{ {
position: absolute; position: absolute;
right: 24px; right: 24px;
top: 3px; top: 2px;
color: #234046; color: #234046;
padding: 0px 8px; padding: 0px 8px;
@@ -312,7 +313,7 @@ img.login
{ {
position: absolute; position: absolute;
right: 8px; right: 8px;
top: 3px; top: 2px;
text-decoration:none; text-decoration:none;
color:white; color:white;

13
htdocs/user/group/index.php
View File

@@ -16,15 +16,14 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** /**
\file htdocs/user/group/index.php * \file htdocs/user/group/index.php
\brief Page d'accueil de la gestion des groupes * \ingroup core
\version $Revision$ * \brief Page d'accueil de la gestion des groupes
*/ * \version $Id$
*/
require("./pre.inc.php"); require("./pre.inc.php");
@@ -73,8 +72,6 @@ if ($resql)
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$i = 0; $i = 0;
print "<br>";
$param="search_group=$search_group&amp;sall=$sall"; $param="search_group=$search_group&amp;sall=$sall";
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';

11
htdocs/user/index.php
View File

@@ -19,10 +19,11 @@
*/ */
/** /**
\file htdocs/user/index.php * \file htdocs/user/index.php
\brief Page d'accueil de la gestion des utilisateurs * \ingroup core
\version $Id$ * \brief Page d'accueil de la gestion des utilisateurs
*/ * \version $Id$
*/
require("./pre.inc.php"); require("./pre.inc.php");
@@ -77,8 +78,6 @@ if ($result)
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0; $i = 0;
print "<br>";
$param="search_user=$search_user&amp;sall=$sall"; $param="search_user=$search_user&amp;sall=$sall";
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';