diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index 5bdeefeba03..79a43e43887 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.lib.php @@ -21,7 +21,7 @@ /** * \file htdocs/includes/menus/standard/eldy.lib.php * \brief Library for file eldy menus - * \version $Id: eldy.lib.php,v 1.52 2011/06/29 17:55:33 eldy Exp $ + * \version $Id: eldy.lib.php,v 1.53 2011/06/29 22:41:49 eldy Exp $ */ @@ -468,6 +468,7 @@ function print_eldy_menu($db,$atarget,$type_user) } $url.="idmenu=".$newTabMenu[$i]['rowid']; } + $url=preg_replace('/__LOGIN__/',$user->login,$url); // Define the class (top menu selected or not) if (! empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname='class="tmenusel"'; diff --git a/htdocs/includes/modules/modCashDesk.class.php b/htdocs/includes/modules/modCashDesk.class.php index 8ba82085c8a..57667425bde 100644 --- a/htdocs/includes/modules/modCashDesk.class.php +++ b/htdocs/includes/modules/modCashDesk.class.php @@ -19,7 +19,7 @@ /** * \defgroup pos Module points of sale * \brief Module to manage points of sale - * \version $Id$ + * \version $Id: modCashDesk.class.php,v 1.25 2011/06/29 22:41:49 eldy Exp $ */ /** @@ -55,7 +55,7 @@ class modCashDesk extends DolibarrModules $this->name = preg_replace('/^mod/i','',get_class($this)); $this->description = "CashDesk module"; - $this->revision = explode(' ','$Revision$'); + $this->revision = explode(' ','$Revision: 1.25 $'); $this->version = 'dolibarr'; $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); @@ -97,7 +97,7 @@ class modCashDesk extends DolibarrModules 'titre'=>'CashDeskMenu', 'mainmenu'=>'cashdesk', 'leftmenu'=>'1', // Use 1 if you also want to add left menu entries using this descriptor. Use 0 if left menu entries are defined in a file pre.inc.php (old school). - 'url'=>'/cashdesk/index.php', + 'url'=>'/cashdesk/index.php?user=__LOGIN__', 'langs'=>'cashdesk', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. 'position'=>100, 'enabled'=>'$conf->cashdesk->enabled',