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:
Laurent Destailleur 2012-05-07 17:07:13 +02:00
commit c904e3e4b3
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/fr_FR/main.lang
View File

@ -603,7 +603,7 @@ Before=Avant
After=Après After=Après
IPAddress=Adresse IP IPAddress=Adresse IP
Frequency=Fréquence Frequency=Fréquence
IM=Messagerie instantannée IM=Messagerie instantanée
NewAttribute=Nouvel attribut NewAttribute=Nouvel attribut
AttributeCode=Code de l'attribut AttributeCode=Code de l'attribut
OptionalFieldsSetup=Configuration des attributs complémentaires OptionalFieldsSetup=Configuration des attributs complémentaires

19
htdocs/main.inc.php
View File

@ -777,13 +777,15 @@ if (! function_exists("llxHeader"))
* @param string $morequerystring Query string to add to the link "print" to get same parameters (use only if autodetect fails) * @param string $morequerystring Query string to add to the link "print" to get same parameters (use only if autodetect fails)
* @return void * @return void
*/ */
function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='') function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='')
{ {
top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring); top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring);
left_menu('', $help_url, '', '', 1, $title); if (empty($conf->global->MAIN_HIDE_LEFT_MENU)) {
main_area($title); left_menu('', $help_url, '', '', 1, $title);
} }
main_area($title);
}
} }
@ -1172,11 +1174,10 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
/* /*
* Top menu * Top menu
*/ */
$top_menu=empty($conf->browser->phone)?$conf->top_menu:$conf->smart_menu; $top_menu=empty($conf->browser->phone)?$conf->top_menu:$conf->smart_menu;
if (GETPOST('menu')) $top_menu=GETPOST('menu'); // menu=eldy_backoffice.php if (GETPOST('menu')) $top_menu=GETPOST('menu'); // menu=eldy_backoffice.php
// Load the top menu manager
// Load the top menu manager (only if not already done) // Load the top menu manager (only if not already done)
if (! class_exists('MenuTop')) if (! class_exists('MenuTop'))
{ {

2
htdocs/user/perms.php
View File

@ -46,7 +46,7 @@ if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
{ {
$canreaduser=($user->admin || ($user->rights->user->user->lire && $user->rights->user->user_advance->readperms)); $canreaduser=($user->admin || ($user->rights->user->user->lire && $user->rights->user->user_advance->readperms));
$caneditselfperms=($user->id == $id && $user->rights->user->self_advance->writeperms); $caneditselfperms=($user->id == $id && $user->rights->user->self_advance->writeperms);
$caneditperms = (($caneditperms || $caneditselfperms) ? 0 : 1); $caneditperms = (($caneditperms || $caneditselfperms) ? 1 : 0);
} }
// Security check // Security check