From bad13bf194322b481b5f8f370f152bc1919f31c4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 8 Apr 2008 18:13:43 +0000 Subject: [PATCH] New: Module agenda go on calendar view by default --- htdocs/admin/agenda.php | 2 +- htdocs/admin/events.php | 3 ++- htdocs/comm/action/pre.inc.php | 20 +++++++-------- htdocs/comm/action/rapport/pre.inc.php | 25 ++++++++++--------- .../menus/barre_left/eldy_backoffice.php | 20 +++++++-------- .../menus/barre_left/eldy_frontoffice.php | 20 +++++++-------- htdocs/includes/modules/modAgenda.class.php | 2 +- htdocs/langs/en_US/admin.lang | 15 ++++++----- htdocs/langs/en_US/agenda.lang | 9 ++++--- htdocs/langs/fr_FR/admin.lang | 17 ++++++------- htdocs/langs/fr_FR/agenda.lang | 13 +++++----- htdocs/langs/fr_FR/commercial.lang | 6 ++--- 12 files changed, 77 insertions(+), 75 deletions(-) diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php index c96af2a8bf3..ba0298151fc 100644 --- a/htdocs/admin/agenda.php +++ b/htdocs/admin/agenda.php @@ -103,7 +103,7 @@ print ''; $var=true; print ""; print ""; -print ""; +print ""; print "\n"; foreach ($eventstolog as $key => $arr) { diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php index cac11b53ca7..42d5ee4fa86 100644 --- a/htdocs/admin/events.php +++ b/htdocs/admin/events.php @@ -49,7 +49,7 @@ $eventstolog=array( array('id'=>'GROUP_CREATE', 'test'=>1), array('id'=>'GROUP_MODIFY', 'test'=>1), array('id'=>'GROUP_DELETE', 'test'=>1), - array('id'=>'ACTION_CREATE', 'test'=>$conf->societe->enabled), +/* array('id'=>'ACTION_CREATE', 'test'=>$conf->societe->enabled), array('id'=>'COMPANY_CREATE', 'test'=>$conf->societe->enabled), array('id'=>'CONTRACT_VALIDATE', 'test'=>$conf->contrat->enabled), array('id'=>'PROPAL_VALIDATE', 'test'=>$conf->propal->enabled), @@ -70,6 +70,7 @@ $eventstolog=array( array('id'=>'MEMBER_MODIFY', 'test'=>$conf->adherent->enabled), array('id'=>'MEMBER_RESILIATE', 'test'=>$conf->adherent->enabled), array('id'=>'MEMBER_DELETE', 'test'=>$conf->adherent->enabled), +*/ ); diff --git a/htdocs/comm/action/pre.inc.php b/htdocs/comm/action/pre.inc.php index fbf7086a193..f1b8e4c1de6 100644 --- a/htdocs/comm/action/pre.inc.php +++ b/htdocs/comm/action/pre.inc.php @@ -41,8 +41,17 @@ function llxHeader($head = "", $urlp = "") $langs->load("agenda"); // Actions - $menu->add_submenu(DOL_URL_ROOT."/comm/action/indexactions.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read); $menu->add_submenu(DOL_URL_ROOT."/comm/action/fiche.php?mainmenu=agenda&leftmenu=agenda&action=create", $langs->trans("NewAction"), 1, $user->rights->agenda->myactions->read); + // Calendar + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Calendar"), 1, $user->rights->agenda->myactions->read); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read); + if ($user->rights->agenda->allactions->read) + { + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); + } // List $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("List"), 1, $user->rights->agenda->myactions->read); $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); @@ -52,15 +61,6 @@ function llxHeader($head = "", $urlp = "") $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); } - // Calendar - $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Calendar"), 1, $user->rights->agenda->allactions->read); - $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); - $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read); - if ($user->rights->agenda->allactions->read) - { - $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); - $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); - } // Reports $menu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Reportings"), 1, $user->rights->agenda->myactions->read); } diff --git a/htdocs/comm/action/rapport/pre.inc.php b/htdocs/comm/action/rapport/pre.inc.php index 3ee4c023d8b..937ab596918 100644 --- a/htdocs/comm/action/rapport/pre.inc.php +++ b/htdocs/comm/action/rapport/pre.inc.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005 Laurent Destailleur + * Copyright (C) 2005-2008 Laurent Destailleur * * 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 @@ -24,7 +24,8 @@ */ require("../../../main.inc.php"); -require("./rapport.pdf.php"); +require_once(DOL_DOCUMENT_ROOT."/comm/action/rapport/rapport.pdf.php"); + function llxHeader($head = "", $urlp = "") { @@ -41,8 +42,17 @@ function llxHeader($head = "", $urlp = "") $langs->load("agenda"); // Actions - $menu->add_submenu(DOL_URL_ROOT."/comm/action/indexactions.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read); $menu->add_submenu(DOL_URL_ROOT."/comm/action/fiche.php?mainmenu=agenda&leftmenu=agenda&action=create", $langs->trans("NewAction"), 1, $user->rights->agenda->myactions->read); + // Calendar + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Calendar"), 1, $user->rights->agenda->myactions->read); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read); + if ($user->rights->agenda->allactions->read) + { + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); + $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); + } // List $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("List"), 1, $user->rights->agenda->myactions->read); $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); @@ -52,15 +62,6 @@ function llxHeader($head = "", $urlp = "") $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); $menu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); } - // Calendar - $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Calendar"), 1, $user->rights->agenda->allactions->read); - $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); - $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read); - if ($user->rights->agenda->allactions->read) - { - $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); - $menu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); - } // Reports $menu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Reportings"), 1, $user->rights->agenda->myactions->read); } diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index cc76387030f..550e9bb0347 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -717,8 +717,17 @@ class MenuLeft { $langs->load("agenda"); // Actions - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/indexactions.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read); + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read); $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/fiche.php?mainmenu=agenda&leftmenu=agenda&action=create", $langs->trans("NewAction"), 1, $user->rights->agenda->myactions->read); + // Calendar + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Calendar"), 1, $user->rights->agenda->myactions->read); + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read); + if ($user->rights->agenda->allactions->read) + { + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); + } // List $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("List"), 1, $user->rights->agenda->myactions->read); $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); @@ -728,15 +737,6 @@ class MenuLeft { $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); } - // Calendar - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Calendar"), 1, $user->rights->agenda->allactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read); - if ($user->rights->agenda->allactions->read) - { - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); - } // Reports $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Reportings"), 1, $user->rights->agenda->myactions->read); } diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index 49c99b37247..510ae6e9196 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -688,8 +688,17 @@ class MenuLeft { $langs->load("agenda"); // Actions - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/indexactions.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read); + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read); $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/fiche.php?mainmenu=agenda&leftmenu=agenda&action=create", $langs->trans("NewAction"), 1, $user->rights->agenda->myactions->read); + // Calendar + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Calendar"), 1, $user->rights->agenda->myactions->read); + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read); + if ($user->rights->agenda->allactions->read) + { + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); + $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); + } // List $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("List"), 1, $user->rights->agenda->myactions->read); $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); @@ -699,15 +708,6 @@ class MenuLeft { $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); } - // Calendar - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Calendar"), 1, $user->rights->agenda->allactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read); - if ($user->rights->agenda->allactions->read) - { - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read); - } // Reports $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php?mainmenu=agenda&leftmenu=agenda", $langs->trans("Reportings"), 1, $user->rights->agenda->myactions->read); } diff --git a/htdocs/includes/modules/modAgenda.class.php b/htdocs/includes/modules/modAgenda.class.php index fd64bdc2776..dfaa5432876 100644 --- a/htdocs/includes/modules/modAgenda.class.php +++ b/htdocs/includes/modules/modAgenda.class.php @@ -134,7 +134,7 @@ class modAgenda extends DolibarrModules //------ $r=0; - $this->menu[$r]=array('fk_menu'=>0,'type'=>'top','titre'=>'Agenda','mainmenu'=>'agenda','leftmenu'=>'agenda','url'=>'/comm/action/indexactions.php','langs'=>'commercial','position'=>100,'perms'=>'$user->rights->agenda->myactions->read','target'=>'','user'=>0); + $this->menu[$r]=array('fk_menu'=>0,'type'=>'top','titre'=>'Agenda','mainmenu'=>'agenda','leftmenu'=>'agenda','url'=>'/comm/action/index.php','langs'=>'commercial','position'=>100,'perms'=>'$user->rights->agenda->myactions->read','target'=>'','user'=>0); $r++; // Exports diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 7956ed75656..f443182558d 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -403,11 +403,10 @@ Permission1101=Read delivery orders Permission1102=Create/modify delivery orders Permission1104=Validate delivery orders Permission1109=Delete delivery orders -Permission2401=Read actions/tasks linked to his account -Permission2402=Create/modify/delete actions/tasks linked to his account -Permission2403=Read actions/tasks of others -Permission2405=Create/modify/delete actions/tasks of others -Permission2410=Read Dolibarr audit events +Permission2401=Read actions (events or tasks) linked to his account +Permission2402=Create/modify/delete actions (events or tasks) linked to his account +Permission2403=Read actions (events or tasks) of others +Permission2405=Create/modify/delete actions (events or tasks) of others DictionnaryCompanyType=Company types DictionnaryCompanyJuridicalType=Juridical kinds of company DictionnaryProspectLevel=Prospect potential level @@ -525,11 +524,11 @@ SetupDescription2=The 2 most important setup steps are the 2 first ones in the l SetupDescription3=Company/fundation setup is required because input information is used on Dolibarr displays and to modify Dolibarr behaviour (for example for features related to your country). SetupDescription4=Modules setup is required because Dolibarr is not a simple ERP/CRM but a sum of several modules, all more or less independant. It's only after activating modules you're interesting in that you will see features appeared in Dolibarr menu. EventsSetup=Setup for events logs -LogEvents=Events +LogEvents=Security audit events Audit=Audit ListEvents=Audit events ListOfEvents=List of events -LogEventDesc=You can enable here log for some common events in the Dolibarr events table. Administrators can then see its content via menu System tools - Audit. Warning, this feature can consume a large amount of datas in database. +LogEventDesc=You can enable here log for Dolibarr security events. Administrators can then see its content via menu System tools - Audit. Warning, this feature can consume a large amount of datas in database. AreaForAdminOnly=Those features can be used by administrator users only. Administrator features and help are identified in Dolibarr by the following picto: SystemInfoDesc=System information is miscellanous technical information you get in read only mode and visible for administrators only. SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit. @@ -891,5 +890,5 @@ OptionVATDebitOption=Option services sur debit OptionVatDefaultDesc=L'exigibilité de la TVA est:
- sur livraison pour les biens
- sur paiement pour les services OptionVatDebitOptionDesc=L'exigibilité de la TVA est:
- sur livraison pour les biens
- sur facturation (débit) pour les services ##### Agenda ##### -AgendaSetup=Actions/Tasks and agenda module setup +AgendaSetup=Actions and agenda module setup PasswordTogetVCalExport=Key to authorize vcal export link diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index 65c7bd07017..8683a511d9d 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -1,6 +1,6 @@ # Dolibarr language file - en_US - agenda -Actions=Actions/Tasks -ActionsArea=Actions/Tasks area +Actions=Actions +ActionsArea=Actions area (Events and tasks) Agenda=Agenda Agendas=Agendas Calendar=Calendar @@ -23,5 +23,6 @@ ViewList=View list ViewCal=View calendar ViewWithPredefinedFilters=View with predefined filters AutoActions=Automatic creation of actions -AgendaAutoActionDesc=Define here, actions for which you want Dolibarr to creat automatically an action in agenda. If nothing is checked (by default), only manual actions will be included in agenda. -AgendaSetupOtherDesc=This page allows to configure other parameters. \ No newline at end of file +AgendaAutoActionDesc=Define here events for which you want Dolibarr to create automatically an action in agenda. If nothing is checked (by default), only manual actions will be included in agenda. +AgendaSetupOtherDesc=This page allows to configure other parameters. +ActionsEvents=Events for which create an action \ No newline at end of file diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 69e2d58fbad..8af9c981920 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -276,7 +276,7 @@ Module2200Desc=Gestion du droit de pr Module2300Name=Menus Module2300Desc=Administration des menus par base de données Module2400Name=Agenda -Module2400Desc=Gestion des actions/taches et de l'agenda +Module2400Desc=Gestion des actions (évènements et taches) et de l'agenda Module2500Name=Gestion Electronique de Document Module2500Desc=Permet de stocker et administrer une base de documents Permission11=Consulter les factures @@ -402,11 +402,10 @@ Permission1101=Consulter les bons de livraison Permission1102=Créer/modifier les bons de livraison Permission1104=Valider les bons de livraison Permission1109=Supprimer les bons de livraison -Permission2401=Lire les actions/taches liees a son compte -Permission2402=Creer/modifier/supprimer les actions/taches liees a son compte -Permission2403=Lire les actions/taches des autres -Permission2405=Creer/modifier/supprimer les actions/taches pour les autres -Permission2410=Voir l'audit des évenements Dolibarr +Permission2401=Lire les actions (évènements ou tâches) liées à son compte +Permission2402=Creer/modifier/supprimer les actions (évènements ou tâches) liées à son compte +Permission2403=Lire les actions (évènements ou tâches) des autres +Permission2405=Creer/modifier/supprimer les actions (évènements ou tâches) pour les autres DictionnaryCompanyType=Types de sociétés DictionnaryCompanyJuridicalType=Formes juridiques DictionnaryProspectLevel=Niveau de potentiel des prospects @@ -524,11 +523,11 @@ SetupDescription2=Les 2 SetupDescription3=La configuration Société/institution à gérer est requise car les informations saisies sont utilisées dans la plupart des écrans, en affichage, ou pour modifier le comportement de Dolibarr (comme par exemple des fonctions qui dépendent de votre pays). SetupDescription4=La configuration Modules est indispensable car Dolibarr n'est pas un ERP/CRM monolithique mais un ensemble de modules tous plus ou moins indépendant. C'est après avoir activé les modules qui vous intéressent que vous verrez apparaitre les fonctionnalités dans les menus de Dolibarr. EventsSetup=Configuration du traçage des évenements -LogEvents=Evènements +LogEvents=Evènements d'audit de sécurité Audit=Audit ListEvents=Audit évènements ListOfEvents=Liste des évènements -LogEventDesc=Vous pouvez activer ici, le traçage de l'historique des evènements dans la table des evènements Dolibarr. Cet historique est consultable aux administrateurs dans le menu Outils systèmes - Audit. Attention, cette fonctionnalité peut consommer un gros volume de données. +LogEventDesc=Vous pouvez activer ici, le traçage de l'historique des evènements d'audit de sécurité. Cet historique est consultable aux administrateurs dans le menu Outils systèmes - Audit. Attention, cette fonctionnalité peut consommer un gros volume de données. AreaForAdminOnly=Ces fonctions ne sont accessibles qu'à un utilisateur administrateur. La fonction d'administrateur et les aides pour les administrateurs sont identifiées dans Dolibarr par le picto suivant: SystemInfoDesc=Les informations systèmes sont des informations techniques diverses accessibles en lecture seule aux administrateurs uniquement. SystemAreaForAdminOnly=Cet espace n'est accessible qu'aux utilisateurs de type administrateurs. Aucune permission Dolibarr ne permet d'étendre le cercle des utilisateurs autorisés à cet espace. @@ -896,6 +895,6 @@ OptionVATDebitOption=Option services sur debit OptionVatDefaultDesc=L'exigibilité de la TVA est:
- sur livraison pour les biens
- sur paiement pour les services OptionVatDebitOptionDesc=L'exigibilité de la TVA est:
- sur livraison pour les biens
- sur facturation (débit) pour les services ##### Agenda ##### -AgendaSetup=Configuration du module actions/taches et agenda +AgendaSetup=Configuration du module actions et agenda PasswordTogetVCalExport=Clé pour autoriser export vcal diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang index 98795281b97..6d0501dab2b 100644 --- a/htdocs/langs/fr_FR/agenda.lang +++ b/htdocs/langs/fr_FR/agenda.lang @@ -1,6 +1,6 @@ # Dolibarr language file - fr_FR - agenda -Actions=Actions/Taches -ActionsArea=Espace actions/taches +Actions=Actions +ActionsArea=Espace actions (évènement et tâches) Agenda=Agenda Agendas=Agendas Calendar=Calendrier @@ -17,11 +17,12 @@ ListOfEvents=Liste des ActionsAskedBy=Actions enregistrées par ActionsToDoBy=Actions affectées à ActionsDoneBy=Actions réalisées par -AllMyActions=Toutes mes actions/taches -AllActions=Toutes les actions/taches +AllMyActions=Toutes mes actions +AllActions=Toutes les actions ViewList=Voir liste ViewCal=Voir calendrier ViewWithPredefinedFilters=Vues avec filtres prédéfinis AutoActions=Création automatiques des actions -AgendaAutoActionDesc=Définissez dans cet onglet, les actions pour lesquels dolibarr créera automatiquement une tache dans l'agenda. Si aucune case n'est cochée (par défaut), seules les actions manuelles seront incluses dans l'agenda. -AgendaSetupOtherDesc=Cette page permet de configurer les autres paramètres. \ No newline at end of file +AgendaAutoActionDesc=Définissez dans cet onglet les évènements pour lesquels dolibarr créera automatiquement une action dans l'agenda. Si aucune case n'est cochée (par défaut), seules les actions manuelles seront incluses dans l'agenda. +AgendaSetupOtherDesc=Cette page permet de configurer les autres paramètres. +ActionsEvents=Evènements pour lesquels creer une action \ No newline at end of file diff --git a/htdocs/langs/fr_FR/commercial.lang b/htdocs/langs/fr_FR/commercial.lang index 1baa107bbfd..c7a4a3edeb8 100644 --- a/htdocs/langs/fr_FR/commercial.lang +++ b/htdocs/langs/fr_FR/commercial.lang @@ -8,9 +8,9 @@ Customers=Clients Prospect=Prospect Prospects=Prospects DeleteAction=Effacer une action/tache -NewAction=Nouvelle action/tache -AddAction=Créer action/tache -AddAnAction=Créer une action/tache +NewAction=Nouvelle action +AddAction=Créer action +AddAnAction=Créer une action AddActionRendezVous=Créer un Rendez-Vous ConfirmDeleteAction=Êtes-vous sûr de vouloir effacer cet action ? CardAction=Fiche action
".$langs->trans("LogEvents")."".$langs->trans("ActionsEvents")."