diff --git a/htdocs/includes/modules/modDeplacement.class.php b/htdocs/includes/modules/modDeplacement.class.php index a0875f025cc..d86621f9890 100644 --- a/htdocs/includes/modules/modDeplacement.class.php +++ b/htdocs/includes/modules/modDeplacement.class.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -82,19 +82,19 @@ class modDeplacement extends DolibarrModules $this->rights = array(); $this->rights_class = 'deplacement'; - $this->rights[1][0] = 170; + $this->rights[1][0] = 171; $this->rights[1][1] = 'Lire les deplacements'; $this->rights[1][2] = 'r'; $this->rights[1][3] = 1; $this->rights[1][4] = 'lire'; - $this->rights[2][0] = 171; + $this->rights[2][0] = 172; $this->rights[2][1] = 'Creer/modifier les deplacements'; $this->rights[2][2] = 'w'; $this->rights[2][3] = 0; $this->rights[2][4] = 'creer'; - $this->rights[3][0] = 172; + $this->rights[3][0] = 173; $this->rights[3][1] = 'Supprimer les deplacements'; $this->rights[3][2] = 'd'; $this->rights[3][3] = 0; diff --git a/htdocs/includes/modules/modDon.class.php b/htdocs/includes/modules/modDon.class.php index 625a4bba944..90da04b51a3 100644 --- a/htdocs/includes/modules/modDon.class.php +++ b/htdocs/includes/modules/modDon.class.php @@ -88,19 +88,19 @@ class modDon extends DolibarrModules $this->rights = array(); $this->rights_class = 'don'; - $this->rights[1][0] = 700; + $this->rights[1][0] = 701; $this->rights[1][1] = 'Lire les dons'; $this->rights[1][2] = 'r'; $this->rights[1][3] = 1; $this->rights[1][4] = 'lire'; - $this->rights[2][0] = 701; + $this->rights[2][0] = 702; $this->rights[2][1] = 'Creer/modifier les dons'; $this->rights[2][2] = 'w'; $this->rights[2][3] = 0; $this->rights[2][4] = 'creer'; - $this->rights[3][0] = 702; + $this->rights[3][0] = 703; $this->rights[3][1] = 'Supprimer les dons'; $this->rights[3][2] = 'd'; $this->rights[3][3] = 0; diff --git a/htdocs/includes/modules/modECM.class.php b/htdocs/includes/modules/modECM.class.php index a0cfaa4f312..951856cb234 100644 --- a/htdocs/includes/modules/modECM.class.php +++ b/htdocs/includes/modules/modECM.class.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2010 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 @@ -94,14 +94,14 @@ class modECM extends DolibarrModules $this->rights = array(); // Permission array used by this module $r++; - $this->rights[$r][0] = 2500; + $this->rights[$r][0] = 2501; $this->rights[$r][1] = 'Consulter les documents'; $this->rights[$r][2] = 'r'; $this->rights[$r][3] = 1; $this->rights[$r][4] = 'download'; $r++; - $this->rights[$r][0] = 2501; + $this->rights[$r][0] = 2502; $this->rights[$r][1] = 'Soumettre ou supprimer des documents'; $this->rights[$r][2] = 'w'; $this->rights[$r][3] = 1; diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 5db6ad06d3e..4d58fe78fff 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -301,6 +301,9 @@ if (GETPOST('action') && preg_match('/upgrade/i',GETPOST("action"))) { //print $langs->trans("AlreadyDone"); + // Reload modules + migrate_reload_modules($db,$langs,$conf); + // Reload menus migrate_reload_menu($db,$langs,$conf,$versionto); } @@ -3234,6 +3237,32 @@ function migrate_reload_modules($db,$langs,$conf) //$mod->remove('noboxes'); $mod->init(); } + + if (! empty($conf->global->MAIN_MODULE_DEPLACEMENT)) // Permission has changed into 3.0 + { + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Deplacement"); + require_once(DOL_DOCUMENT_ROOT.'/includes/modules/modDeplacement.class.php'); + $mod=new modDeplacement($db); + //$mod->remove('noboxes'); // We need to remove because a permission id has been removed + $mod->init(); + } + if (! empty($conf->global->MAIN_MODULE_DON)) // Permission has changed into 3.0 + { + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Don"); + require_once(DOL_DOCUMENT_ROOT.'/includes/modules/modDon.class.php'); + $mod=new modDon($db); + //$mod->remove('noboxes'); // We need to remove because a permission id has been removed + $mod->init(); + } + if (! empty($conf->global->MAIN_MODULE_ECM)) // Permission has changed into 3.0 + { + dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module ECM"); + require_once(DOL_DOCUMENT_ROOT.'/includes/modules/modECM.class.php'); + $mod=new modECM($db); + //$mod->remove('noboxes'); // We need to remove because a permission id has been removed + $mod->init(); + } + } diff --git a/htdocs/langs/ar_AR/admin.lang b/htdocs/langs/ar_AR/admin.lang index d660b98b0d0..d61bb901732 100644 --- a/htdocs/langs/ar_AR/admin.lang +++ b/htdocs/langs/ar_AR/admin.lang @@ -420,9 +420,9 @@ Permission162=إنشاء / تغيير العقود Permission163=تفعيل خدمة للعقد Permission164=تعطيل خدمة للعقد Permission165=حذف العقود -Permission170=قراءة رحلات -Permission171=إنشاء / تغيير الرحلات -Permission172=حذف رحلات +Permission171=قراءة رحلات +Permission172=إنشاء / تغيير الرحلات +Permission173=حذف رحلات Permission178=رحلات التصدير Permission180=قراءة الموردين Permission181=قراءة مورد أوامر @@ -494,9 +494,9 @@ Permission531=قراءة الخدمات Permission532=إنشاء / تعديل الخدمات Permission534=حذف خدمات Permission538=تصدير الخدمات -Permission700=قراءة التبرعات -Permission701=إنشاء / تعديل والهبات -Permission702=حذف التبرعات +Permission701=قراءة التبرعات +Permission702=إنشاء / تعديل والهبات +Permission703=حذف التبرعات Permission1001=قراءة مخزونات Permission1002=إنشاء / تغيير المخزونات Permission1003=حذف الأرصدة @@ -528,8 +528,8 @@ Permission2401=قراءة الأعمال (أو أحداث المهام) مرتب Permission2402=إنشاء / تعديل أو حذف الإجراءات (الأحداث أو المهام) مرتبطة حسابه Permission2403=قراءة الأعمال (أو أحداث المهام) آخرين Permission2405=إنشاء / تعديل أو حذف الإجراءات (الأحداث أو المهام) آخرين -Permission2500=قراءة وثائق -Permission2501=تقديم وثائق أو حذف +Permission2501=قراءة وثائق +Permission2502=تقديم وثائق أو حذف Permission2515=إعداد وثائق وأدلة DictionnaryCompanyType=أنواع الشركة DictionnaryCompanyJuridicalType=أنواع القانوني للشركة diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index 08eaa6c9943..ec9979b723a 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -473,9 +473,9 @@ Permission162=Crear/modificar contractes de servei Permission163=Activar els serveis d'un contracte Permission164=Desactivar els serveis d'un contracte Permission165=Eliminar contractes -Permission170=Llegir els desplaçaments -Permission171=Crear/modificar els desplaçaments -Permission172=Eliminar desplaçaments +Permission171=Llegir els desplaçaments +Permission172=Crear/modificar els desplaçaments +Permission173=Eliminar desplaçaments Permission178=Exportar desplaçaments Permission180=Consultar proveïdors Permission181=Consultar comandes a proveïdors @@ -548,9 +548,9 @@ Permission532=Crear/modificar serveis Permission534=Eliminar serveis Permission536=Veure / gestionar els serveis ocults Permission538=Exportar serveis -Permission700=Consultar subvencions -Permission701=Crear/modificar subvencions -Permission702=Eliminar subvencions +Permission701=Consultar subvencions +Permission702=Crear/modificar subvencions +Permission703=Eliminar subvencions Permission1001=Consultar stocks Permission1002=Crear/modificar stocks Permission1003=Eliminar stocks @@ -590,8 +590,8 @@ Permission2403=Modificar accions (esdeveniments o tasques) vinculades al seu com Permission2411=Eliminar accions (esdeveniments o tasques) d'altres Permission2412=Crear/eliminar accions (esdeveniments o tasques) d'altres Permission2413=Canviar accions (esdeveniments o tasques) d'altres -Permission2500=Consultar documents -Permission2501=Enviar o eliminar documents +Permission2501=Consultar documents +Permission2502=Enviar o eliminar documents Permission2515=Configuració carpetes de documents Permission8555=Ús del mòdul Permission8556=Establir llocs ecommerce diff --git a/htdocs/langs/da_DA/admin.lang b/htdocs/langs/da_DA/admin.lang index 0bc4b69fcf9..21fb48d49d7 100644 --- a/htdocs/langs/da_DA/admin.lang +++ b/htdocs/langs/da_DA/admin.lang @@ -428,9 +428,9 @@ Permission401=Læs rabatter Permission402=Opret / ændre rabatter Permission403=Valider rabatter Permission404=Slet rabatter -Permission700=Læs donationer -Permission701=Opret / ændre donationer -Permission702=Slet donationer +Permission701=Læs donationer +Permission702=Opret / ændre donationer +Permission703=Slet donationer Permission1001=Læs bestande Permission1002=Opret / ændre bestande Permission1003=Slet bestande @@ -460,8 +460,8 @@ Permission2401=Læs aktioner (begivenheder eller opgaver) i tilknytning til hans Permission2402=Opret / ændre / slette handlinger (begivenheder eller opgaver) i tilknytning til hans konto Permission2403=Læs aktioner (begivenheder eller opgaver) af andre Permission2405=Opret / ændre / slette handlinger (begivenheder eller opgaver) af andre -Permission2500=Læse dokumenter -Permission2501=Indsend eller slette dokumenter +Permission2501=Læse dokumenter +Permission2502=Indsend eller slette dokumenter Permission2515=Setup dokumenter abonnentfortegnelser DictionnaryCompanyType=Company typer DictionnaryCompanyJuridicalType=Juridiske former for virksomhed @@ -989,9 +989,9 @@ Permission67=Eksporter interventioner Permission94=Eksporter sociale bidrag Permission146=Læs udbydere Permission147=Læs statistikinterval -Permission170=Læs ture -Permission171=Opret / ændre ture -Permission172=Slet ture +Permission171=Læs ture +Permission172=Opret / ændre ture +Permission173=Slet ture Permission178=Eksporter ture Permission192=Opret linjer Permission193=Annuller poster diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang index bb7e1d1eef0..9d34798d791 100644 --- a/htdocs/langs/de_DE/admin.lang +++ b/htdocs/langs/de_DE/admin.lang @@ -425,9 +425,9 @@ Permission401=Lesen Sie Rabatte Permission402=Anlegen / ändern Rabatte Permission403=Validate Rabatte Permission404=Löschen Rabatte -Permission700=Lesen Spenden -Permission701=Anlegen / ändern Spenden -Permission702=Löschen Spenden +Permission701=Lesen Spenden +Permission702=Anlegen / ändern Spenden +Permission703=Löschen Spenden Permission1001=Weitere Bestände Permission1002=Anlegen / ändern Bestände Permission1003=Löschen Bestände @@ -457,8 +457,8 @@ Permission2401=Lesen Sie Aktionen (Ereignisse oder Aufgaben) in Verbindung mit s Permission2402=Anlegen / Ändern / Löschen Aktionen (Ereignisse oder Aufgaben) in Verbindung mit seinem Konto Permission2403=Lesen Sie Aktionen (Ereignisse oder Aufgaben) von anderen Permission2405=Anlegen / Ändern / Löschen Aktionen (Ereignisse oder Aufgaben) von anderen -Permission2500=Dokumente lesen -Permission2501=Senden oder Löschen von Dokumenten +Permission2501=Dokumente lesen +Permission2502=Senden oder Löschen von Dokumenten Permission2515=Setup-Dokumente Verzeichnisse DictionnaryCompanyType=Unternehmen Arten DictionnaryCompanyJuridicalType=Juristische Arten von Unternehmen @@ -986,9 +986,9 @@ Permission67=Export Interventionen Permission94=Export Sozialabgaben Permission146=Weitere Anbieter Permission147=Lesen Sie stats -Permission170=Lesen Reisen -Permission171=Anlegen / ändern Reisen -Permission172=Löschen Reisen +Permission171=Lesen Reisen +Permission172=Anlegen / ändern Reisen +Permission173=Löschen Reisen Permission178=Export Reisen Permission192=Erstellen Linien Permission193=Abbrechen Linien diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index edcb505744c..5c8dcbe4344 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -472,9 +472,9 @@ Permission162=Create/modify contracts Permission163=Activate a service of a contract Permission164=Disable a service of a contract Permission165=Delete contracts -Permission170=Read trips -Permission171=Create/modify trips -Permission172=Delete trips +Permission171=Read trips +Permission172=Create/modify trips +Permission173=Delete trips Permission178=Export trips Permission180=Read suppliers Permission181=Read supplier orders @@ -547,9 +547,9 @@ Permission532=Create/modify services Permission534=Delete services Permission536=See/manage hidden services Permission538=Export services -Permission700=Read donations -Permission701=Create/modify donations -Permission702=Delete donations +Permission701=Read donations +Permission702=Create/modify donations +Permission703=Delete donations Permission1001=Read stocks Permission1002=Create/modify stocks Permission1003=Delete stocks @@ -583,8 +583,8 @@ Permission2403=Delete actions (events or tasks) linked to his account Permission2411=Read actions (events or tasks) of others Permission2412=Create/modify actions (events or tasks) of others Permission2413=Delete actions (events or tasks) of others -Permission2500=Read documents -Permission2501=Submit or delete documents +Permission2501=Read documents +Permission2502=Submit or delete documents Permission2515=Setup documents directories DictionnaryCompanyType=Company types DictionnaryCompanyJuridicalType=Juridical kinds of company diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang index 2989af90585..f9de2b6e6e7 100755 --- a/htdocs/langs/es_AR/admin.lang +++ b/htdocs/langs/es_AR/admin.lang @@ -473,9 +473,9 @@ Permission162=Crear/modificar contratos de servicio Permission163=Activar los servicios de un contrato Permission164=Desactivar los servicios de un contrato Permission165=Eliminar contratos -Permission170=Leer los desplazamientos -Permission171=Crear/modificar los desplazamientos -Permission172=Eliminar desplazamientos +Permission171=Leer los desplazamientos +Permission172=Crear/modificar los desplazamientos +Permission173=Eliminar desplazamientos Permission178=Exportar desplazamientos Permission180=Consultar proveedores Permission181=Consultar pedidos a proveedores @@ -548,9 +548,9 @@ Permission532=Crear/modificar servicios Permission534=Eliminar servicios Permission536=Ver/gestionar los servicios ocultos Permission538=Exportar servicios -Permission700=Consultar subvenciones -Permission701=Crear/modificar subvenciones -Permission702=Eliminar subvenciones +Permission701=Consultar subvenciones +Permission702=Crear/modificar subvenciones +Permission703=Eliminar subvenciones Permission1001=Consultar stocks Permission1002=Crear/modificar stocks Permission1003=Eliminar stocks @@ -590,8 +590,8 @@ Permission2403=Modificar acciones (eventos o tareas) vinculadas a su cuenta Permission2411=Leer acciones (eventos o tareas) de otros Permission2412=Crear/modificar acciones (eventos o tareas) de otros Permission2413=Eliminar acciones (eventos o tareas) de otros -Permission2500=Consultar documentos -Permission2501=Enviar o eliminar documentos +Permission2501=Consultar documentos +Permission2502=Enviar o eliminar documentos Permission2515=Configuración directorios de documentos Permission8555=Uso del módulo Permission8556=Establecer sitios e-commerce diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 896156a0eca..e8ef53c25d9 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -473,9 +473,9 @@ Permission162=Crear/modificar contratos de servicio Permission163=Activar los servicios de un contrato Permission164=Desactivar los servicios de un contrato Permission165=Eliminar contratos -Permission170=Leer los desplazamientos -Permission171=Crear/modificar los desplazamientos -Permission172=Eliminar desplazamientos +Permission171=Leer los desplazamientos +Permission172=Crear/modificar los desplazamientos +Permission173=Eliminar desplazamientos Permission178=Exportar desplazamientos Permission180=Consultar proveedores Permission181=Consultar pedidos a proveedores @@ -548,9 +548,9 @@ Permission532=Crear/modificar servicios Permission534=Eliminar servicios Permission536=Ver/gestionar los servicios ocultos Permission538=Exportar servicios -Permission700=Consultar subvenciones -Permission701=Crear/modificar subvenciones -Permission702=Eliminar subvenciones +Permission701=Consultar subvenciones +Permission702=Crear/modificar subvenciones +Permission703=Eliminar subvenciones Permission1001=Consultar stocks Permission1002=Crear/modificar stocks Permission1003=Eliminar stocks @@ -590,8 +590,8 @@ Permission2403=Modificar acciones (eventos o tareas) vinculadas a su cuenta Permission2411=Leer acciones (eventos o tareas) de otros Permission2412=Crear/modificar acciones (eventos o tareas) de otros Permission2413=Eliminar acciones (eventos o tareas) de otros -Permission2500=Consultar documentos -Permission2501=Enviar o eliminar documentos +Permission2501=Consultar documentos +Permission2502=Enviar o eliminar documentos Permission2515=Configuración directorios de documentos Permission8555=Uso del módulo Permission8556=Establecer sitios e-commerce diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang index 6badd256bd1..d5d4a72a74c 100644 --- a/htdocs/langs/fi_FI/admin.lang +++ b/htdocs/langs/fi_FI/admin.lang @@ -426,9 +426,9 @@ Permission401=Lue alennukset Permission402=Luoda / muuttaa alennukset Permission403=Validate alennukset Permission404=Poista alennukset -Permission700=Lue lahjoitukset -Permission701=Luoda / muuttaa lahjoitusten -Permission702=Poista lahjoitukset +Permission701=Lue lahjoitukset +Permission702=Luoda / muuttaa lahjoitusten +Permission703=Poista lahjoitukset Permission1001=Lue varastot Permission1002=Luoda / muuttaa varastot Permission1003=Poista varastot @@ -458,8 +458,8 @@ Permission2401=Lue toimet (tapahtumat tai tehtävät) liittyy hänen tilinsä Permission2402=Luoda / muuttaa / poistaa toimet (tapahtumat tai tehtävät) liittyy hänen tilinsä Permission2403=Lue toimet (tapahtumat tai tehtävät) muiden Permission2405=Luoda / muuttaa / poistaa toimet (tapahtumat tai tehtävät) muiden -Permission2500=Lue asiakirjat -Permission2501=Lähetä tai poistaa asiakirjoja +Permission2501=Lue asiakirjat +Permission2502=Lähetä tai poistaa asiakirjoja Permission2515=Setup asiakirjat hakemistoja DictionnaryCompanyType=Yritys tyypit DictionnaryCompanyJuridicalType=Mustan erilaisia yrityksen @@ -984,9 +984,9 @@ Permission67=Vienti interventioiden Permission94=Vienti sosiaaliturvamaksut Permission146=Lue tarjoajien Permission147=Lue stats -Permission170=Lue matkat -Permission171=Luoda / muuttaa matkat -Permission172=Poista matkoja +Permission171=Lue matkat +Permission172=Luoda / muuttaa matkat +Permission173=Poista matkoja Permission178=Vienti matkat Permission192=Luo linjat Permission193=Peruuta linjat diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index ab01018d5df..1e08230873b 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -474,9 +474,9 @@ Permission162= Créer/modifier les contrats de services Permission163= Activer les services d'un contrat Permission164= Désactiver les services d'un contrat Permission165= Supprimer les contrats -Permission170= Lire les déplacements -Permission171= Créer/modifier les déplacements -Permission172= Supprimer les déplacements +Permission171= Lire les déplacements +Permission172= Créer/modifier les déplacements +Permission173= Supprimer les déplacements Permission178= Exporter les déplacements Permission180= Consulter les fournisseurs Permission181= Consulter les commandes fournisseurs @@ -549,9 +549,9 @@ Permission532= Créer/modifier les services Permission534= Supprimer les services Permission536= Voir/gérer les services cachés Permission538= Exporter les services -Permission700= Consulter les dons -Permission701= Créer/modifier les dons -Permission702= Supprimer les dons +Permission701= Consulter les dons +Permission702= Créer/modifier les dons +Permission703= Supprimer les dons Permission1001= Consulter les stocks Permission1002= Créer/Modifier les stocks Permission1003= Supprimer les stocks @@ -591,8 +591,8 @@ Permission2403= Supprimer les actions (événements ou tâches) liées à son co Permission2411= Lire les actions (événements ou tâches) des autres Permission2412= Créer/modifier les actions (événements ou tâches) pour les autres Permission2413= Supprimer les actions (événements ou tâches) pour les autres -Permission2500= Consulter les documents -Permission2501= Soumettre ou supprimer des documents +Permission2501= Consulter les documents +Permission2502= Soumettre ou supprimer des documents Permission2515= Administrer les rubriques de documents Permission8555= Utilisation du module Permission8556= Définir les sites ecommerce diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang index 6e795a8d096..4297d32c57f 100644 --- a/htdocs/langs/is_IS/admin.lang +++ b/htdocs/langs/is_IS/admin.lang @@ -465,9 +465,9 @@ Permission162=Búa til / breyta samningar Permission163=Virkja þjónustu samnings Permission164=Óvirka þjónustu samning Permission165=Eyða samninga -Permission170=Lesa ferðir -Permission171=Búa til / breyta ferðir -Permission172=Eyða ferðir +Permission171=Lesa ferðir +Permission172=Búa til / breyta ferðir +Permission173=Eyða ferðir Permission178=Útflutningur ferðir Permission180=Lesa birgja Permission181=Lesa birgir pantanir @@ -539,9 +539,9 @@ Permission531=Lesa þjónusta Permission532=Búa til / breyta þjónusta Permission534=Eyða þjónustu Permission538=Útflutningur þjónustu -Permission700=Lesa Fjárframlög -Permission701=Búa til / breyta framlög -Permission702=Eyða Fjárframlög +Permission701=Lesa Fjárframlög +Permission702=Búa til / breyta framlög +Permission703=Eyða Fjárframlög Permission1001=Lesa fiskistofna Permission1002=Búa til / breyta birgðum Permission1003=Eyða fiskistofna @@ -575,8 +575,8 @@ Permission2403=Eyða aðgerða (atburðum eða verkefni) tengd reikningnum hans Permission2411=Lesa aðgerða (atburðum eða verkefni) annarra Permission2412=Búa til / breyta aðgerðum (atburðum eða verkefni) annarra Permission2413=Eyða aðgerða (atburðum eða verkefni) annarra -Permission2500=Lesa skjal -Permission2501=Sendu inn eða eyða gögnum +Permission2501=Lesa skjal +Permission2502=Sendu inn eða eyða gögnum Permission2515=Skipulag skjöl framkvæmdarstjóra DictionnaryCompanyType=Fyrirtæki tegundir DictionnaryCompanyJuridicalType=Lögpersóna konar fyrirtæki diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang index e445b470528..0db9a8cda9b 100644 --- a/htdocs/langs/it_IT/admin.lang +++ b/htdocs/langs/it_IT/admin.lang @@ -417,9 +417,9 @@ Permission531 =Leggere servizi Permission532 =Creare/modificare i servizi Permission534 =Eliminare i servizi Permission538 =Esportare i servizi -Permission700 =Leggere le donazioni -Permission701 =Creare/modificare le donazioni -Permission702 =Eliminare le donazioni +Permission701 =Leggere le donazioni +Permission702 =Creare/modificare le donazioni +Permission703 =Eliminare le donazioni Permission1001 =Leggere le scorte Permission1002 =Creare/modificare le scorte Permission1003 =Eliminare le scorte @@ -452,8 +452,8 @@ Permission2403 =Cancellare azioni (eventi o attività) personali Permission2411 =Leggere le azioni (eventi o attività) di altri Permission2412 =Creare/modificare le azioni (eventi o attività) di altri Permission2413 =Cancellare le azioni (eventi o attività) di altri -Permission2500 =Leggere documenti -Permission2501 =Caricare o cancellare documenti +Permission2501 =Leggere documenti +Permission2502 =Caricare o cancellare documenti Permission2515 =Impostare Directory documenti DictionnaryCompanyType =Tipi di società DictionnaryCompanyJuridicalType =Forme giuridiche di impresa @@ -1071,9 +1071,9 @@ Permission67=Esportare interventi Permission94=Esportare contributi sociali Permission146=Leggere i fornitori Permission147=Leggere statistiche -Permission170=Leggere le trasferte -Permission171=Creare/modificare le trasferte -Permission172=Eliminare le trasferte +Permission171=Leggere le trasferte +Permission172=Creare/modificare le trasferte +Permission173=Eliminare le trasferte Permission178=Esportare le trasferte Permission192=Creare di linee Permission193=Cancellare linee diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang index bd7e467cf6c..629e5ba713d 100644 --- a/htdocs/langs/nb_NO/admin.lang +++ b/htdocs/langs/nb_NO/admin.lang @@ -423,9 +423,9 @@ Permission31=Vise tjenester Permission32=Lage/endre tjenester Permission34=Slette tjenester Permission38=Eksportere tjenester -Permission700=Vise donasjoner -Permission701=Lage/endre donasjoner -Permission702=Slette donasjoner +Permission701=Vise donasjoner +Permission702=Lage/endre donasjoner +Permission703=Slette donasjoner Permission1001=Vise beholdning Permission1002=Lage/endre beholdninger Permission1003=Slette beholdninger @@ -455,8 +455,8 @@ Permission2401=Vise handlinger (hendelser og oppgaver) lenket til egen brukerkon Permission2402=Lage/endre/slette handlinger (hendelser og oppgaver) lenket til egen brukerkonto Permission2403=Vise andre personers handlinger (hendelser og oppgaver) Permission2405=Lage/endre/slette andre personers handlinger (hendelser og oppgaver) -Permission2500=Vise dokumenter -Permission2501=Laste opp og slette dokumenter +Permission2501=Vise dokumenter +Permission2502=Laste opp og slette dokumenter Permission2515=Behandle og endre dokumentmappene DictionnaryCompanyType=Bedriftstyper DictionnaryCompanyJuridicalType=Selskapsform @@ -1067,9 +1067,9 @@ Permission142=Opprett / endre oppgaver Permission144=Slett oppgaver Permission146=Les tilbydere Permission147=Les statistikk -Permission170=Les turer -Permission171=Opprett / endre turer -Permission172=Slett turer +Permission171=Les turer +Permission172=Opprett / endre turer +Permission173=Slett turer Permission178=Eksporter turer Permission192=Lag linjer Permission193=Avbryt linjer diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang index a08d7ca72b7..a5df08de70c 100644 --- a/htdocs/langs/nl_BE/admin.lang +++ b/htdocs/langs/nl_BE/admin.lang @@ -427,9 +427,9 @@ Permission401=Lees kortingen Permission402=Maken / wijzigen kortingen Permission403=Valideer kortingen Permission404=Verwijderen kortingen -Permission700=Lees donaties -Permission701=Maken / wijzigen donaties -Permission702=Verwijderen donaties +Permission701=Lees donaties +Permission702=Maken / wijzigen donaties +Permission703=Verwijderen donaties Permission1001=Lees voorraden Permission1002=Maken / wijzigen voorraden Permission1003=Verwijderen bestanden @@ -459,8 +459,8 @@ Permission2401=Lees acties (gebeurtenissen of taken) in verband met zijn account Permission2402= Permission2403=Lees acties (gebeurtenissen of taken) van anderen Permission2405=Maken / wijzigen / verwijderen acties (gebeurtenissen of taken) van anderen -Permission2500=Lees documenten -Permission2501=Toevoegen of verwijderen van documenten +Permission2501=Lees documenten +Permission2502=Toevoegen of verwijderen van documenten Permission2515=Setup documenten directories DictionnaryCompanyJuridicalType=Rechtsvorm van de onderneming DictionnaryProspectLevel=Potentiëel niveau van potentiële klant/vooruitzicht diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index 402f1a00640..30135aab625 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -457,9 +457,9 @@ Permission162=Maken/wijzigen opdrachten Permission163=Activeren van een dienst van een contract Permission164=Uitschakelen van een service van een contract Permission165=Verwijderen contracten -Permission170=Bekijk verplaatsingen -Permission171=Maken/bewerken verplaatsingen -Permission172=Verwijderen verplaatsingen +Permission171=Bekijk verplaatsingen +Permission172=Maken/bewerken verplaatsingen +Permission173=Verwijderen verplaatsingen Permission178=Exporteereer verplaatsingen Permission180=Bekijk leveranciers Permission181=Bekijk leverancier bestellingen @@ -531,9 +531,9 @@ Permission531=Lees services Permission532=Maak/wijzig services Permission534=Delete services Permission538=Exporteer services -Permission700=Bekijk donaties -Permission701=Maken/wijzigen donaties -Permission702=Verwijderen donaties +Permission701=Bekijk donaties +Permission702=Maken/wijzigen donaties +Permission703=Verwijderen donaties Permission1001=Bekijk voorraden Permission1002=Maken/wijzigen voorraden Permission1003=Verwijderen voorraden @@ -567,8 +567,8 @@ Permission2403=Bekijk acties (gebeurtenissen of taken) van anderen Permission2411=Lees akties (events of taken) van anderen Permission2412=Maak/delete akties (events of taken) van anderen Permission2413=Wijzig akties (events of taken) van anderen -Permission2500=Lees documenten -Permission2501=Dien in of verwijder documenten +Permission2501=Lees documenten +Permission2502=Dien in of verwijder documenten Permission2515=Setup documenten abonneelijsten DictionnaryCompanyType=Bedrijfs-soorten DictionnaryCompanyJuridicalType=Juridische aard van de onderneming diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang index 68f937c846a..dc4c392f49d 100644 --- a/htdocs/langs/pl_PL/admin.lang +++ b/htdocs/langs/pl_PL/admin.lang @@ -427,9 +427,9 @@ Permission401=Czytaj zniżki Permission402=Tworzenie / modyfikować rabaty Permission403=Sprawdź rabaty Permission404=Usuń zniżki -Permission700=Czytaj darowizn -Permission701=Tworzenie / zmodyfikować darowizn -Permission702=Usuń darowizn +Permission701=Czytaj darowizn +Permission702=Tworzenie / zmodyfikować darowizn +Permission703=Usuń darowizn Permission1001=Czytaj zapasów Permission1002=Tworzenie / zmodyfikować zapasów Permission1003=Usuń zapasów @@ -459,8 +459,8 @@ Permission2401=Czytaj działań (zdarzeń lub zadań) związane z jego konta Permission2402=Tworzenie / modyfikować / usuwać działań (zdarzeń lub zadań) związane z jego konta Permission2403=Czytaj działań (zdarzeń lub zadań) innych Permission2405=Tworzenie / modyfikować / usuwać działań (zdarzeń lub zadań) innych -Permission2500=Przeczytaj dokumenty -Permission2501=Prześlij dokumenty lub usunąć +Permission2501=Przeczytaj dokumenty +Permission2502=Prześlij dokumenty lub usunąć Permission2515=Instalator dokumenty katalogów DictionnaryCompanyType=Firma typy DictionnaryCompanyJuridicalType=Juridical rodzajów spółek @@ -989,9 +989,9 @@ Permission67=Eksport interwencji Permission94=Eksport składek na ubezpieczenia społeczne Permission146=Czytaj dostawców Permission147=Czytaj statystyki -Permission170=Czytaj wycieczki -Permission171=Tworzenie / zmodyfikować wycieczki -Permission172=Usuń wycieczki +Permission171=Czytaj wycieczki +Permission172=Tworzenie / zmodyfikować wycieczki +Permission173=Usuń wycieczki Permission178=Eksport wycieczki Permission192=Tworzenie linii Permission193=Zrezygnuj linie diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index 717954361d0..82d3957358f 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -399,9 +399,9 @@ Permission162=Criar/Modificar contratos de serviço Permission163=Ativar os serviços de um contrato Permission164=Desativar os serviços de um contrato Permission165=Eliminar contratos -Permission170=Ler Deslocamento -Permission171=Criar/Modificar Deslocamento -Permission172=Eliminar Deslocamento +Permission171=Ler Deslocamento +Permission172=Criar/Modificar Deslocamento +Permission173=Eliminar Deslocamento Permission178=Exportar Deslocamento Permission180=Consultar Fornecedores Permission181=Consultar pedidos a Fornecedores @@ -469,9 +469,9 @@ Permission401=Consultar ativos Permission402=Criar/Modificar ativos Permission403=Confirmar ativos Permission404=Eliminar ativos -Permission700=Consultar Bolsas -Permission701=Criar/Modificar Bolsas -Permission702=Eliminar Bolsas +Permission701=Consultar Bolsas +Permission702=Criar/Modificar Bolsas +Permission703=Eliminar Bolsas Permission1001=Consultar estoques Permission1002=Criar/Modificar estoques Permission1003=Eliminar estoques @@ -502,8 +502,8 @@ Permission2401=Ler ações (eventos ou tarefas) vinculadas na sua conta Permission2402=Criar/Modificar/Eliminar ações (eventos ou tarefas) vinculadas na sua conta Permission2403=Consultar ações (acontecimientos ou tarefas) de outros Permission2405=Criar/Modificar/Eliminar ações (eventos ou tarefas) de outros -Permission2500=Consultar documentos -Permission2501=Enviar ou eliminar documentos +Permission2501=Consultar documentos +Permission2502=Enviar ou eliminar documentos Permission2515=Configuração de diretorios de documentos DictionnaryCompanyType=Tipos de empresa DictionnaryCompanyJuridicalType=Formas jurídicas diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang index 66dc2fd0818..5f2900a2b25 100644 --- a/htdocs/langs/pt_PT/admin.lang +++ b/htdocs/langs/pt_PT/admin.lang @@ -395,9 +395,9 @@ Permission162=Criar/Modificar contratos de serviço Permission163=Activar os serviços de um contrato Permission164=Desactivar os serviços de um contrato Permission165=Eliminar contratos -Permission170=Ler Deslocamento -Permission171=Criar/Modificar Deslocamento -Permission172=Eliminar Deslocamento +Permission171=Ler Deslocamento +Permission172=Criar/Modificar Deslocamento +Permission173=Eliminar Deslocamento Permission178=Exportar Deslocamento Permission180=Consultar Fornecedores Permission181=Consultar pedidos a Fornecedores @@ -465,9 +465,9 @@ Permission401=Consultar activos Permission402=Criar/Modificar activos Permission403=Confirmar activos Permission404=Eliminar activos -Permission700=Consultar Bolsas -Permission701=Criar/Modificar Bolsas -Permission702=Eliminar Bolsas +Permission701=Consultar Bolsas +Permission702=Criar/Modificar Bolsas +Permission703=Eliminar Bolsas Permission1001=Consultar stocks Permission1002=Criar/Modificar stocks Permission1003=Eliminar stocks @@ -498,8 +498,8 @@ Permission2401=Ler acções (eventos ou tarefas) vinculadas na sua conta Permission2402=Criar/Modificar/Eliminar acções (eventos ou tarefas) vinculadas na sua conta Permission2403=Consultar acções (acontecimientos ou tarefas) de outros Permission2405=Criar/Modificar/Eliminar acções (eventos ou tarefas) de outros -Permission2500=Consultar documentos -Permission2501=Enviar ou eliminar documentos +Permission2501=Consultar documentos +Permission2502=Enviar ou eliminar documentos Permission2515=Configuração de directorios de documentos DictionnaryCompanyType=Tipos de empresa DictionnaryCompanyJuridicalType=Formas jurídicas diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang index bf5e83d2c28..42959d5301c 100644 --- a/htdocs/langs/ro_RO/admin.lang +++ b/htdocs/langs/ro_RO/admin.lang @@ -426,9 +426,9 @@ Permission401=Citiţi cu reduceri Permission402=Creare / Modificare reduceri Permission403=Validate reduceri Permission404=Ştergere reduceri -Permission700=Citiţi cu donaţii -Permission701=Creare / Modificare donaţii -Permission702=Ştergere donaţii +Permission701=Citiţi cu donaţii +Permission702=Creare / Modificare donaţii +Permission703=Ştergere donaţii Permission1001=Citeşte stocuri Permission1002=Creare / Modificare stocuri Permission1003=Ştergere stocuri @@ -458,8 +458,8 @@ Permission2401=Citeşte acţiuni (evenimente sau sarcini) legate de acest cont Permission2402=Crea / modifica / delete acţiuni (evenimente sau sarcini) legate de acest cont Permission2403=Citeşte acţiuni (evenimente sau sarcini) de alţii Permission2405=Crea / modifica / delete acţiuni (evenimente sau sarcini) de alţii -Permission2500=Citeşte documente -Permission2501=Trimiteti sau şterge documente +Permission2501=Citeşte documente +Permission2502=Trimiteti sau şterge documente Permission2515=Setup documente directoare DictionnaryCompanyType=Compania tipurile DictionnaryCompanyJuridicalType=Juridica tipuri de companie @@ -988,9 +988,9 @@ Permission67=Export intervenţii Permission94=Export contribuţiilor sociale Permission146=Citiţi cu furnizorii Permission147=Citeşte stats -Permission170=Citeşte excursii -Permission171=Creare / Modificare excursii -Permission172=Ştergere excursii +Permission171=Citeşte excursii +Permission172=Creare / Modificare excursii +Permission173=Ştergere excursii Permission178=Export excursii Permission192=Creaţi linii Permission193=Anulare linii diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang index 6c225e6086d..114251d9fd5 100644 --- a/htdocs/langs/ru_RU/admin.lang +++ b/htdocs/langs/ru_RU/admin.lang @@ -425,9 +425,9 @@ Permission401=Читать скидки Permission402=Создать / изменить скидки Permission403=Проверить скидку Permission404=Удалить скидки -Permission700=Читать пожертвований -Permission701=Создать / изменить пожертвований -Permission702=Удалить пожертвований +Permission701=Читать пожертвований +Permission702=Создать / изменить пожертвований +Permission703=Удалить пожертвований Permission1001=Читать запасов Permission1002=Создание / изменение запасов Permission1003=Удалить запасов @@ -457,8 +457,8 @@ Permission2401=Читать действия (события или задачи Permission2402=Создать / изменить / удалить действия (события или задачи), связанные с его счета Permission2403=Читать мероприятия (задачи, события или) других Permission2405=Создать / изменить / удалить мероприятия (задачи, события или) других -Permission2500=Читайте документы -Permission2501=Добавить или удалить документы +Permission2501=Читайте документы +Permission2502=Добавить или удалить документы Permission2515=Настройка документов, справочников DictionnaryCompanyType=Компания типов DictionnaryCompanyJuridicalType=Юридическая рода компании @@ -987,9 +987,9 @@ Permission67=Экспорт мероприятий Permission94=Экспорт социальных взносов Permission146=Читать провайдеров Permission147=Читайте статистику -Permission170=Читать поездок -Permission171=Создать / изменить экскурсии -Permission172=Удалить поездок +Permission171=Читать поездок +Permission172=Создать / изменить экскурсии +Permission173=Удалить поездок Permission178=Экспорт поездок Permission192=Создание линий Permission193=Отмена строки diff --git a/htdocs/langs/sl_SL/admin.lang b/htdocs/langs/sl_SL/admin.lang index 51836331e29..6a236cbbb59 100644 --- a/htdocs/langs/sl_SL/admin.lang +++ b/htdocs/langs/sl_SL/admin.lang @@ -464,9 +464,9 @@ Permission162=Kreiranje/spreminjanje pogodb Permission163=Aktiviranje pogodbene storitve Permission164=Onemogočenje pogodbene storitve Permission165=Brisanje pogodb -Permission170=Branje potnih nalogov -Permission171=Kreiranje/spreminjanje potnih nalogov -Permission172=Brisanje potnih nalogov +Permission171=Branje potnih nalogov +Permission172=Kreiranje/spreminjanje potnih nalogov +Permission173=Brisanje potnih nalogov Permission178=Izvoz potnih nalogov Permission180=Branje dobaviteljev Permission181=Branje naročil pri dobaviteljih @@ -539,9 +539,9 @@ Permission532=Kreiranje/spreminjanje storitev Permission534=Brisanje storitev Permission536=Pregled/upravljanje skritih storitev Permission538=Izvoz storitev -Permission700=Branje donacij -Permission701=Kreiranje/spreminjanje donacij -Permission702=Delete donacij +Permission701=Branje donacij +Permission702=Kreiranje/spreminjanje donacij +Permission703=Delete donacij Permission1001=Branje zalog Permission1002=Kreiranje/spreminjanje zalog Permission1003=Brisanje @@ -576,8 +576,8 @@ Permission2403=Brisanje aktivnosti (dogodki ali naloge) povezanih s tem uporabni Permission2411=Branje aktivnosti (dogodki ali naloge) ostalih Permission2412=Kreiranje/spreminjanje aktivnosti (dogodki ali naloge) ostalih Permission2413=Delete aktivnosti (dogodki ali naloge) ostalih -Permission2500=Branje dokumentov -Permission2501=Pošiljanje ali brisanje dokumentov +Permission2501=Branje dokumentov +Permission2502=Pošiljanje ali brisanje dokumentov Permission2515=Nastavitve map dokumentov DictionnaryCompanyType=Tipi podjetij DictionnaryCompanyJuridicalType=Pravna oblika podjetja diff --git a/htdocs/langs/sv_SV/admin.lang b/htdocs/langs/sv_SV/admin.lang index 35b5f96de63..aefe732fd61 100644 --- a/htdocs/langs/sv_SV/admin.lang +++ b/htdocs/langs/sv_SV/admin.lang @@ -470,9 +470,9 @@ Permission162=Skapa / ändra avtal Permission163=Aktivera en tjänst av ett kontrakt Permission164=Inaktivera en tjänst av ett kontrakt Permission165=Radera kontrakt -Permission170=Läs resor -Permission171=Skapa / modifiera resor -Permission172=Ta bort resor +Permission171=Läs resor +Permission172=Skapa / modifiera resor +Permission173=Ta bort resor Permission178=Export resor Permission180=Läs leverantörer Permission181=Läs leverantör order @@ -545,9 +545,9 @@ Permission532=Skapa / modifiera tjänster Permission534=Ta bort tjänster Permission536=Se / Hantera dolda tjänster Permission538=Exportera tjänster -Permission700=Läs donationer -Permission701=Skapa / ändra donationer -Permission702=Ta bort donationer +Permission701=Läs donationer +Permission702=Skapa / ändra donationer +Permission703=Ta bort donationer Permission1001=Läs lager Permission1002=Skapa / ändra lager Permission1003=Ta bort lager @@ -581,8 +581,8 @@ Permission2403=Radera åtgärder (händelser eller uppgifter) kopplade till sitt Permission2411=Läs åtgärder (händelser eller uppgifter) andras Permission2412=Skapa / ändra åtgärder (händelser eller uppgifter) andras Permission2413=Radera åtgärder (händelser eller uppgifter) andras -Permission2500=Läsa dokument -Permission2501=Skicka eller ta bort dokument +Permission2501=Läsa dokument +Permission2502=Skicka eller ta bort dokument Permission2515=Setup dokument kataloger DictionnaryCompanyType=Företag typer DictionnaryCompanyJuridicalType=Juridiska typer av bolag diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index 1a4faf3edc1..9b53d870e00 100644 --- a/htdocs/langs/tr_TR/admin.lang +++ b/htdocs/langs/tr_TR/admin.lang @@ -447,9 +447,9 @@ Permission162=Oluştur / sözleşmeleri değiştirmek Permission163=Etkinleştirmek için bir sözleşme bir hizmet Permission164=Bir sözleşmenin bir hizmet devre dışı bırakın Permission165=Sil sözleşmeleri -Permission170=Read gezileri -Permission171=Oluştur / geziler değiştirmek -Permission172=Sil gezileri +Permission171=Read gezileri +Permission172=Oluştur / geziler değiştirmek +Permission173=Sil gezileri Permission178=Ihracat gezileri Permission180=Read tedarikçiler Permission181=Read ticaret sipariş @@ -521,9 +521,9 @@ Permission531=Read hizmetleri Permission532=Oluştur / hizmet değiştirmek Permission534=Sil hizmetleri Permission538=Ihracat hizmetleri -Permission700=Read bağış -Permission701=Oluştur / bağış değiştirmek -Permission702=Silmek bağış +Permission701=Read bağış +Permission702=Oluştur / bağış değiştirmek +Permission703=Silmek bağış Permission1001=Read stokları Permission1002=Oluştur / hisse senedi değiştirme Permission1003=Sil stokları @@ -557,8 +557,8 @@ Permission2403=Sil eylemleri (olaylar veya görevler) onun hesabına bağlı Permission2411=Read eylemleri (olaylar veya görevler) başkalarının Permission2412=Oluştur / eylemleri (olaylar veya görevler) başkalarının değiştirmek Permission2413=Sil eylemleri (olaylar veya görevler) başkalarının -Permission2500=Okuma belgeleri -Permission2501=Göndermek veya belgeler silmek +Permission2501=Okuma belgeleri +Permission2502=Göndermek veya belgeler silmek Permission2515=Kurulum belgeleri dizinleri DictionnaryCompanyType=Şirket türleri DictionnaryCompanyJuridicalType=Şirketin Tüzel türlü diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang index 2fd0d3d4b01..fdfb097a8bf 100644 --- a/htdocs/langs/zh_CN/admin.lang +++ b/htdocs/langs/zh_CN/admin.lang @@ -462,9 +462,9 @@ Permission162=创建/修改合约 Permission163=启动了一个服务合同 Permission164=禁用服务的合同 Permission165=删除合同 -Permission170=阅读人次 -Permission171=创建/修改行程 -Permission172=删除人次 +Permission171=阅读人次 +Permission172=创建/修改行程 +Permission173=删除人次 Permission178=出口旅行 Permission180=了解供应商 Permission181=了解供应商的订单 @@ -536,9 +536,9 @@ Permission531=阅读服务 Permission532=创建/修改服务 Permission534=删除服务 Permission538=出口服务 -Permission700=阅读捐款 -Permission701=创建/修改捐款 -Permission702=删除捐款 +Permission701=阅读捐款 +Permission702=创建/修改捐款 +Permission703=删除捐款 Permission1001=了解股票 Permission1002=创建/修改股票 Permission1003=删除股票 @@ -572,8 +572,8 @@ Permission2403=（事件或任务）与他的帐户删除操作 Permission2411=阅读的行动（事件或任务）他人 Permission2412=创建/修改行动（事件或任务）的人 Permission2413=（事件或任务）删除他人行动 -Permission2500=阅读文件 -Permission2501=提交或删除文件 +Permission2501=阅读文件 +Permission2502=提交或删除文件 Permission2515=安装文件的目录 DictionnaryCompanyType=公司类型 DictionnaryCompanyJuridicalType=公司法人种 diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php index 968c9c78eaf..ec2284f2f3e 100644 --- a/htdocs/lib/security.lib.php +++ b/htdocs/lib/security.lib.php @@ -90,7 +90,7 @@ function dol_loginfunction($langs,$conf,$mysoc) if (GETPOST("urlfrom")) $_SESSION["urlfrom"]=GETPOST("urlfrom"); else unset($_SESSION["urlfrom"]); - if (GETPOST("username")) $focus_element='username'; + if (! GETPOST("username")) $focus_element='username'; else $focus_element='password'; $login_background=DOL_URL_ROOT.'/theme/login_background.png';