diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index af2a8841643..e39fb6bb233 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -79,7 +79,7 @@ if ($action == 'updateall') } } -// Action mise a jour ou ajout d'une constante +// Action to update or add a constant if ($action == 'update' || $action == 'add') { $constname=GETPOST('constname', 'alpha'); @@ -108,7 +108,7 @@ if ($action == 'update' || $action == 'add') } } -// Action activation d'un sous module du module adherent +// Action to enable of a submodule of the adherent module if ($action == 'set') { $result=dolibarr_set_const($db, GETPOST('name', 'alpha'), GETPOST('value'), '', 0, '', $conf->entity); @@ -118,7 +118,7 @@ if ($action == 'set') } } -// Action desactivation d'un sous module du module adherent +// Action to disable a submodule of the adherent module if ($action == 'unset') { $result=dolibarr_del_const($db, GETPOST('name', 'alpha'), $conf->entity); @@ -220,9 +220,9 @@ if ($conf->facture->enabled) print ''; -print '
| '.$langs->trans("CompanyInfo").' | '.$langs->trans("Value").' |
|---|---|
| '.$langs->trans("CompanyInfo").' | '.$langs->trans("Value").' |
| '; + print ' | |
| '; print ' | |
| '; + print ' | |
| '; print ' | |
| '; + print ' | |
| '; print ' | |
| '; + print ' | |
| '; print ' | |
| '; + print ' | |
| '; //if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2); // By default, country of localization print $form->select_country($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'country_id'); if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1); print ' | |
| '; + print ' | |
| '; $formcompany->select_departement($conf->global->MAIN_INFO_ACCOUNTANT_STATE, $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'state_id'); print ' | |
| '; + print ' | |
| '; print ' | |
| '; + print ' | |
| '; print ' | |
| '; + print ' | |
| '; print ' | |
| '; + print ' | |
| '; print ' | |
| '; + print ' | |
| '; print ' | |
| '; + print ' | |
| '; print ' |
| '.$langs->trans("CompanyInfo").' | '.$langs->trans("Value").' |
| '.$langs->trans("CompanyInfo").' | '.$langs->trans("Value").' |
| '.$langs->trans("CompanyName").' | '; + print ' |
| '.$langs->trans("CompanyName").' | '; print $conf->global->MAIN_INFO_ACCOUNTANT_NAME; print ' |
| '.$langs->trans("CompanyAddress").' | ' . nl2br(empty($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS)?'':$conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS) . ' |
| '.$langs->trans("CompanyAddress").' | ' . nl2br(empty($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS)?'':$conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS) . ' |
| '.$langs->trans("CompanyZip").' | ' . (empty($conf->global->MAIN_INFO_ACCOUNTANT_ZIP)?'':$conf->global->MAIN_INFO_ACCOUNTANT_ZIP) . ' |
| '.$langs->trans("CompanyZip").' | ' . (empty($conf->global->MAIN_INFO_ACCOUNTANT_ZIP)?'':$conf->global->MAIN_INFO_ACCOUNTANT_ZIP) . ' |
| '.$langs->trans("CompanyTown").' | ' . (empty($conf->global->MAIN_INFO_ACCOUNTANT_TOWN)?'':$conf->global->MAIN_INFO_ACCOUNTANT_TOWN) . ' |
| '.$langs->trans("CompanyTown").' | ' . (empty($conf->global->MAIN_INFO_ACCOUNTANT_TOWN)?'':$conf->global->MAIN_INFO_ACCOUNTANT_TOWN) . ' |
| '.$langs->trans("CompanyCountry").' | '; + print ' |
| '.$langs->trans("CompanyCountry").' | '; if (! empty($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY)) { $code = getCountry($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 2); @@ -217,23 +217,23 @@ else print ' |
| '.$langs->trans("Region-State").' | '; - else print ' |
| '.$langs->trans("State").' | '; + if (! empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT)) print ' |
| '.$langs->trans("Region-State").' | '; + else print ' |
| '.$langs->trans("State").' | '; if (! empty($conf->global->MAIN_INFO_ACCOUNTANT_STATE)) print getState($conf->global->MAIN_INFO_ACCOUNTANT_STATE, $conf->global->MAIN_SHOW_STATE_CODE, 0, $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT); else print ' '; print ' |
| '.$langs->trans("Phone").' | ' . dol_print_phone($conf->global->MAIN_INFO_ACCOUNTANT_PHONE, $mysoc->country_code) . ' |
| '.$langs->trans("Phone").' | ' . dol_print_phone($conf->global->MAIN_INFO_ACCOUNTANT_PHONE, $mysoc->country_code) . ' |
| '.$langs->trans("Fax").' | ' . dol_print_phone($conf->global->MAIN_INFO_ACCOUNTANT_FAX, $mysoc->country_code) . ' |
| '.$langs->trans("Fax").' | ' . dol_print_phone($conf->global->MAIN_INFO_ACCOUNTANT_FAX, $mysoc->country_code) . ' |
| '.$langs->trans("Mail").' | ' . dol_print_email($conf->global->MAIN_INFO_ACCOUNTANT_MAIL, 0, 0, 0, 80) . ' |
| '.$langs->trans("Mail").' | ' . dol_print_email($conf->global->MAIN_INFO_ACCOUNTANT_MAIL, 0, 0, 0, 80) . ' |
| '.$langs->trans("Web").' | ' . dol_print_url($conf->global->MAIN_INFO_ACCOUNTANT_WEB, '_blank', 80) . ' |
| '.$langs->trans("Web").' | ' . dol_print_url($conf->global->MAIN_INFO_ACCOUNTANT_WEB, '_blank', 80) . ' |
| '.$langs->trans("AccountantFileNumber").' | ' . $conf->global->MAIN_INFO_ACCOUNTANT_CODE . ' |
| '.$langs->trans("AccountantFileNumber").' | ' . $conf->global->MAIN_INFO_ACCOUNTANT_CODE . ' |
| '.$langs->trans("Note").' | ' . (! empty($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) ? nl2br($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) : '') . ' |
| '.$langs->trans("Note").' | ' . (! empty($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) ? nl2br($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) : '') . ' |
| '; print $form->selectarray('element', $elementList, (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'')); print ' | '; } - // La source de l'element (pour les type de contact) + // The source of the element (for contact types) elseif ($fieldlist[$field] == 'source') { print ''; diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php index 64e784ece9d..4b3da666aa0 100644 --- a/htdocs/admin/emailcollector_card.php +++ b/htdocs/admin/emailcollector_card.php @@ -36,7 +36,7 @@ include_once DOL_DOCUMENT_ROOT.'/emailcollector/lib/emailcollector.lib.php'; if (!$user->admin) accessforbidden(); if (empty($conf->emailcollector->enabled)) accessforbidden(); -// Load traductions files requiredby by page +// Load traductions files required by page $langs->loadLangs(array("admin", "mails", "other")); // Get parameters diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php index 14cb63cd923..a55f6ee962e 100644 --- a/htdocs/admin/emailcollector_list.php +++ b/htdocs/admin/emailcollector_list.php @@ -34,7 +34,7 @@ dol_include_once('/emailcollector/class/emailcollector.class.php'); if (!$user->admin) accessforbidden(); if (empty($conf->emailcollector->enabled)) accessforbidden(); -// Load traductions files requiredby by page +// Load traductions files required by page $langs->loadLangs(array("admin", "other")); $action = GETPOST('action', 'aZ09')?GETPOST('action', 'aZ09'):'view'; // The action 'add', 'create', 'edit', 'update', 'view', ... diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php index da77c0e78d3..d0ba9c63a3c 100644 --- a/htdocs/admin/expensereport.php +++ b/htdocs/admin/expensereport.php @@ -496,7 +496,7 @@ else } print ' | '."\n"; -//Use draft Watermark +// Use draft Watermark print '
| ';
print $form->textwithpicto($langs->trans("WatermarkOnDraftExpenseReports"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').' '; diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 37c997ee306..7b0a7983b5a 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -432,11 +432,13 @@ if ($action == 'edit') // Edit print ' |
| '.$langs->trans("Parameter").' | '.$langs->trans("Value").' |
| '.$langs->trans("Parameters").' | '.$langs->trans("Value").' |
| '; @@ -110,23 +110,25 @@ if ($action == 'edit') print ' | |
| '; + print ' | |
| '; print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"), $langs->trans("ParameterActiveForNextInputOnly")); print ' | |
| '.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").' | |
| '.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").' | |
| '; + print ' | |
| '; print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"), $langs->trans("ParameterActiveForNextInputOnly")); print ' |