diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index 4540e030f95..0bc98cbcfe2 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -449,7 +449,9 @@ class MenuLeft { if ($conf->deplacement->enabled) { $langs->load("trips"); - $newmenu->add(DOL_URL_ROOT."/compta/deplacement/index.php?leftmenu=deplacement&mainmenu=accountancy", $langs->trans("Trips"), 0, $user->rights->deplacement->lire); + $newmenu->add(DOL_URL_ROOT."/compta/deplacement/index.php?leftmenu=tripsandexpenses&mainmenu=accountancy", $langs->trans("TripsAndExpenses"), 0, $user->rights->deplacement->lire); + if ($leftmenu=="tripsandexpenses") $newmenu->add(DOL_URL_ROOT."/compta/deplacement/fiche.php?action=create&leftmenu=tripsandexpenses&mainmenu=accountancy", $langs->trans("New"), 1, $user->rights->deplacement->lire); + if ($leftmenu=="tripsandexpenses") $newmenu->add(DOL_URL_ROOT."/compta/deplacement/index.php?leftmenu=tripsandexpenses&mainmenu=accountancy", $langs->trans("List"), 1, $user->rights->deplacement->lire); } // Charges sociales if ($conf->tax->enabled) diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index eb60ad06302..d37b01985d9 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -442,6 +442,7 @@ class MenuLeft { if ($conf->deplacement->enabled) { $langs->load("trips"); + $newmenu->add(DOL_URL_ROOT."/compta/deplacement/fiche.php?action=create&leftmenu=deplacement&mainmenu=accountancy", $langs->trans("NewTripsAndFees"), 0, $user->rights->deplacement->lire); $newmenu->add(DOL_URL_ROOT."/compta/deplacement/index.php?leftmenu=deplacement&mainmenu=accountancy", $langs->trans("Trips"), 0, $user->rights->deplacement->lire); } @@ -711,12 +712,12 @@ class MenuLeft { $newmenu->add_submenu(DOL_URL_ROOT."/exports/export.php?leftmenu=export",$langs->trans("NewExport"),1, $user->rights->export->creer); } - if ($conf->domain->enabled) + if ($conf->global->MAIN_MODULE_DOMAIN) { $langs->load("domains"); - $newmenu->add_submenu(DOL_URL_ROOT."/domain/index.php?leftmenu=export",$langs->trans("Domains"),0, $user->rights->domain->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/domain/index.php?leftmenu=export",$langs->trans("DomainNames"),0, $user->rights->domain->read); $newmenu->add_submenu(DOL_URL_ROOT."/domain/fiche.php?action=create&leftmenu=export",$langs->trans("NewDomain"),1, $user->rights->domain->create); - $newmenu->add_submenu(DOL_URL_ROOT."/domain/index.php?leftmenu=export",$langs->trans("List"),0, $user->rights->domain->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/domain/index.php?leftmenu=export",$langs->trans("List"),1, $user->rights->domain->read); } } diff --git a/htdocs/includes/modules/modDeplacement.class.php b/htdocs/includes/modules/modDeplacement.class.php index 746982e9f89..2d507c30836 100644 --- a/htdocs/includes/modules/modDeplacement.class.php +++ b/htdocs/includes/modules/modDeplacement.class.php @@ -50,16 +50,16 @@ class modDeplacement extends DolibarrModules $this->id = 'deplacement'; // Same value xxx than in file modXxx.class.php file $this->numero = 75 ; - $this->family = "crm"; - $this->name = "Déplacement"; // Si traduction Module75Name non trouvée - $this->description = "Gestion des déplacements"; // Si traduction Module75Desc non trouvée + $this->family = "financial"; + $this->name = "Déplacement et frais"; // Si traduction Module75Name non trouvée + $this->description = "Gestion des notes de frais et déplacements"; // Si traduction Module75Desc non trouvée $this->revision = explode(' ','$Revision$'); $this->version = $this->revision[1]; $this->const_name = 'MAIN_MODULE_DEPLACEMENT'; $this->special = 0; - $this->picto = "trip"; + $this->picto = "generic"; // Dir $this->dirs = array(); diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index f6cf501cd81..f5fe7205e2d 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -185,8 +185,8 @@ Module59Name=Bookmark4u Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account Module70Name=Interventions Module70Desc=Interventions' management -Module75Name=Trips -Module75Desc=Trips' management +Module75Name=Expenses and trips notes +Module75Desc=Expenses and trips notes' management Module80Name=Sendings Module80Desc=Sendings and delivery orders' management Module85Name=Banks and cash diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang index 1a5eca20bd0..a2eb56a2244 100644 --- a/htdocs/langs/en_US/trips.lang +++ b/htdocs/langs/en_US/trips.lang @@ -1,6 +1,7 @@ # Dolibarr language file - en_US - trips Trip=Trip Trips=Trips +TripsAndExpenses=Trips and expenses TripCard=Trip card AddTrip=Add trip ListOfTrips=List of trips diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index b1e42a00dff..b9b8bba9eb3 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -185,8 +185,8 @@ Module59Name=Bookmark4u Module59Desc=Ajoute fonction pour générer un compte Bookmark4u depuis un compte Dolibarr Module70Name=Interventions Module70Desc=Gestion des interventions -Module75Name=Déplacements -Module75Desc=Gestion des déplacements +Module75Name=Notes de frais et déplacements +Module75Desc=Gestion des notes de frais et déplacements Module80Name=Expéditions Module80Desc=Gestion des expéditions et réceptions client Module85Name=Banques et caisses diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang index 92ca7ad8a23..08868b490c5 100644 --- a/htdocs/langs/fr_FR/trips.lang +++ b/htdocs/langs/fr_FR/trips.lang @@ -1,6 +1,7 @@ # Dolibarr language file - fr_FR - trips Trip=Déplacement Trips=Déplacements +TripsAndExpenses=Déplacements et frais TripCard=Fiche déplacement AddTrip=Ajouter déplacement ListOfTrips=Liste des déplacements @@ -8,4 +9,4 @@ NewTrip=Nouveau d CompanyVisited=Société/Institution visitée Kilometers=Kilomètres DeleteTrip=Supprimer déplacement -ConfirmDeleteTrip=Êtes vous sur de vouloir supprimer ce déplacement ? \ No newline at end of file +ConfirmDeleteTrip=Êtes vous sur de vouloir supprimer ce déplacement ?