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

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop

Browse Source
This commit is contained in:
Maxime Kohlhaas 2012-09-26 12:33:51 +02:00
commit e76e8c8ed4
4 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/ajax/loadinplace.php
View File

@ -60,6 +60,7 @@ if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($
if ($element == 'propal') $element = 'propale'; if ($element == 'propal') $element = 'propale';
else if ($element == 'fichinter') $element = 'ficheinter'; else if ($element == 'fichinter') $element = 'ficheinter';
else if ($element == 'product') $element = 'produit'; else if ($element == 'product') $element = 'produit';
else if ($element == 'member') $element = 'adherent';
else if ($element == 'order_supplier') { else if ($element == 'order_supplier') {
$element = 'fournisseur'; $element = 'fournisseur';
$subelement = 'commande'; $subelement = 'commande';

1
htdocs/core/ajax/saveinplace.php
View File

@ -69,6 +69,7 @@ if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($
if ($element == 'propal') $element = 'propale'; if ($element == 'propal') $element = 'propale';
else if ($element == 'fichinter') $element = 'ficheinter'; else if ($element == 'fichinter') $element = 'ficheinter';
else if ($element == 'product') $element = 'produit'; else if ($element == 'product') $element = 'produit';
else if ($element == 'member') $element = 'adherent';
else if ($element == 'order_supplier') { else if ($element == 'order_supplier') {
$element = 'fournisseur'; $element = 'fournisseur';
$subelement = 'commande'; $subelement = 'commande';

17
htdocs/core/menus/standard/eldy.lib.php
View File

@ -1382,8 +1382,13 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
$num=count($menu_array); $num=count($menu_array);
for ($i = 0; $i < $num; $i++) for ($i = 0; $i < $num; $i++)
{ {
$showmenu=true;
if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) {
$showmenu=false;
}
$alt++; $alt++;
if (empty($menu_array[$i]['level'])) if (empty($menu_array[$i]['level']) && $showmenu)
{ {
if (($alt%2==0)) if (($alt%2==0))
{ {
@ -1418,11 +1423,12 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
{ {
print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>'.$menu_array[$i]['titre'].'</a></div>'."\n"; print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>'.$menu_array[$i]['titre'].'</a></div>'."\n";
} }
else if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) else if ($showmenu)
{ {
print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n"; print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
} }
print '<div class="menu_top"></div>'."\n"; if ($showmenu)
print '<div class="menu_top"></div>'."\n";
} }
// Menu niveau > 0 // Menu niveau > 0
if ($menu_array[$i]['level'] > 0) if ($menu_array[$i]['level'] > 0)
@ -1437,7 +1443,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
if (! strstr($menu_array[$i]['titre'],'<table')) print '<br>'; if (! strstr($menu_array[$i]['titre'],'<table')) print '<br>';
print '</div>'."\n"; print '</div>'."\n";
} }
else if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) else if ($showmenu)
{ {
print '<div class="menu_contenu">'.$tabstring.'<font class="vsmenudisabled">'.$menu_array[$i]['titre'].'</font><br></div>'."\n"; print '<div class="menu_contenu">'.$tabstring.'<font class="vsmenudisabled">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
} }
@ -1446,7 +1452,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
// If next is a new block or end // If next is a new block or end
if (empty($menu_array[$i+1]['level'])) if (empty($menu_array[$i+1]['level']))
{ {
print '<div class="menu_end"></div>'."\n"; if ($showmenu)
print '<div class="menu_end"></div>'."\n";
print "</div>\n"; print "</div>\n";
} }
} }

9
htdocs/user/class/user.class.php
View File

@ -512,7 +512,7 @@ class User extends CommonObject
$sql.= " FROM ".MAIN_DB_PREFIX."user_rights as ur"; $sql.= " FROM ".MAIN_DB_PREFIX."user_rights as ur";
$sql.= ", ".MAIN_DB_PREFIX."rights_def as r"; $sql.= ", ".MAIN_DB_PREFIX."rights_def as r";
$sql.= " WHERE r.id = ur.fk_id"; $sql.= " WHERE r.id = ur.fk_id";
$sql.= " AND r.entity IN (0,".(!empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")"; $sql.= " AND r.entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")";
$sql.= " AND ur.fk_user= ".$this->id; $sql.= " AND ur.fk_user= ".$this->id;
$sql.= " AND r.perms IS NOT NULL"; $sql.= " AND r.perms IS NOT NULL";
if ($moduletag) $sql.= " AND r.module = '".$this->db->escape($moduletag)."'"; if ($moduletag) $sql.= " AND r.module = '".$this->db->escape($moduletag)."'";
@ -557,11 +557,14 @@ class User extends CommonObject
$sql.= " ".MAIN_DB_PREFIX."usergroup_user as gu,"; $sql.= " ".MAIN_DB_PREFIX."usergroup_user as gu,";
$sql.= " ".MAIN_DB_PREFIX."rights_def as r"; $sql.= " ".MAIN_DB_PREFIX."rights_def as r";
$sql.= " WHERE r.id = gr.fk_id"; $sql.= " WHERE r.id = gr.fk_id";
if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) {
$sql.= " AND gu.entity IN (0,".$conf->entity.")";
} else {
$sql.= " AND r.entity = ".$conf->entity;
}
$sql.= " AND gr.fk_usergroup = gu.fk_usergroup"; $sql.= " AND gr.fk_usergroup = gu.fk_usergroup";
$sql.= " AND gu.fk_user = ".$this->id; $sql.= " AND gu.fk_user = ".$this->id;
$sql.= " AND r.perms IS NOT NULL"; $sql.= " AND r.perms IS NOT NULL";
$sql.= " AND r.entity = ".$conf->entity;
$sql.= " AND gu.entity IN (0,".$conf->entity.")";
if ($moduletag) $sql.= " AND r.module = '".$this->db->escape($moduletag)."'"; if ($moduletag) $sql.= " AND r.module = '".$this->db->escape($moduletag)."'";
dol_syslog(get_class($this).'::getrights sql='.$sql, LOG_DEBUG); dol_syslog(get_class($this).'::getrights sql='.$sql, LOG_DEBUG);