diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php index ed0b7e11752..fe7f17b4cd9 100644 --- a/htdocs/compta/localtax/clients.php +++ b/htdocs/compta/localtax/clients.php @@ -98,7 +98,7 @@ llxHeader('','','','',0,0,'','',$morequerystring); $fsearch.='
'; $fsearch.=' '; $fsearch.=' '; -$fsearch.=' '.$langs->trans("SalesTurnover").' '.$langs->trans("Minimum").': '; +$fsearch.=' '.$langs->trans("SalesTurnoverMinimum").': '; $fsearch.=' '; // Affiche en-tete du rapport diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 68bfe41d968..4f91cac2895 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -103,7 +103,7 @@ llxHeader('','','','',0,0,'','',$morequerystring); $fsearch.='
'; $fsearch.=' '; $fsearch.=' '; -$fsearch.=' '.$langs->trans("SalesTurnover").' '.$langs->trans("Minimum").': '; +$fsearch.=' '.$langs->trans("SalesTurnoverMinimum").': '; $fsearch.=' '; // Affiche en-tete du rapport diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index e323117091d..bb39ede5b4e 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -118,7 +118,7 @@ $paymentfourn_static=new PaiementFourn($db); //$fsearch.='
'; $fsearch.=' '; $fsearch.=' '; -//$fsearch.=' '.$langs->trans("SalesTurnover").' '.$langs->trans("Minimum").': '; +//$fsearch.=' '.$langs->trans("SalesTurnoverMinimum").': '; //$fsearch.=' '; // Affiche en-tete du rapport diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index a60c3c63946..ed01fb5d713 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -1134,33 +1134,33 @@ function form_constantes($tableau) } -/** - * Show array with constants to edit - * - * @param array $modules Array of all modules - * @return string HTML string with warning - */ -function showModulesExludedForExternal($modules) -{ +/** + * Show array with constants to edit + * + * @param array $modules Array of all modules + * @return string HTML string with warning + */ +function showModulesExludedForExternal($modules) +{ global $conf,$langs; - $text=$langs->trans("OnlyFollowingModulesAreOpenedToExternalUsers"); - $listofmodules=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL); - $i=0; - foreach($modules as $module) - { - $moduleconst=$module->const_name; - $modulename=strtolower($module->name); - //print 'modulename='.$modulename; - - //if (empty($conf->global->$moduleconst)) continue; - if (! in_array($modulename,$listofmodules)) continue; - - if ($i > 0) $text.=', '; - else $text.=' '; - $i++; - $text.=$langs->trans($module->name); - } + $text=$langs->trans("OnlyFollowingModulesAreOpenedToExternalUsers"); + $listofmodules=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL); + $i=0; + foreach($modules as $module) + { + $moduleconst=$module->const_name; + $modulename=strtolower($module->name); + //print 'modulename='.$modulename; + + //if (empty($conf->global->$moduleconst)) continue; + if (! in_array($modulename,$listofmodules)) continue; + + if ($i > 0) $text.=', '; + else $text.=' '; + $i++; + $text .= $langs->trans('Module'.$module->numero.'Name'); + } return img_picto($langs->trans('InfoAdmin'), 'star').' '.$text; } diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 7a8dbe38f72..c38ccd07d68 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -84,7 +84,8 @@ AccountNumberShort=Account number AccountNumber=Account number NewAccount=New account SalesTurnover=Sales turnover -ByThirdParties=Bu third parties +SalesTurnoverMinimum=Minimum sales turnover +ByThirdParties=By third parties ByUserAuthorOfInvoice=By invoice author AccountancyExport=Accountancy export ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang index 77127fa1a8b..fedfabfbc2c 100644 --- a/htdocs/langs/es_ES/companies.lang +++ b/htdocs/langs/es_ES/companies.lang @@ -153,9 +153,9 @@ ProfId4DE=- ProfId5DE=- ProfId6DE=- ProfId1ES=CIF/NIF -ProfId2ES=Núm seguridad social +ProfId2ES=Núm. seguridad social ProfId3ES=CNAE -ProfId4ES=Núm colegiado +ProfId4ES=Núm. colegiado ProfId5ES=- ProfId6ES=- ProfId1FR=SIREN diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang index a2138f91855..2f72861a920 100644 --- a/htdocs/langs/es_ES/compta.lang +++ b/htdocs/langs/es_ES/compta.lang @@ -85,6 +85,7 @@ AccountNumberShort=Nº de cuenta AccountNumber=Número de cuenta NewAccount=Nueva cuenta SalesTurnover=Volumen de ventas +SalesTurnoverMinimum=Volumen de ventas mínimo ByThirdParties=Por tercero ByUserAuthorOfInvoice=Por autor de la factura AccountancyExport=Exportación contabilidad