Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Some fix into menu translation

Browse Source
This commit is contained in:
Laurent Destailleur
2012-12-28 19:18:04 +01:00
parent 012ee020a4
commit 2bec26c32a
12 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/menus/init_menu_auguria.sql
View File

@@ -13,8 +13,8 @@ insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk
insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->product->enabled || $conf->service->enabled', 3__+MAX_llx_menu__, __HANDLER__, 'top', 'products', '', 0, '/product/index.php?mainmenu=products&leftmenu=', 'Products/Services', -1, 'products', '$user->rights->produit->lire||$user->rights->service->lire', '', 0, 3, __ENTITY__);
insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->societe->enabled', 5__+MAX_llx_menu__, __HANDLER__, 'top', 'commercial', '', 0, '/comm/index.php?mainmenu=commercial&leftmenu=', 'Commercial', -1, 'commercial', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 5, __ENTITY__);
insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled || $conf->tax->enabled', 6__+MAX_llx_menu__, __HANDLER__, 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->deplacement->lire || $user->rights->don->lire || $user->rights->tax->charges->lire', '', 2, 6, __ENTITY__);
insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->banque->enabled || $conf->prelevement->enabled', 14__+MAX_llx_menu__, __HANDLER__, 'top', 'bank', '', 0, '/compta/bank/index.php?mainmenu=bank&leftmenu=bank', 'MenuBankCash', -1, 'banks', '$user->rights->banque->lire || $user->rights->prelevement->bons->lire', '', 2, 6, __ENTITY__);
insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->projet->enabled', 7__+MAX_llx_menu__, __HANDLER__, 'top', 'project', '', 0, '/projet/index.php?mainmenu=project&leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 0, 7, __ENTITY__);
insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->banque->enabled || $conf->prelevement->enabled', 14__+MAX_llx_menu__, __HANDLER__, 'top', 'bank', '', 0, '/compta/bank/index.php?mainmenu=bank&leftmenu=bank', 'MenuBankCash', -1, 'banks', '$user->rights->banque->lire || $user->rights->prelevement->bons->lire', '', 0, 6, __ENTITY__);
insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->projet->enabled', 7__+MAX_llx_menu__, __HANDLER__, 'top', 'project', '', 0, '/projet/index.php?mainmenu=project&leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 2, 7, __ENTITY__);
insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled', 8__+MAX_llx_menu__, __HANDLER__, 'top', 'tools', '', 0, '/core/tools.php?mainmenu=tools&leftmenu=', 'Tools', -1, 'other', '$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run', '', 2, 8, __ENTITY__);
insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('! empty($conf->boutique->enabled)', 11__+MAX_llx_menu__, __HANDLER__, 'top', 'shop', '', 0, '/boutique/index.php?mainmenu=shop&leftmenu=', 'OSCommerce', -1, 'shop', '', '', 0, 11, __ENTITY__);
insert into llx_menu (enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->adherent->enabled', 13__+MAX_llx_menu__, __HANDLER__, 'top', 'members', '', 0, '/adherents/index.php?mainmenu=members&leftmenu=', 'Members', -1, 'members', '$user->rights->adherent->lire', '', 2, 15, __ENTITY__);

11
htdocs/core/menus/standard/auguria.lib.php
View File

@@ -240,11 +240,14 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after)
// TODO Find a way to add parent menu only if child menu exists. For the moment, no ther method than hard coded methods.
if (! empty($conf->product->enabled) || ! empty($conf->service->enabled) || ! empty($conf->global->MAIN_MENU_ENABLE_MODULETOOLS))
{
$langs->load("products");
$newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=modulesadmintools", $langs->trans("ModulesSystemTools"), 0, 1, '', $mainmenu, 'modulesadmintools');
if ($leftmenu=="modulesadmintools")
if (empty($user->societe_id))
{
$newmenu->add("/product/admin/product_tools.php?mainmenu=home&leftmenu=modulesadmintools",$langs->trans("ProductVatMassChange"),1);
$newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=modulesadmintools", $langs->trans("ModulesSystemTools"), 0, 1, '', $mainmenu, 'modulesadmintools');
if ($leftmenu=="modulesadmintools" && $user->admin)
{
$langs->load("products");
$newmenu->add("/product/admin/product_tools.php?mainmenu=home&leftmenu=modulesadmintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);
}
}
}

11
htdocs/core/menus/standard/eldy.lib.php
View File

@@ -712,11 +712,14 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
// Modules system tools
if (! empty($conf->product->enabled) || ! empty($conf->service->enabled) || ! empty($conf->global->MAIN_MENU_ENABLE_MODULETOOLS))
{
$langs->load("products");
$newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=modulesadmintools", $langs->trans("ModulesSystemTools"), 0, 1, '', $mainmenu, 'modulesadmintools');
if ($leftmenu=="modulesadmintools")
if (empty($user->societe_id))
{
$newmenu->add("/product/admin/product_tools.php?mainmenu=home&leftmenu=modulesadmintools",$langs->trans("ProductVatMassChange"),1);
$newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=modulesadmintools", $langs->trans("ModulesSystemTools"), 0, 1, '', $mainmenu, 'modulesadmintools');
if ($leftmenu=="modulesadmintools" && $user->admin)
{
$langs->load("products");
$newmenu->add("/product/admin/product_tools.php?mainmenu=home&leftmenu=modulesadmintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);
}
}
}
}

1
htdocs/langs/bg_BG/admin.lang
View File

@@ -340,7 +340,6 @@ SecurityTokenIsUnique=Използвайте уникална параметър
EnterRefToBuildUrl=Въведете справка за обект %s
GetSecuredUrl=Изчислява URL
ButtonHideUnauthorized=Скриване на бутоните за неправомерни действия, вместо да се показва с увреждания бутони
ModulesSystemTools=Модули инструменти
ProductVatMassChange=Промяната в масата ДДС
ProductVatMassChangeDesc=Тази страница може да се използва за промяна на ДДС ставката, определена за продукти или услуги от стойността на друг. Внимание, тази промяна се прави на цялата база данни.
OldVATRates=Old ставка на ДДС

1
htdocs/langs/ca_ES/admin.lang
View File

@@ -338,7 +338,6 @@ GetSecuredUrl=Obtenir la URL calculada
ButtonHideUnauthorized=Amaga els botons d'accions no autoritzades en compte de mostrar-los atenuats
TotalNumberOfActivatedModules=Nombre total de mòduls activats: <b>%s</b>
YouMustEnableOneModule=Ha d'activar almenys 1 mòdul.
ModulesSystemTools=Mòduls utilitats
ProductVatMassChange=Modificar IVA en massa
ProductVatMassChangeDesc=Aquesta pàgina us permet canviar el tipus d'IVA definit en els productes o serveis d'un valor a un altre. Tingueu en compte que el canvi es fa en massa sobre tota la base de dades.
OldVATRates=Taxa d'IVA antiga

8
htdocs/langs/ca_ES/main.lang
View File

@@ -628,6 +628,11 @@ LinkedToSpecificUsers=Enllaçat a un contacte d'usuari particular
DeleteAFile=Eliminació d'arxiu
ConfirmDeleteAFile=Confirme l'eliminació de l'arxiu
NoResults=Cap resultat
ModulesSystemTools=Mòduls utilitats
View=Veure
Test=Prova
Element=Element
# Week day
Monday=Dilluns
Tuesday=Dimarts
@@ -657,6 +662,3 @@ ShortThursday=Dj
ShortFriday=Dv
ShortSaturday=Ds
ShortSunday=Dg
View=Veure
Test=Prova
Element=Element

1
htdocs/langs/en_US/admin.lang
View File

@@ -333,7 +333,6 @@ SecurityTokenIsUnique=Use a unique securekey parameter for each URL
EnterRefToBuildUrl=Enter reference for object %s
GetSecuredUrl=Get calculated URL
ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
ModulesSystemTools=Modules tools
ProductVatMassChange=Mass VAT change
ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
OldVATRates=Old VAT rate

1
htdocs/langs/en_US/main.lang
View File

@@ -627,6 +627,7 @@ LinkedToSpecificUsers=Linked to a particular user contact
DeleteAFile=Delete a file
ConfirmDeleteAFile=Are you sure you want to delete file
NoResults=No results
ModulesSystemTools=Modules tools
# Week day
Monday=Monday

1
htdocs/langs/es_ES/admin.lang
View File

@@ -339,7 +339,6 @@ GetSecuredUrl=Obtener la URL calculada
ButtonHideUnauthorized=Ocultar los botones de acciones no autorizadas en vez de mostrarlos atenuados
TotalNumberOfActivatedModules=Número total de módulos activados: <b>%s</b>
YouMustEnableOneModule=Debe activar al menos 1 módulo.
ModulesSystemTools=Módulos utilidades
ProductVatMassChange=Modificar IVA en masa
ProductVatMassChangeDesc=Esta página le permite cambiar el tipo de IVA definido en los productos o servicios de un valor a otro. Tenga en cuenta que el cambio se lleva a cabo en masa sobre toda la base de datos.
OldVATRates=Tasa de IVA antigua

8
htdocs/langs/es_ES/main.lang
View File

@@ -628,6 +628,11 @@ LinkedToSpecificUsers=Enlazado a un contacto de usuario particular
DeleteAFile=Eliminación de archivo
ConfirmDeleteAFile=Confirme la eliminación del archivo
NoResults=Ningún resultado
ModulesSystemTools=Módulos utilidades
View=Ver
Test=Prueba
Element=Elemento
# Week day
Monday=Lunes
Tuesday=Martes
@@ -658,6 +663,3 @@ ShortFriday=V
ShortSaturday=S
ShortSunday=D
View=Ver
Test=Prueba
Element=Elemento

1
htdocs/langs/fr_FR/admin.lang
View File

@@ -335,7 +335,6 @@ GetSecuredUrl=Obtenir l'URL calculée
ButtonHideUnauthorized=Cacher les boutons non autorisés (au lieu de les voir grisés)
TotalNumberOfActivatedModules=Nombre total de modules fonctionnels activés: <b>%s</b>
YouMustEnableOneModule=Vous devez activer au moins une fonctionnalité
ModulesSystemTools=Outils Modules
ProductVatMassChange=Modif TVA en masse
ProductVatMassChangeDesc=Cette page permet de modifier les taux de TVA définis sur les produits ou services d'une valeur vers une autre. Attention, la modification est réalisée en masse sur toute la base de donnée.
OldVATRates=Ancien taux de TVA

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

@@ -629,6 +629,8 @@ LinkedToSpecificUsers=Liés à un contact utilisateur particulier
DeleteAFile=Suppression de fichier
ConfirmDeleteAFile=Confirmez-vous la suppression du fichier
NoResults=Aucun résultat
ModulesSystemTools=Outils Modules
View=Voir
# Week day
Monday=Lundi
@@ -659,5 +661,3 @@ ShortThursday=J
ShortFriday=V
ShortSaturday=S
ShortSunday=D
View=Voir