diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index 3958e80964a..1169c379e59 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -133,7 +133,7 @@ print '
'; print ''; print ''; print ''; -print ''.$langs->trans("AdherentLoginRequired").''; +print ''.$langs->trans("AdherentLoginRequired").''; print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)?0:1),1); print ''; print ''; @@ -146,7 +146,7 @@ print ''; print ''; print ''; print ''; -print ''.$langs->trans("AdherentMailRequired").''; +print ''.$langs->trans("AdherentMailRequired").''; print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_MAIL_REQUIRED)?$conf->global->ADHERENT_MAIL_REQUIRED:0),1); print ''; print ''; @@ -159,7 +159,7 @@ print ''; print ''; print ''; print ''; -print ''.$langs->trans("MemberSendInformationByMailByDefault").''; +print ''.$langs->trans("MemberSendInformationByMailByDefault").''; print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?$conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL:0),1); print ''; print ''; @@ -172,7 +172,7 @@ print ''; print ''; print ''; print ''; -print ''.$langs->trans("MoreActionsOnSubscription").''; +print ''.$langs->trans("MoreActionsOnSubscription").''; $arraychoices=array('0'=>$langs->trans("None")); if (! empty($conf->banque->enabled)) $arraychoices['bankdirect']=$langs->trans("MoreActionBankDirect"); if (! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled)) $arraychoices['invoiceonly']=$langs->trans("MoreActionInvoiceOnly"); @@ -193,7 +193,7 @@ if ($conf->facture->enabled) print ''; print ''; print ''; - print ''.$langs->trans("VATToUseForSubscriptions").''; + print ''.$langs->trans("VATToUseForSubscriptions").''; if (! empty($conf->banque->enabled)) { print ''; @@ -218,7 +218,7 @@ if ($conf->facture->enabled) print ''; print ''; print ''; - print ''.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").''; + print ''.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").''; print ''; $form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'constvalue_ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS'); print ''; diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php index 47ad7a00a97..74cd048de31 100644 --- a/htdocs/adherents/admin/public.php +++ b/htdocs/adherents/admin/public.php @@ -150,7 +150,7 @@ $var=true; // Allow public form $var=! $var; print ''; -print ''; +print ''; print $langs->trans("EnablePublicSubscriptionForm"); print ''; print $form->selectyesno("MEMBER_ENABLE_PUBLIC",(! empty($conf->global->MEMBER_ENABLE_PUBLIC)?$conf->global->MEMBER_ENABLE_PUBLIC:0),1); diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php index 17f94ef30cb..6e0a62610aa 100644 --- a/htdocs/admin/agenda_other.php +++ b/htdocs/admin/agenda_other.php @@ -352,7 +352,7 @@ print ''."\n"; // Manual or automatic -print ''."\n"; +print ''."\n"; print ''.$langs->trans("AGENDA_USE_EVENT_TYPE").''."\n"; print ' '."\n"; print ''."\n"; @@ -371,7 +371,7 @@ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) { print ''; - print ''."\n"; + print ''."\n"; print ''.$langs->trans("AGENDA_USE_EVENT_TYPE_DEFAULT").''."\n"; print ' '."\n"; print ''."\n"; @@ -381,7 +381,7 @@ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) // AGENDA_DEFAULT_FILTER_TYPE -print ''."\n"; +print ''."\n"; print ''.$langs->trans("AGENDA_DEFAULT_FILTER_TYPE").''."\n"; print ' '."\n"; print ''."\n"; @@ -390,7 +390,7 @@ print ''."\n"; // AGENDA_DEFAULT_FILTER_STATUS -print ''."\n"; +print ''."\n"; print ''.$langs->trans("AGENDA_DEFAULT_FILTER_STATUS").''."\n"; print ' '."\n"; print ''."\n"; @@ -399,7 +399,7 @@ print ''."\n"; // AGENDA_DEFAULT_VIEW -print ''."\n"; +print ''."\n"; print ''.$langs->trans("AGENDA_DEFAULT_VIEW").''."\n"; print ' '."\n"; print ''."\n"; @@ -411,7 +411,7 @@ print ''."\n"; if ($conf->global->MAIN_FEATURES_LEVEL > 0) { - print ''."\n"; + print ''."\n"; print ''.$langs->trans('AGENDA_NOTIFICATION').''."\n"; print ' '."\n"; print ''."\n"; @@ -423,7 +423,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) print ''.img_picto($langs->trans('Enabled'),'switch_on').''; print ''."\n"; - print ''."\n"; + print ''."\n"; print ''.$langs->trans('AGENDA_NOTIFICATION_SOUND').''."\n"; print ' '."\n"; print ''."\n"; diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index a5fb5ef8d69..db81c9a325f 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -215,7 +215,7 @@ if ($resql) { $obj = $db->fetch_object($resql); - print ''; + print ''; print $obj->libelle; print "\n"; print $langs->trans('BarcodeDesc'.$obj->encoding); diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 72957aa77d3..c76c35dfdeb 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -354,7 +354,7 @@ foreach($boxtoadd as $box) } print "\n".''."\n"; - print ''."\n"; + print ''."\n"; print ''.img_object("",$logo).' '.$langs->transnoentitiesnoconv($box->boxlabel); if (! empty($box->class) && preg_match('/graph_/',$box->class)) print ' ('.$langs->trans("Graph").')'; print ''."\n"; @@ -480,7 +480,7 @@ print ''; // Activate FileCache - Developement if ($conf->global->MAIN_FEATURES_LEVEL == 2 || ! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) { - print ''.$langs->trans("EnableFileCache").''; + print ''.$langs->trans("EnableFileCache").''; print $form->selectyesno('MAIN_ACTIVATE_FILECACHE',$conf->global->MAIN_ACTIVATE_FILECACHE,1); print ''; print ''; diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php index f319692f27d..3b205f49cd2 100644 --- a/htdocs/admin/chequereceipts.php +++ b/htdocs/admin/chequereceipts.php @@ -166,7 +166,7 @@ foreach ($dirmodels as $reldir) if ($module->isEnabled()) { $var = !$var; - print ''; + print ''; print (empty($module->name)?$name:$module->name); print "\n"; @@ -257,7 +257,7 @@ $var=true; $var=! $var; -print ''; +print ''; print $langs->trans("FreeLegalTextOnChequeReceipts").' ('.$langs->trans("AddCRIfTooLong").')
'; $variablename='BANK_CHEQUERECEIPT_FREE_TEXT'; if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php index 808471e3e6c..060c910753a 100644 --- a/htdocs/admin/clicktodial.php +++ b/htdocs/admin/clicktodial.php @@ -81,7 +81,7 @@ print ''.$langs->trans("Value").''; print "\n"; -print ''; +print ''; print $langs->trans("ClickToDialUseTelLink").''; print $form->selectyesno("CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS", $conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS, 1).'
'; print '
'; @@ -89,7 +89,7 @@ print $langs->trans("ClickToDialUseTelLinkDesc"); print ''; -print ''; +print ''; print $langs->trans("DefaultLink").''; print 'global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS?' disabled="disabled"':'').' value="'.$conf->global->CLICKTODIAL_URL.'">
'; print '
'; diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 65638ca1d77..a6ca7871ae4 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -331,7 +331,7 @@ foreach ($dirmodels as $reldir) if ($module->isEnabled()) { - print ''.$module->nom."\n"; + print ''.$module->nom."\n"; print $module->info(); print ''; @@ -471,7 +471,7 @@ foreach ($dirmodels as $reldir) if ($modulequalified) { $var = !$var; - print ''; + print ''; print (empty($module->name)?$name:$module->name); print "\n"; if (method_exists($module,'info')) print $module->info($langs); @@ -569,7 +569,7 @@ $var=! $var; print ''; print ''; print ''; -print ''; +print ''; print $langs->trans("FreeLegalTextOnOrders").' '.img_info($langs->trans("AddCRIfTooLong")).'
'; $variablename='ORDER_FREE_TEXT'; if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) @@ -592,7 +592,7 @@ print '
'; print "
"; print ''; print ""; -print ''; +print ''; print $langs->trans("WatermarkOnDraftOrders").''; print ''; print ''; @@ -624,7 +624,7 @@ print ''; if ($conf->banque->enabled) { - print ''; + print ''; print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").' '; if (! empty($conf->use_javascript_ajax)) { @@ -646,7 +646,7 @@ if ($conf->banque->enabled) else { - print ''; + print ''; print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").' '.$langs->trans('NotAvailable').''; } @@ -654,7 +654,7 @@ else if ($conf->stock->enabled) { - print ''; + print ''; print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").' '; if (! empty($conf->use_javascript_ajax)) { @@ -676,7 +676,7 @@ if ($conf->stock->enabled) else { - print ''; + print ''; print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").' '.$langs->trans('NotAvailable').''; } */ @@ -697,7 +697,7 @@ print ''; print ' '; print "\n"; -print ''; +print ''; print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'
'; print ''; print "\n"; diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index ad25c3620c3..8c29fe67a1c 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -310,65 +310,65 @@ if ($action == 'edit' || $action == 'updateedit') // Name - print ''; + print ''; print ''."\n"; // Addresse - print ''; + print ''; print ''."\n"; - print ''; + print ''; print ''."\n"; - print ''; + print ''; print ''."\n"; // Country - print ''; + print ''; //if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2); // By default, country of localization print $form->select_country($mysoc->country_id,'country_id'); if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); print ''."\n"; - print ''; + print ''; $formcompany->select_departement($conf->global->MAIN_INFO_SOCIETE_STATE,$mysoc->country_code,'state_id'); print ''."\n"; - print ''; + print ''; print $form->selectCurrency($conf->currency,"currency"); print ''."\n"; - print ''; + print ''; print ''; print ''."\n"; - print ''; + print ''; print ''; print ''."\n"; - print ''; + print ''; print ''; print ''."\n"; // Web - print ''; + print ''; print ''; print ''."\n"; // Barcode if (! empty($conf->barcode->enabled)) { - print ''; + print ''; print ''; print ''; } @@ -393,7 +393,7 @@ if ($action == 'edit' || $action == 'updateedit') // Note - print ''; + print ''; print ''; print ''; @@ -410,17 +410,17 @@ if ($action == 'edit' || $action == 'updateedit') // Managing Director(s) - print ''; + print ''; print ''; // Capital - print ''; + print ''; print ''; // Juridical Status - print ''; + print ''; if ($mysoc->country_code) { print $formcompany->select_juridicalstatus($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE, $mysoc->country_code, '', 'forme_juridique_code'); } else { @@ -432,7 +432,7 @@ if ($action == 'edit' || $action == 'updateedit') if ($langs->transcountry("ProfId1",$mysoc->country_code) != '-') { - print ''; + print ''; if (! empty($mysoc->country_code)) { print ''; @@ -448,7 +448,7 @@ if ($action == 'edit' || $action == 'updateedit') if ($langs->transcountry("ProfId2",$mysoc->country_code) != '-') { - print ''; + print ''; if (! empty($mysoc->country_code)) { print ''; @@ -464,7 +464,7 @@ if ($action == 'edit' || $action == 'updateedit') if ($langs->transcountry("ProfId3",$mysoc->country_code) != '-') { - print ''; + print ''; if (! empty($mysoc->country_code)) { print ''; @@ -480,7 +480,7 @@ if ($action == 'edit' || $action == 'updateedit') if ($langs->transcountry("ProfId4",$mysoc->country_code) != '-') { - print ''; + print ''; if (! empty($mysoc->country_code)) { print ''; @@ -496,7 +496,7 @@ if ($action == 'edit' || $action == 'updateedit') if ($langs->transcountry("ProfId5",$mysoc->country_code) != '-') { - print ''; + print ''; if (! empty($mysoc->country_code)) { print ''; @@ -512,7 +512,7 @@ if ($action == 'edit' || $action == 'updateedit') if ($langs->transcountry("ProfId6",$mysoc->country_code) != '-') { - print ''; + print ''; if (! empty($mysoc->country_code)) { print ''; @@ -526,13 +526,13 @@ if ($action == 'edit' || $action == 'updateedit') // TVA Intra - print ''; + print ''; print ''; print ''; // Object of the company - print ''; + print ''; print ''; print ''; @@ -548,7 +548,7 @@ if ($action == 'edit' || $action == 'updateedit') $var=true; - print ''; + print ''; print $formother->select_month($conf->global->SOCIETE_FISCAL_MONTH_START,'fiscalmonthstart',0,1) . ''; print ""; @@ -699,22 +699,22 @@ else $var=true; - print ''.$langs->trans("CompanyName").''; + print ''.$langs->trans("CompanyName").''; if (! empty($conf->global->MAIN_INFO_SOCIETE_NOM)) print $conf->global->MAIN_INFO_SOCIETE_NOM; else print img_warning().' '.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyName")).''; print ''; - print ''.$langs->trans("CompanyAddress").'' . nl2br(empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS) . ''; + print ''.$langs->trans("CompanyAddress").'' . nl2br(empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS)?'':$conf->global->MAIN_INFO_SOCIETE_ADDRESS) . ''; - print ''.$langs->trans("CompanyZip").'' . (empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP) . ''; + print ''.$langs->trans("CompanyZip").'' . (empty($conf->global->MAIN_INFO_SOCIETE_ZIP)?'':$conf->global->MAIN_INFO_SOCIETE_ZIP) . ''; - print ''.$langs->trans("CompanyTown").'' . (empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN) . ''; + print ''.$langs->trans("CompanyTown").'' . (empty($conf->global->MAIN_INFO_SOCIETE_TOWN)?'':$conf->global->MAIN_INFO_SOCIETE_TOWN) . ''; - print ''.$langs->trans("CompanyCountry").''; + print ''.$langs->trans("CompanyCountry").''; if ($mysoc->country_code) { $img=picto_from_langcode($mysoc->country_code); @@ -725,13 +725,13 @@ else print ''; - print ''.$langs->trans("State").''; + print ''.$langs->trans("State").''; if (! empty($conf->global->MAIN_INFO_SOCIETE_STATE)) print getState($conf->global->MAIN_INFO_SOCIETE_STATE); else print ' '; print ''; - print ''.$langs->trans("CompanyCurrency").''; + print ''.$langs->trans("CompanyCurrency").''; print currency_name($conf->currency,1); print ' ('.$conf->currency; print ($conf->currency != $langs->getCurrencySymbol($conf->currency) ? ' - '.$langs->getCurrencySymbol($conf->currency) : ''); @@ -739,28 +739,28 @@ else print ''; - print ''.$langs->trans("Phone").'' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_TEL,$mysoc->country_code) . ''; + print ''.$langs->trans("Phone").'' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_TEL,$mysoc->country_code) . ''; - print ''.$langs->trans("Fax").'' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_FAX,$mysoc->country_code) . ''; + print ''.$langs->trans("Fax").'' . dol_print_phone($conf->global->MAIN_INFO_SOCIETE_FAX,$mysoc->country_code) . ''; - print ''.$langs->trans("Mail").'' . dol_print_email($conf->global->MAIN_INFO_SOCIETE_MAIL,0,0,0,80) . ''; + print ''.$langs->trans("Mail").'' . dol_print_email($conf->global->MAIN_INFO_SOCIETE_MAIL,0,0,0,80) . ''; // Web - print ''.$langs->trans("Web").'' . dol_print_url($conf->global->MAIN_INFO_SOCIETE_WEB,'_blank',80) . ''; + print ''.$langs->trans("Web").'' . dol_print_url($conf->global->MAIN_INFO_SOCIETE_WEB,'_blank',80) . ''; // Barcode if (! empty($conf->barcode->enabled)) { - print ''.$langs->trans("Gencod").'' . $conf->global->MAIN_INFO_SOCIETE_GENCOD . ''; + print ''.$langs->trans("Gencod").'' . $conf->global->MAIN_INFO_SOCIETE_GENCOD . ''; } // Logo - print ''.$langs->trans("Logo").''; + print ''.$langs->trans("Logo").''; $tagtd='tagtd '; if ($conf->browser->layout == 'phone') $tagtd=''; @@ -786,7 +786,7 @@ else print ''; - print ''.$langs->trans("Note").'' . (! empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? nl2br($conf->global->MAIN_INFO_SOCIETE_NOTE) : '') . ''; + print ''.$langs->trans("Note").'' . (! empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? nl2br($conf->global->MAIN_INFO_SOCIETE_NOTE) : '') . ''; print ''; @@ -803,17 +803,17 @@ else // Managing Director(s) - print ''.$langs->trans("ManagingDirectors").''; + print ''.$langs->trans("ManagingDirectors").''; print $conf->global->MAIN_INFO_SOCIETE_MANAGERS . ''; // Capital - print ''.$langs->trans("Capital").''; + print ''.$langs->trans("Capital").''; print $conf->global->MAIN_INFO_CAPITAL . ''; // Juridical Status - print ''.$langs->trans("JuridicalStatus").''; + print ''.$langs->trans("JuridicalStatus").''; print getFormeJuridiqueLabel($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE); print ''; @@ -821,7 +821,7 @@ else if ($langs->transcountry("ProfId1",$mysoc->country_code) != '-') { - print ''.$langs->transcountry("ProfId1",$mysoc->country_code).''; + print ''.$langs->transcountry("ProfId1",$mysoc->country_code).''; if (! empty($conf->global->MAIN_INFO_SIREN)) { print $conf->global->MAIN_INFO_SIREN; @@ -837,7 +837,7 @@ else if ($langs->transcountry("ProfId2",$mysoc->country_code) != '-') { - print ''.$langs->transcountry("ProfId2",$mysoc->country_code).''; + print ''.$langs->transcountry("ProfId2",$mysoc->country_code).''; if (! empty($conf->global->MAIN_INFO_SIRET)) { print $conf->global->MAIN_INFO_SIRET; @@ -853,7 +853,7 @@ else if ($langs->transcountry("ProfId3",$mysoc->country_code) != '-') { - print ''.$langs->transcountry("ProfId3",$mysoc->country_code).''; + print ''.$langs->transcountry("ProfId3",$mysoc->country_code).''; if (! empty($conf->global->MAIN_INFO_APE)) { print $conf->global->MAIN_INFO_APE; @@ -869,7 +869,7 @@ else if ($langs->transcountry("ProfId4",$mysoc->country_code) != '-') { - print ''.$langs->transcountry("ProfId4",$mysoc->country_code).''; + print ''.$langs->transcountry("ProfId4",$mysoc->country_code).''; if (! empty($conf->global->MAIN_INFO_RCS)) { print $conf->global->MAIN_INFO_RCS; @@ -885,7 +885,7 @@ else if ($langs->transcountry("ProfId5",$mysoc->country_code) != '-') { - print ''.$langs->transcountry("ProfId5",$mysoc->country_code).''; + print ''.$langs->transcountry("ProfId5",$mysoc->country_code).''; if (! empty($conf->global->MAIN_INFO_PROFID5)) { print $conf->global->MAIN_INFO_PROFID5; @@ -901,7 +901,7 @@ else if ($langs->transcountry("ProfId6",$mysoc->country_code) != '-') { - print ''.$langs->transcountry("ProfId6",$mysoc->country_code).''; + print ''.$langs->transcountry("ProfId6",$mysoc->country_code).''; if (! empty($conf->global->MAIN_INFO_PROFID6)) { print $conf->global->MAIN_INFO_PROFID6; @@ -915,7 +915,7 @@ else // VAT - print ''.$langs->trans("VATIntra").''; + print ''.$langs->trans("VATIntra").''; print ''; if (! empty($conf->global->MAIN_INFO_TVAINTRA)) { @@ -952,7 +952,7 @@ else print ''; - print ''.$langs->trans("CompanyObject").'' . (! empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? nl2br($conf->global->MAIN_INFO_SOCIETE_OBJECT) : '') . ''; + print ''.$langs->trans("CompanyObject").'' . (! empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? nl2br($conf->global->MAIN_INFO_SOCIETE_OBJECT) : '') . ''; print ''; print '
'; @@ -968,7 +968,7 @@ else $var=true; - print ''.$langs->trans("FiscalMonthStart").''; + print ''.$langs->trans("FiscalMonthStart").''; $monthstart=(! empty($conf->global->SOCIETE_FISCAL_MONTH_START)) ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1; print dol_print_date(dol_mktime(12,0,0,$monthstart,1,2000,1),'%B','gm') . ''; diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index c7b943625ae..7d7b8a8510c 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -197,7 +197,7 @@ print "\n"; $var=false; print "\n"; -print ''."\n"; +print ''."\n"; print ''; print ''; print ''; @@ -251,7 +251,7 @@ if ($result) print "\n"; - print ''.$obj->name.''."\n"; + print ''.$obj->name.''."\n"; // Value print ''; diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index 043450bdda4..bc3ea402704 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -267,7 +267,7 @@ foreach ($dirmodels as $reldir) if ($module->isEnabled()) { - print ''.$module->nom."\n"; + print ''.$module->nom."\n"; print $module->info(); print ''; @@ -406,7 +406,7 @@ foreach ($dirmodels as $reldir) if ($modulequalified) { $var = !$var; - print ''; + print ''; print (empty($module->name)?$name:$module->name); print "\n"; if (method_exists($module,'info')) print $module->info($langs); @@ -503,7 +503,7 @@ print "\n"; $var=true; $var=! $var; -print ''; +print ''; print $langs->trans("FreeLegalTextOnContracts").' '.img_info($langs->trans("AddCRIfTooLong")).'
'; $variablename='CONTRACT_FREE_TEXT'; if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) @@ -520,7 +520,7 @@ print ''."\n"; //Use draft Watermark -print ''; +print ''; print $langs->trans("WatermarkOnDraftContractCards").''; print ''; print ''."\n"; diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index d1a2709e221..df127ed1a91 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -1571,13 +1571,13 @@ else if ($showemptyline) { - print '   '; + print '   '; $showemptyline=0; } $value=$tabname[$i]; - print ''; + print ''; if (! empty($tabcond[$i])) { print ''.$langs->trans($tablib[$i]).''; diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php index 746f7183123..eda3c6bd6ae 100644 --- a/htdocs/admin/expensereport.php +++ b/htdocs/admin/expensereport.php @@ -276,7 +276,7 @@ foreach ($dirmodels as $reldir) if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue; - print ''.$module->nom."\n"; + print ''.$module->nom."\n"; print $module->info(); print ''; @@ -412,7 +412,7 @@ foreach ($dirmodels as $reldir) if ($modulequalified) { - print ''; + print ''; print (empty($module->name)?$name:$module->name); print "\n"; if (method_exists($module,'info')) print $module->info($langs); @@ -506,7 +506,7 @@ print "\n"; $var=true; $var=! $var; -print ''; +print ''; print $langs->trans("FreeLegalTextOnExpenseReports").' ('.$langs->trans("AddCRIfTooLong").')
'; $variablename='EXPENSEREPORT_FREE_TEXT'; if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) @@ -523,7 +523,7 @@ print ''."\n"; //Use draft Watermark -print ''; +print ''; print $langs->trans("WatermarkOnDraftOrders").'
'; print ''; print ''."\n"; diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 65f8f31dd0a..4e9b007ee14 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -339,7 +339,7 @@ foreach ($dirmodels as $reldir) if ($module->isEnabled()) { $var = !$var; - print ''; + print ''; echo preg_replace('/\-.*$/','',preg_replace('/mod_facture_/','',preg_replace('/\.php$/','',$file))); print "\n"; @@ -530,7 +530,7 @@ foreach ($dirmodels as $reldir) if ($modulequalified) { $var = !$var; - print ''; + print ''; print (empty($module->name)?$name:$module->name); print "\n"; if (method_exists($module,'info')) print $module->info($langs); @@ -724,7 +724,7 @@ $var=! $var; print '
'; print ''; print ''; -print ''; +print ''; print $langs->trans("ForceInvoiceDate"); print ''; print $form->selectyesno("forcedate",$conf->global->FAC_FORCE_DATE_VALIDATION,1); @@ -737,7 +737,7 @@ $var=! $var; print ''; print ''; print ''; -print ''; +print ''; print $langs->trans("FreeLegalTextOnInvoices").' '.img_info($langs->trans("AddCRIfTooLong")).'
'; $variablename='INVOICE_FREE_TEXT'; if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) @@ -759,7 +759,7 @@ print '
'; print '
'; print ''; print ''; -print ''; +print ''; print $langs->trans("WatermarkOnDraftBill").''; print ''; print ''; @@ -800,7 +800,7 @@ print ''; print ' '; print "\n"; -print ''; +print ''; print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'
'; print ''; print "\n"; diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index cbcf925b907..6c73afcf8f5 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -311,7 +311,7 @@ foreach ($dirmodels as $reldir) if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue; - print ''.$module->nom."\n"; + print ''.$module->nom."\n"; print $module->info(); print ''; @@ -447,7 +447,7 @@ foreach ($dirmodels as $reldir) if ($modulequalified) { - print ''; + print ''; print (empty($module->name)?$name:$module->name); print "\n"; if (method_exists($module,'info')) print $module->info($langs); @@ -538,7 +538,7 @@ $var=! $var; print ''; print ''; print ''; -print ''; +print ''; print $langs->trans("FreeLegalTextOnInterventions").' '.img_info($langs->trans("AddCRIfTooLong")).'
'; $variablename='FICHINTER_FREE_TEXT'; if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) @@ -561,7 +561,7 @@ print '
'; print "
"; print ''; print ""; -print ''; +print ''; print $langs->trans("WatermarkOnDraftInterventionCards").''; print ''; print ''; @@ -573,7 +573,7 @@ $var=! $var; print ''; print ''; print ''; -print ''; +print ''; print $langs->trans("PrintProductsOnFichinter").' ('.$langs->trans("PrintProductsOnFichinterDetails").')'; print 'global->FICHINTER_PRINT_PRODUCTS) diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php index 7626148b9da..5a69a356777 100644 --- a/htdocs/admin/geoipmaxmind.php +++ b/htdocs/admin/geoipmaxmind.php @@ -106,7 +106,7 @@ print '\n"; -print ''.$langs->trans("PathToGeoIPMaxmindCountryDataFile").''; +print ''.$langs->trans("PathToGeoIPMaxmindCountryDataFile").''; print ''; if ($geointernal) print 'Using geoip PHP internal functions. Value must be '.geoip_db_filename(GEOIP_COUNTRY_EDITION).' or '.geoip_db_filename(GEOIP_CITY_EDITION_REV1).'
'; diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php index 5eeab2a2838..770d91d1d11 100644 --- a/htdocs/admin/ldap.php +++ b/htdocs/admin/ldap.php @@ -111,7 +111,7 @@ print "\n"; // Synchro utilisateurs/groupes active -print ''.$langs->trans("LDAPDnSynchroActive").''; +print ''.$langs->trans("LDAPDnSynchroActive").''; $arraylist=array(); $arraylist['0']=$langs->trans("No"); $arraylist['ldap2dolibarr']=$langs->trans("LDAPToDolibarr"); @@ -128,7 +128,7 @@ print ''; if (! empty($conf->societe->enabled)) { - print ''.$langs->trans("LDAPDnContactActive").''; + print ''.$langs->trans("LDAPDnContactActive").''; $arraylist=array(); $arraylist['0']=$langs->trans("No"); $arraylist['1']=$langs->trans("DolibarrToLDAP"); @@ -140,7 +140,7 @@ if (! empty($conf->societe->enabled)) if (! empty($conf->adherent->enabled)) { - print ''.$langs->trans("LDAPDnMemberActive").''; + print ''.$langs->trans("LDAPDnMemberActive").''; $arraylist=array(); $arraylist['0']=$langs->trans("No"); $arraylist['1']=$langs->trans("DolibarrToLDAP"); @@ -157,7 +157,7 @@ print "\n"; // Type -print ''.$langs->trans("Type").''; +print ''.$langs->trans("Type").''; $arraylist=array(); $arraylist['activedirectory']='Active Directory'; $arraylist['openldap']='OpenLdap'; @@ -167,7 +167,7 @@ print ' '; // Version -print ''.$langs->trans("Version").''; +print ''.$langs->trans("Version").''; $arraylist=array(); $arraylist['3']='Version 3'; $arraylist['2']='Version 2'; @@ -176,21 +176,21 @@ print ''.$langs->trans("LDAPServerProtocolVersion").''; // Serveur primaire -print ''; +print ''; print $langs->trans("LDAPPrimaryServer").''; print ''; print ''.$langs->trans("LDAPServerExample").''; // Serveur secondaire -print ''; +print ''; print $langs->trans("LDAPSecondaryServer").''; print ''; print ''.$langs->trans("LDAPServerExample").''; // Port -print ''.$langs->trans("LDAPServerPort").''; +print ''.$langs->trans("LDAPServerPort").''; if (! empty($conf->global->LDAP_SERVER_PORT)) { print ''; @@ -203,13 +203,13 @@ print ''.$langs->trans("LDAPServerPortExample").''; // DNserver -print ''.$langs->trans("LDAPServerDn").''; +print ''.$langs->trans("LDAPServerDn").''; print ''; print ''.$langs->trans("LDAPServerDnExample").''; // Utiliser TLS -print ''.$langs->trans("LDAPServerUseTLS").''; +print ''.$langs->trans("LDAPServerUseTLS").''; $arraylist=array(); $arraylist['0']=$langs->trans("No"); $arraylist['1']=$langs->trans("Yes"); @@ -222,13 +222,13 @@ print "\n"; // DNAdmin -print ''.$langs->trans("LDAPAdminDn").''; +print ''.$langs->trans("LDAPAdminDn").''; print ''; print ''.$langs->trans("LDAPAdminDnExample").''; // Pass -print ''.$langs->trans("LDAPPassword").''; +print ''.$langs->trans("LDAPPassword").''; if (! empty($conf->global->LDAP_ADMIN_PASS)) { print '';// je le met en visible pour test diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php index fdc25346863..27e32f8cd7c 100644 --- a/htdocs/admin/ldap_contacts.php +++ b/htdocs/admin/ldap_contacts.php @@ -126,7 +126,7 @@ print "\n"; // DN Pour les contacts -print ''.$langs->trans("LDAPContactDn").''; +print ''.$langs->trans("LDAPContactDn").''; print ''; print ''.$langs->trans("LDAPContactDnExample").''; print ' '; @@ -134,7 +134,7 @@ print ''; // List of object class used to define attributes in structure -print ''.$langs->trans("LDAPContactObjectClassList").''; +print ''.$langs->trans("LDAPContactObjectClassList").''; print ''; print ''.$langs->trans("LDAPContactObjectClassListExample").''; print ' '; @@ -153,7 +153,7 @@ print "\n"; // Common name -print ''.$langs->trans("LDAPFieldFullname").''; +print ''.$langs->trans("LDAPFieldFullname").''; print ''; print ''.$langs->trans("LDAPFieldFullnameExample").''; print 'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_FULLNAME?' checked':'').">"; @@ -161,7 +161,7 @@ print ''; // Name -print ''.$langs->trans("LDAPFieldName").''; +print ''.$langs->trans("LDAPFieldName").''; print ''; print ''.$langs->trans("LDAPFieldNameExample").''; print 'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_NAME?' checked':'').">"; @@ -169,7 +169,7 @@ print ''; // Firstname -print ''.$langs->trans("LDAPFieldFirstName").''; +print ''.$langs->trans("LDAPFieldFirstName").''; print ''; print ''.$langs->trans("LDAPFieldFirstNameExample").''; print 'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_FIRSTNAME?' checked':'').">"; @@ -177,7 +177,7 @@ print ''; // Company -print ''.$langs->trans("LDAPFieldCompany").''; +print ''.$langs->trans("LDAPFieldCompany").''; print ''; print ''.$langs->trans("LDAPFieldCompanyExample").''; print 'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_COMPANY?' checked':'').">"; @@ -185,7 +185,7 @@ print ''; // Mail -print ''.$langs->trans("LDAPFieldMail").''; +print ''.$langs->trans("LDAPFieldMail").''; print ''; print ''.$langs->trans("LDAPFieldMailExample").''; print 'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_MAIL?' checked':'').">"; @@ -193,7 +193,7 @@ print ''; // Phone pro -print ''.$langs->trans("LDAPFieldPhone").''; +print ''.$langs->trans("LDAPFieldPhone").''; print ''; print ''.$langs->trans("LDAPFieldPhoneExample").''; print 'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_PHONE?' checked':'').">"; @@ -201,7 +201,7 @@ print ''; // Phone home -print ''.$langs->trans("LDAPFieldHomePhone").''; +print ''.$langs->trans("LDAPFieldHomePhone").''; print ''; print ''.$langs->trans("LDAPFieldHomePhoneExample").''; print 'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_HOMEPHONE?' checked':'').">"; @@ -209,7 +209,7 @@ print ''; // Mobile -print ''.$langs->trans("LDAPFieldMobile").''; +print ''.$langs->trans("LDAPFieldMobile").''; print ''; print ''.$langs->trans("LDAPFieldMobileExample").''; print 'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_MOBILE?' checked':'').">"; @@ -217,7 +217,7 @@ print ''; // Skype -print ''.$langs->trans("LDAPFieldSkype").''; +print ''.$langs->trans("LDAPFieldSkype").''; print ''; print ''.$langs->trans("LDAPFieldSkypeExample").''; print 'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_SKYPE?' checked':'').">"; @@ -225,7 +225,7 @@ print ''; // Fax -print ''.$langs->trans("LDAPFieldFax").''; +print ''.$langs->trans("LDAPFieldFax").''; print ''; print ''.$langs->trans("LDAPFieldFaxExample").''; print 'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_FAX?' checked':'').">"; @@ -233,7 +233,7 @@ print ''; // Address -print ''.$langs->trans("LDAPFieldAddress").''; +print ''.$langs->trans("LDAPFieldAddress").''; print ''; print ''.$langs->trans("LDAPFieldAddressExample").''; print 'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_ADDRESS?' checked':'').">"; @@ -241,7 +241,7 @@ print ''; // ZIP -print ''.$langs->trans("LDAPFieldZip").''; +print ''.$langs->trans("LDAPFieldZip").''; print ''; print ''.$langs->trans("LDAPFieldZipExample").''; print 'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_ZIP?' checked':'').">"; @@ -249,7 +249,7 @@ print ''; // TOWN -print ''.$langs->trans("LDAPFieldTown").''; +print ''.$langs->trans("LDAPFieldTown").''; print ''; print ''.$langs->trans("LDAPFieldTownExample").''; print 'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_TOWN?' checked':'').">"; @@ -257,7 +257,7 @@ print ''; // COUNTRY -print ''.$langs->trans("LDAPFieldCountry").''; +print ''.$langs->trans("LDAPFieldCountry").''; print ''; print ' '; print 'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_COUNTRY?' checked':'').">"; diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php index 919ae1c0552..192b11bfd8d 100644 --- a/htdocs/admin/ldap_groups.php +++ b/htdocs/admin/ldap_groups.php @@ -117,7 +117,7 @@ print "\n"; // DN pour les groupes -print ''.$langs->trans("LDAPGroupDn").''; +print ''.$langs->trans("LDAPGroupDn").''; print ''; print ''.$langs->trans("LDAPGroupDnExample").''; print ' '; @@ -125,7 +125,7 @@ print ''; // List of object class used to define attributes in structure -print ''.$langs->trans("LDAPGroupObjectClassList").''; +print ''.$langs->trans("LDAPGroupObjectClassList").''; print ''; print ''.$langs->trans("LDAPGroupObjectClassListExample").''; print ' '; @@ -146,7 +146,7 @@ print "\n"; // Common name -print ''.$langs->trans("LDAPFieldName").''; +print ''.$langs->trans("LDAPFieldName").''; print ''; print ''.$langs->trans("LDAPFieldCommonNameExample").''; print 'global->LDAP_KEY_GROUPS && $conf->global->LDAP_KEY_GROUPS==$conf->global->LDAP_GROUP_FIELD_FULLNAME)?' checked':'').">"; @@ -154,7 +154,7 @@ print ''; // Name /* -print ''.$langs->trans("LDAPFieldName").''; +print ''.$langs->trans("LDAPFieldName").''; print ''; print ''.$langs->trans("LDAPFieldNameExample").''; print 'global->LDAP_KEY_GROUPS==$conf->global->LDAP_GROUP_FIELD_NAME?' checked':'').">"; @@ -163,7 +163,7 @@ print ''; // Description -print ''.$langs->trans("LDAPFieldDescription").''; +print ''.$langs->trans("LDAPFieldDescription").''; print ''; print ''.$langs->trans("LDAPFieldDescriptionExample").''; print 'global->LDAP_KEY_GROUPS && $conf->global->LDAP_KEY_GROUPS==$conf->global->LDAP_GROUP_FIELD_DESCRIPTION)?' checked':'').">"; @@ -171,7 +171,7 @@ print ''; // User group -print ''.$langs->trans("LDAPFieldGroupMembers").''; +print ''.$langs->trans("LDAPFieldGroupMembers").''; print ''; print ''.$langs->trans("LDAPFieldGroupMembersExample").''; print 'global->LDAP_KEY_GROUPS && $conf->global->LDAP_KEY_GROUPS==$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS)?' checked':'').">"; diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php index ff09f233afd..8c7291c3dc4 100644 --- a/htdocs/admin/ldap_members.php +++ b/htdocs/admin/ldap_members.php @@ -143,7 +143,7 @@ print "\n"; // DN Pour les adherents -print ''.$langs->trans("LDAPMemberDn").''; +print ''.$langs->trans("LDAPMemberDn").''; print ''; print ''.$langs->trans("LDAPMemberDnExample").''; print ' '; @@ -151,7 +151,7 @@ print ''; // List of object class used to define attributes in structure -print ''.$langs->trans("LDAPMemberObjectClassList").''; +print ''.$langs->trans("LDAPMemberObjectClassList").''; print ''; print ''.$langs->trans("LDAPMemberObjectClassListExample").''; print ' '; @@ -159,7 +159,7 @@ print ''; // Filter, used to filter search -print ''.$langs->trans("LDAPFilterConnection").''; +print ''.$langs->trans("LDAPFilterConnection").''; print ''; print ''.$langs->trans("LDAPFilterConnectionExample").''; print ''; @@ -180,7 +180,7 @@ print "\n"; // Common name -print ''.$langs->trans("LDAPFieldFullname").''; +print ''.$langs->trans("LDAPFieldFullname").''; print ''; print ''.$langs->trans("LDAPFieldFullnameExample").''; print 'global->LDAP_KEY_MEMBERS && $conf->global->LDAP_KEY_MEMBERS==$conf->global->LDAP_MEMBER_FIELD_FULLNAME)?' checked':'').">"; @@ -188,7 +188,7 @@ print ''; // Name -print ''.$langs->trans("LDAPFieldName").''; +print ''.$langs->trans("LDAPFieldName").''; print ''; print ''.$langs->trans("LDAPFieldNameExample").''; print 'global->LDAP_KEY_MEMBERS && $conf->global->LDAP_KEY_MEMBERS==$conf->global->LDAP_MEMBER_FIELD_NAME)?' checked':'').">"; @@ -196,7 +196,7 @@ print ''; // Firstname -print ''.$langs->trans("LDAPFieldFirstName").''; +print ''.$langs->trans("LDAPFieldFirstName").''; print ''; print ''.$langs->trans("LDAPFieldFirstNameExample").''; print ' '; @@ -204,7 +204,7 @@ print ''; // Login unix -print ''.$langs->trans("LDAPFieldLoginUnix").''; +print ''.$langs->trans("LDAPFieldLoginUnix").''; print ''; print ''.$langs->trans("LDAPFieldLoginExample").''; print 'global->LDAP_KEY_MEMBERS && $conf->global->LDAP_KEY_MEMBERS==$conf->global->LDAP_MEMBER_FIELD_LOGIN)?' checked':'').">"; @@ -212,7 +212,7 @@ print ''; // Login samba -print ''.$langs->trans("LDAPFieldLoginSamba").''; +print ''.$langs->trans("LDAPFieldLoginSamba").''; print ''; print ''.$langs->trans("LDAPFieldLoginSambaExample").''; print 'global->LDAP_KEY_MEMBERS && $conf->global->LDAP_KEY_MEMBERS==$conf->global->LDAP_MEMBER_FIELD_LOGIN_SAMBA)?' checked':'').">"; @@ -220,7 +220,7 @@ print ''; // Password not crypted -print ''.$langs->trans("LDAPFieldPasswordNotCrypted").''; +print ''.$langs->trans("LDAPFieldPasswordNotCrypted").''; print ''; print ''.$langs->trans("LDAPFieldPasswordExample").''; print ' '; @@ -228,7 +228,7 @@ print ''; // Password crypted -print ''.$langs->trans("LDAPFieldPasswordCrypted").''; +print ''.$langs->trans("LDAPFieldPasswordCrypted").''; print ''; print ''.$langs->trans("LDAPFieldPasswordExample").''; print ' '; @@ -236,7 +236,7 @@ print ''; // Mail -print ''.$langs->trans("LDAPFieldMail").''; +print ''.$langs->trans("LDAPFieldMail").''; print ''; print ''.$langs->trans("LDAPFieldMailExample").''; print 'global->LDAP_KEY_MEMBERS && $conf->global->LDAP_KEY_MEMBERS==$conf->global->LDAP_MEMBER_FIELD_MAIL)?' checked':'').">"; @@ -244,7 +244,7 @@ print ''; // Phone pro -print ''.$langs->trans("LDAPFieldPhone").''; +print ''.$langs->trans("LDAPFieldPhone").''; print ''; print ''.$langs->trans("LDAPFieldPhoneExample").''; print ' '; @@ -252,7 +252,7 @@ print ''; // Phone perso -print ''.$langs->trans("LDAPFieldHomePhone").''; +print ''.$langs->trans("LDAPFieldHomePhone").''; print ''; print ''.$langs->trans("LDAPFieldHomePhoneExample").''; print ' '; @@ -260,7 +260,7 @@ print ''; // Mobile -print ''.$langs->trans("LDAPFieldMobile").''; +print ''.$langs->trans("LDAPFieldMobile").''; print ''; print ''.$langs->trans("LDAPFieldMobileExample").''; print ' '; @@ -268,7 +268,7 @@ print ''; // Skype -print ''.$langs->trans("LDAPFieldSkype").''; +print ''.$langs->trans("LDAPFieldSkype").''; print ''; print ''.$langs->trans("LDAPFieldSkypeExample").''; print ' '; @@ -276,7 +276,7 @@ print ''; // Fax -print ''.$langs->trans("LDAPFieldFax").''; +print ''.$langs->trans("LDAPFieldFax").''; print ''; print ''.$langs->trans("LDAPFieldFaxExample").''; print ' '; @@ -284,7 +284,7 @@ print ''; // Address -print ''.$langs->trans("LDAPFieldAddress").''; +print ''.$langs->trans("LDAPFieldAddress").''; print ''; print ''.$langs->trans("LDAPFieldAddressExample").''; print ' '; @@ -292,7 +292,7 @@ print ''; // ZIP -print ''.$langs->trans("LDAPFieldZip").''; +print ''.$langs->trans("LDAPFieldZip").''; print ''; print ''.$langs->trans("LDAPFieldZipExample").''; print ' '; @@ -300,7 +300,7 @@ print ''; // TOWN -print ''.$langs->trans("LDAPFieldTown").''; +print ''.$langs->trans("LDAPFieldTown").''; print ''; print ''.$langs->trans("LDAPFieldTownExample").''; print ' '; @@ -308,7 +308,7 @@ print ''; // COUNTRY -print ''.$langs->trans("LDAPFieldCountry").''; +print ''.$langs->trans("LDAPFieldCountry").''; print ''; print ' '; print ' '; @@ -316,7 +316,7 @@ print ''; // Description -print ''.$langs->trans("LDAPFieldDescription").''; +print ''.$langs->trans("LDAPFieldDescription").''; print ''; print ''.$langs->trans("LDAPFieldDescriptionExample").''; print ' '; @@ -324,7 +324,7 @@ print ''; // Public Note -print ''.$langs->trans("LDAPFieldNotePublic").''; +print ''.$langs->trans("LDAPFieldNotePublic").''; print ''; print ''.$langs->trans("LDAPFieldNotePublicExample").''; print ' '; @@ -332,7 +332,7 @@ print ''; // Birthday -print ''.$langs->trans("LDAPFieldBirthdate").''; +print ''.$langs->trans("LDAPFieldBirthdate").''; print ''; print ' '; print ' '; @@ -340,7 +340,7 @@ print ''; // Status -print ''.$langs->trans("LDAPFieldStatus").''; +print ''.$langs->trans("LDAPFieldStatus").''; print ''; print ' '; print ' '; @@ -348,7 +348,7 @@ print ''; // First subscription date -print ''.$langs->trans("LDAPFieldFirstSubscriptionDate").''; +print ''.$langs->trans("LDAPFieldFirstSubscriptionDate").''; print ''; print ' '; print ' '; @@ -356,7 +356,7 @@ print ''; // First subscription amount -print ''.$langs->trans("LDAPFieldFirstSubscriptionAmount").''; +print ''.$langs->trans("LDAPFieldFirstSubscriptionAmount").''; print ''; print ' '; print ' '; @@ -364,7 +364,7 @@ print ''; // Last subscription date -print ''.$langs->trans("LDAPFieldLastSubscriptionDate").''; +print ''.$langs->trans("LDAPFieldLastSubscriptionDate").''; print ''; print ' '; print ' '; @@ -372,7 +372,7 @@ print ''; // Last subscription amount -print ''.$langs->trans("LDAPFieldLastSubscriptionAmount").''; +print ''.$langs->trans("LDAPFieldLastSubscriptionAmount").''; print ''; print ' '; print ' '; @@ -380,7 +380,7 @@ print ''; // End last subscriptions -print ''.$langs->trans("LDAPFieldEndLastSubscription").''; +print ''.$langs->trans("LDAPFieldEndLastSubscription").''; print ''; print ' '; print ' '; diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php index cc99edfe3a7..79f34001a63 100644 --- a/htdocs/admin/ldap_users.php +++ b/htdocs/admin/ldap_users.php @@ -130,7 +130,7 @@ print "\n"; // DN Pour les utilisateurs -print ''.$langs->trans("LDAPUserDn").''; +print ''.$langs->trans("LDAPUserDn").''; print ''; print ''.$langs->trans("LDAPUserDnExample").''; print ' '; @@ -138,7 +138,7 @@ print ''; // List of object class used to define attributes in structure -print ''.$langs->trans("LDAPUserObjectClassList").''; +print ''.$langs->trans("LDAPUserObjectClassList").''; print ''; print ''.$langs->trans("LDAPUserObjectClassListExample").''; print ' '; @@ -146,7 +146,7 @@ print ''; // Filter, used to filter search -print ''.$langs->trans("LDAPFilterConnection").''; +print ''.$langs->trans("LDAPFilterConnection").''; print ''; print ''.$langs->trans("LDAPFilterConnectionExample").''; print ''; @@ -165,7 +165,7 @@ print "\n"; // Common name -print ''.$langs->trans("LDAPFieldFullname").''; +print ''.$langs->trans("LDAPFieldFullname").''; print ''; print ''.$langs->trans("LDAPFieldFullnameExample").''; print 'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_FULLNAME)?' checked':'').">"; @@ -173,7 +173,7 @@ print ''; // Name -print ''.$langs->trans("LDAPFieldName").''; +print ''.$langs->trans("LDAPFieldName").''; print ''; print ''.$langs->trans("LDAPFieldNameExample").''; print 'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_NAME)?' checked':'').">"; @@ -181,7 +181,7 @@ print ''; // Firstname -print ''.$langs->trans("LDAPFieldFirstName").''; +print ''.$langs->trans("LDAPFieldFirstName").''; print ''; print ''.$langs->trans("LDAPFieldFirstNameExample").''; print 'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_FIRSTNAME)?' checked':'').">"; @@ -189,7 +189,7 @@ print ''; // Login unix -print ''.$langs->trans("LDAPFieldLoginUnix").''; +print ''.$langs->trans("LDAPFieldLoginUnix").''; print ''; print ''.$langs->trans("LDAPFieldLoginExample").''; print 'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_LOGIN)?' checked':'').">"; @@ -197,7 +197,7 @@ print ''; // Login samba -print ''.$langs->trans("LDAPFieldLoginSamba").''; +print ''.$langs->trans("LDAPFieldLoginSamba").''; print ''; print ''.$langs->trans("LDAPFieldLoginSambaExample").''; print 'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_LOGIN_SAMBA)?' checked':'').">"; @@ -205,7 +205,7 @@ print ''; // Password not crypted -print ''.$langs->trans("LDAPFieldPasswordNotCrypted").''; +print ''.$langs->trans("LDAPFieldPasswordNotCrypted").''; print ''; print ''.$langs->trans("LDAPFieldPasswordExample").''; print 'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_PASSWORD)?' checked':'').">"; @@ -213,7 +213,7 @@ print ''; // Password crypted -print ''.$langs->trans("LDAPFieldPasswordCrypted").''; +print ''.$langs->trans("LDAPFieldPasswordCrypted").''; print ''; print ''.$langs->trans("LDAPFieldPasswordExample").''; print 'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_PASSWORD_CRYPTED)?' checked':'').">"; @@ -221,7 +221,7 @@ print ''; // Mail -print ''.$langs->trans("LDAPFieldMail").''; +print ''.$langs->trans("LDAPFieldMail").''; print ''; print ''.$langs->trans("LDAPFieldMailExample").''; print 'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_MAIL)?' checked':'').">"; @@ -229,7 +229,7 @@ print ''; // Phone -print ''.$langs->trans("LDAPFieldPhone").''; +print ''.$langs->trans("LDAPFieldPhone").''; print ''; print ''.$langs->trans("LDAPFieldPhoneExample").''; print 'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_PHONE)?' checked':'').">"; @@ -237,7 +237,7 @@ print ''; // Mobile -print ''.$langs->trans("LDAPFieldMobile").''; +print ''.$langs->trans("LDAPFieldMobile").''; print ''; print ''.$langs->trans("LDAPFieldMobileExample").''; print 'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_MOBILE)?' checked':'').">"; @@ -245,7 +245,7 @@ print ''; // Skype -print ''.$langs->trans("LDAPFieldSkype").''; +print ''.$langs->trans("LDAPFieldSkype").''; print ''; print ''.$langs->trans("LDAPFieldSkypeExample").''; print 'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_SKYPE)?' checked':'').">"; @@ -253,7 +253,7 @@ print ''; // Fax -print ''.$langs->trans("LDAPFieldFax").''; +print ''.$langs->trans("LDAPFieldFax").''; print ''; print ''.$langs->trans("LDAPFieldFaxExample").''; print 'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_FAX)?' checked':'').">"; @@ -261,7 +261,7 @@ print ''; // Title -print ''.$langs->trans("LDAPFieldTitle").''; +print ''.$langs->trans("LDAPFieldTitle").''; print ''; print ''.$langs->trans("LDAPFieldTitleExample").''; print 'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_TITLE)?' checked':'').">"; @@ -269,7 +269,7 @@ print ''; // Note -print ''.$langs->trans("Note").''; +print ''.$langs->trans("Note").''; print ''; print ''.$langs->trans("LDAPFieldDescriptionExample").''; print 'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_DESCRIPTION)?' checked':'').">"; @@ -277,7 +277,7 @@ print ''; // Sid -print ''.$langs->trans("LDAPFieldSid").''; +print ''.$langs->trans("LDAPFieldSid").''; print ''; print ''.$langs->trans("LDAPFieldSidExample").''; print 'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_SID)?' checked':'').">"; diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index 3dcefa65a11..1d4b5cee8d4 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -107,20 +107,20 @@ if ($action == 'edit') print ''.$langs->trans("Parameter").''.$langs->trans("Value").''; - print ''; + print ''; print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"),$langs->trans("ParameterActiveForNextInputOnly")); print ''; - print ''; + print ''; print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"),$langs->trans("ParameterActiveForNextInputOnly")); print ''; - print ''.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").''; + print ''.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").''; - print ''; + print ''; print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"),$langs->trans("ParameterActiveForNextInputOnly")); print ''; @@ -141,20 +141,20 @@ else print ''.$langs->trans("Parameter").''.$langs->trans("Value").''; - print ''; + print ''; print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"),$langs->trans("ParameterActiveForNextInputOnly")); print ''.$conf->global->MAIN_MAX_DECIMALS_UNIT.''; - print ''; + print ''; print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"),$langs->trans("ParameterActiveForNextInputOnly")); print ''.$conf->global->MAIN_MAX_DECIMALS_TOT.''; - print ''.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").''.$conf->global->MAIN_MAX_DECIMALS_SHOWN.''; + print ''.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").''.$conf->global->MAIN_MAX_DECIMALS_SHOWN.''; - print ''; + print ''; print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"),$langs->trans("ParameterActiveForNextInputOnly")); print ''.$conf->global->MAIN_ROUNDING_RULE_TOT.''; diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index 10d86f1b373..281f1934296 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -259,7 +259,7 @@ foreach ($dirmodels as $reldir) if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue; - print ''.$module->nom."\n"; + print ''.$module->nom."\n"; print $module->info(); print ''; @@ -399,7 +399,7 @@ foreach ($dirmodels as $reldir) if ($modulequalified) { - print ''; + print ''; print (empty($module->name)?$name:$module->name); print "\n"; if (method_exists($module,'info')) print $module->info($langs); @@ -483,7 +483,7 @@ $var=! $var; print ''; print ''; print ''; -print ''; +print ''; print $langs->trans("FreeLegalTextOnDeliveryReceipts").' ('.$langs->trans("AddCRIfTooLong").')
'; $variablename='DELIVERY_FREE_TEXT'; if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php index ebb49e8385e..972b7ee73a6 100644 --- a/htdocs/admin/mailing.php +++ b/htdocs/admin/mailing.php @@ -114,21 +114,21 @@ print ''.$langs->trans("Value").''; print "\n"; -print ''; +print ''; print $langs->trans("MailingEMailFrom").''; print ''; if (!empty($conf->global->MAILING_EMAIL_FROM) && ! isValidEmail($conf->global->MAILING_EMAIL_FROM)) print ' '.img_warning($langs->trans("BadEMail")); print ''; -print ''; +print ''; print $langs->trans("MailingEMailError").''; print ''; if (!empty($conf->global->MAILING_EMAIL_ERRORSTO) && ! isValidEmail($conf->global->MAILING_EMAIL_ERRORSTO)) print ' '.img_warning($langs->trans("BadEMail")); print ''; -print ''; +print ''; print $langs->trans("MailingDelay").''; print ''; print ''; @@ -136,7 +136,7 @@ print ''; // Constant to add salt into the unsubscribe and check read tag. // It is also used as a security key parameter. -print ''; +print ''; print $langs->trans("ActivateCheckReadKey").''; print ''; if (! empty($conf->use_javascript_ajax)) print ' '.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"'); diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 4bc7627ceca..219cd85c2fe 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -242,17 +242,17 @@ if ($action == 'edit') // Disable - print ''.$langs->trans("MAIN_DISABLE_ALL_MAILS").''; + print ''.$langs->trans("MAIN_DISABLE_ALL_MAILS").''; print $form->selectyesno('MAIN_DISABLE_ALL_MAILS',$conf->global->MAIN_DISABLE_ALL_MAILS,1); print ''; // Separator - print ' '; + print ' '; // Method - print ''.$langs->trans("MAIN_MAIL_SENDMODE").''; + print ''.$langs->trans("MAIN_MAIL_SENDMODE").''; // SuperAdministrator access only if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity)) @@ -271,7 +271,7 @@ if ($action == 'edit') // Host server - print ''; + print ''; if (! $conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail') { print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike"); @@ -304,7 +304,7 @@ if ($action == 'edit') // Port - print ''; + print ''; if (! $conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail') { print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike"); @@ -377,7 +377,7 @@ if ($action == 'edit') // TLS - print ''.$langs->trans("MAIN_MAIL_EMAIL_TLS").''; + print ''.$langs->trans("MAIN_MAIL_EMAIL_TLS").''; if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) { if (function_exists('openssl_open')) @@ -391,7 +391,7 @@ if ($action == 'edit') // STARTTLS - print ''.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").''; + print ''.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").''; if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) { if (function_exists('openssl_open')) @@ -405,11 +405,11 @@ if ($action == 'edit') // Separator - print ' '; + print ' '; // From - print ''.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).''; + print ''.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).''; print ''; @@ -425,17 +425,17 @@ if ($action == 'edit') // Separator - print ' '; + print ' '; // From - print ''.$langs->trans("MAIN_MAIL_ERRORS_TO").''; + print ''.$langs->trans("MAIN_MAIL_ERRORS_TO").''; print ''; // Autocopy to - print ''.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").''; + print ''.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").''; print ''; @@ -466,15 +466,15 @@ else // Disable - print ''.$langs->trans("MAIN_DISABLE_ALL_MAILS").''.yn($conf->global->MAIN_DISABLE_ALL_MAILS).''; + print ''.$langs->trans("MAIN_DISABLE_ALL_MAILS").''.yn($conf->global->MAIN_DISABLE_ALL_MAILS).''; // Separator - print ' '; + print ' '; // Method - print ''.$langs->trans("MAIN_MAIL_SENDMODE").''; + print ''.$langs->trans("MAIN_MAIL_SENDMODE").''; $text=$listofmethods[$conf->global->MAIN_MAIL_SENDMODE]; if (empty($text)) $text=$langs->trans("Undefined").img_warning(); print $text; @@ -484,41 +484,41 @@ else if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail')) { - print ''.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").''.$langs->trans("SeeLocalSendMailSetup").''; + print ''.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").''.$langs->trans("SeeLocalSendMailSetup").''; } else { - print ''.$langs->trans("MAIN_MAIL_SMTP_SERVER",ini_get('SMTP')?ini_get('SMTP'):$langs->transnoentities("Undefined")).''.(! empty($conf->global->MAIN_MAIL_SMTP_SERVER)?$conf->global->MAIN_MAIL_SMTP_SERVER:'').''; + print ''.$langs->trans("MAIN_MAIL_SMTP_SERVER",ini_get('SMTP')?ini_get('SMTP'):$langs->transnoentities("Undefined")).''.(! empty($conf->global->MAIN_MAIL_SMTP_SERVER)?$conf->global->MAIN_MAIL_SMTP_SERVER:'').''; } // Port if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail')) { - print ''.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").''.$langs->trans("SeeLocalSendMailSetup").''; + print ''.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").''.$langs->trans("SeeLocalSendMailSetup").''; } else { - print ''.$langs->trans("MAIN_MAIL_SMTP_PORT",ini_get('smtp_port')?ini_get('smtp_port'):$langs->transnoentities("Undefined")).''.(! empty($conf->global->MAIN_MAIL_SMTP_PORT)?$conf->global->MAIN_MAIL_SMTP_PORT:'').''; + print ''.$langs->trans("MAIN_MAIL_SMTP_PORT",ini_get('smtp_port')?ini_get('smtp_port'):$langs->transnoentities("Undefined")).''.(! empty($conf->global->MAIN_MAIL_SMTP_PORT)?$conf->global->MAIN_MAIL_SMTP_PORT:'').''; } // SMTPS ID if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))) { - print ''.$langs->trans("MAIN_MAIL_SMTPS_ID").''.$conf->global->MAIN_MAIL_SMTPS_ID.''; + print ''.$langs->trans("MAIN_MAIL_SMTPS_ID").''.$conf->global->MAIN_MAIL_SMTPS_ID.''; } // SMTPS PW if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))) { - print ''.$langs->trans("MAIN_MAIL_SMTPS_PW").''.preg_replace('/./','*',$conf->global->MAIN_MAIL_SMTPS_PW).''; + print ''.$langs->trans("MAIN_MAIL_SMTPS_PW").''.preg_replace('/./','*',$conf->global->MAIN_MAIL_SMTPS_PW).''; } // TLS - print ''.$langs->trans("MAIN_MAIL_EMAIL_TLS").''; + print ''.$langs->trans("MAIN_MAIL_EMAIL_TLS").''; if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))) { if (function_exists('openssl_open')) @@ -532,7 +532,7 @@ else // STARTTLS - print ''.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").''; + print ''.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").''; if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))) { if (function_exists('openssl_open')) @@ -546,11 +546,11 @@ else // Separator - print ' '; + print ' '; // From - print ''.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).''; + print ''.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).''; print ''.$conf->global->MAIN_MAIL_EMAIL_FROM; if (! empty($conf->global->MAIN_MAIL_EMAIL_FROM) && ! isValidEmail($conf->global->MAIN_MAIL_EMAIL_FROM)) print img_warning($langs->trans("ErrorBadEMail")); print ''; @@ -568,18 +568,18 @@ else // Separator - print ' '; + print ' '; // Errors To - print ''.$langs->trans("MAIN_MAIL_ERRORS_TO").''; + print ''.$langs->trans("MAIN_MAIL_ERRORS_TO").''; print ''.$conf->global->MAIN_MAIL_ERRORS_TO; if (! empty($conf->global->MAIN_MAIL_ERRORS_TO) && ! isValidEmail($conf->global->MAIN_MAIL_ERRORS_TO)) print img_warning($langs->trans("ErrorBadEMail")); print ''; // Autocopy to - print ''.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").''; + print ''.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").''; print ''; if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) { diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php index 506bc5fb2d8..ddfb4d0cd62 100644 --- a/htdocs/admin/menus.php +++ b/htdocs/admin/menus.php @@ -180,7 +180,7 @@ if ($action == 'edit') // Menu top - print ''.$langs->trans("DefaultMenuManager").''; + print ''.$langs->trans("DefaultMenuManager").''; print ''; $formadmin->select_menu(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED, 'MAIN_MENU_STANDARD', $dirstandard, empty($conf->global->MAIN_MENU_STANDARD_FORCED)?'':' disabled'); print ''; @@ -191,7 +191,7 @@ if ($action == 'edit') // Menu smartphone - print ''.$langs->trans("DefaultMenuSmartphoneManager").''; + print ''.$langs->trans("DefaultMenuSmartphoneManager").''; print ''; $formadmin->select_menu(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED, 'MAIN_MENU_SMARTPHONE', array_merge($dirstandard,$dirsmartphone), empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?'':' disabled'); print ''; @@ -218,7 +218,7 @@ else print ''; - print ''.$langs->trans("DefaultMenuManager").''; + print ''.$langs->trans("DefaultMenuManager").''; print ''; $filelib=preg_replace('/.php$/i','',(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED)); print $filelib; diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php index 9d75070a956..c82e64d48ea 100644 --- a/htdocs/admin/notification.php +++ b/htdocs/admin/notification.php @@ -136,7 +136,7 @@ print ''.$langs->trans("Parameter").''; print ''.$langs->trans("Value").''; print "\n"; -print ''; +print ''; print $langs->trans("NotificationEMailFrom").''; print ''; print ''; diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php index 93f7c301519..a5166ec69f2 100644 --- a/htdocs/admin/payment.php +++ b/htdocs/admin/payment.php @@ -177,7 +177,7 @@ foreach ($dirmodels as $reldir) if ($module->isEnabled()) { $var = !$var; - print ''; + print ''; echo preg_replace('/\-.*$/','',preg_replace('/mod_payment_/','',preg_replace('/\.php$/','',$file))); print "\n"; @@ -263,7 +263,7 @@ print "\n"; // Allow payments on different thirdparties bills but same parent company $var=! $var; -print ''; +print ''; print $langs->trans("PaymentOnDifferentThirdBills"); print ''; print $form->selectyesno("FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS",$conf->global->FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS,1); @@ -273,7 +273,7 @@ print "\n"; // Add js auto fill amount on paiement form /* always on now $var=! $var; -print ''; +print ''; print $langs->trans("JSOnPaimentBill"); print ''; print $form->selectyesno("INVOICE_AUTO_FILLJS",$conf->global->INVOICE_AUTO_FILLJS,1); diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index 500281e0a10..b0c32a344ff 100644 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -129,7 +129,7 @@ if ($action == 'edit') // Edit // Show pdf format - print ''.$langs->trans("DictionaryPaperFormat").''; + print ''.$langs->trans("DictionaryPaperFormat").''; print $formadmin->select_paper_format($selected,'MAIN_PDF_FORMAT'); print ''; @@ -146,7 +146,7 @@ if ($action == 'edit') // Edit // Hide VAT Intra on address - print ''.$langs->trans("ShowVATIntaInAddress").''; + print ''.$langs->trans("ShowVATIntaInAddress").''; print $form->selectyesno('MAIN_TVAINTRA_NOT_IN_ADDRESS',(! empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))?$conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS:0,1); print ''; @@ -163,7 +163,7 @@ if ($action == 'edit') // Edit } if ($pid1) { - print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid1.''; + print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid1.''; print $form->selectyesno('MAIN_PROFID1_IN_ADDRESS',isset($conf->global->MAIN_PROFID1_IN_ADDRESS)?$conf->global->MAIN_PROFID1_IN_ADDRESS:0,1,$noCountryCode); print ''; } @@ -181,7 +181,7 @@ if ($action == 'edit') // Edit } if ($pid2) { - print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid2.''; + print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid2.''; print $form->selectyesno('MAIN_PROFID2_IN_ADDRESS',isset($conf->global->MAIN_PROFID2_IN_ADDRESS)?$conf->global->MAIN_PROFID2_IN_ADDRESS:0,1,$noCountryCode); print ''; } @@ -199,7 +199,7 @@ if ($action == 'edit') // Edit } if ($pid3) { - print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid3.''; + print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid3.''; print $form->selectyesno('MAIN_PROFID3_IN_ADDRESS',isset($conf->global->MAIN_PROFID3_IN_ADDRESS)?$conf->global->MAIN_PROFID3_IN_ADDRESS:0,1,$noCountryCode); print ''; } @@ -217,7 +217,7 @@ if ($action == 'edit') // Edit } if ($pid4) { - print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid4.''; + print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid4.''; print $form->selectyesno('MAIN_PROFID4_IN_ADDRESS',isset($conf->global->MAIN_PROFID4_IN_ADDRESS)?$conf->global->MAIN_PROFID4_IN_ADDRESS:0,1,$noCountryCode); print ''; } @@ -234,36 +234,36 @@ if ($action == 'edit') // Edit // Hide any PDF informations - print ''.$langs->trans("HideAnyVATInformationOnPDF").''; + print ''.$langs->trans("HideAnyVATInformationOnPDF").''; print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))?$conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT:0,1); print ''; //Desc - print ''.$langs->trans("HideDescOnPDF").''; + print ''.$langs->trans("HideDescOnPDF").''; print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DESC',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC:0,1); print ''; //Ref - print ''.$langs->trans("HideRefOnPDF").''; + print ''.$langs->trans("HideRefOnPDF").''; print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_REF',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF:0,1); print ''; //Details - print ''.$langs->trans("HideDetailsOnPDF").''; + print ''.$langs->trans("HideDetailsOnPDF").''; print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS:0,1); print ''; // Place customer adress to the ISO location - print ''.$langs->trans("PlaceCustomerAddressToIsoLocation").''; + print ''.$langs->trans("PlaceCustomerAddressToIsoLocation").''; print $form->selectyesno('MAIN_PDF_USE_ISO_LOCATION',(! empty($conf->global->MAIN_PDF_USE_ISO_LOCATION))?$conf->global->MAIN_PDF_USE_ISO_LOCATION:0,1); print ''; - print ''.$langs->trans("ShowDetailsInPDFPageFoot").''; + print ''.$langs->trans("ShowDetailsInPDFPageFoot").''; print $form->selectarray('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS', $arraydetailsforpdffoot, $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS); print ''; @@ -288,7 +288,7 @@ else // Show // Show pdf format - print ''.$langs->trans("DictionaryPaperFormat").''; + print ''.$langs->trans("DictionaryPaperFormat").''; $pdfformatlabel=''; if (empty($conf->global->MAIN_PDF_FORMAT)) @@ -324,7 +324,7 @@ else // Show // Hide Intra VAT on address - print ''.$langs->trans("ShowVATIntaInAddress").''; + print ''.$langs->trans("ShowVATIntaInAddress").''; print yn($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS,1); print ''; @@ -341,7 +341,7 @@ else // Show } if ($pid1) { - print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid1.''; + print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid1.''; print yn($conf->global->MAIN_PROFID1_IN_ADDRESS,1); print ''; } @@ -359,7 +359,7 @@ else // Show } if ($pid2) { - print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid2.''; + print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid2.''; print yn($conf->global->MAIN_PROFID2_IN_ADDRESS,1); print ''; } @@ -377,7 +377,7 @@ else // Show } if ($pid3) { - print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid3.''; + print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid3.''; print yn($conf->global->MAIN_PROFID3_IN_ADDRESS,1); print ''; } @@ -395,7 +395,7 @@ else // Show } if ($pid4) { - print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid4.''; + print ''.$langs->trans("ShowProfIdInAddress").' - '.$pid4.''; print yn($conf->global->MAIN_PROFID4_IN_ADDRESS,1); print ''; } @@ -441,35 +441,35 @@ else // Show // Hide any PDF informations - print ''.$langs->trans("HideAnyVATInformationOnPDF").''; + print ''.$langs->trans("HideAnyVATInformationOnPDF").''; print yn($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT,1); print ''; //Desc - print ''.$langs->trans("HideDescOnPDF").''; + print ''.$langs->trans("HideDescOnPDF").''; print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC,1); print ''; //Ref - print ''.$langs->trans("HideRefOnPDF").''; + print ''.$langs->trans("HideRefOnPDF").''; print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF,1); print ''; //Details - print ''.$langs->trans("HideDetailsOnPDF").''; + print ''.$langs->trans("HideDetailsOnPDF").''; print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS,1); print ''; - print ''.$langs->trans("PlaceCustomerAddressToIsoLocation").''; + print ''.$langs->trans("PlaceCustomerAddressToIsoLocation").''; print yn($conf->global->MAIN_PDF_USE_ISO_LOCATION,1); print ''; - print ''.$langs->trans("ShowDetailsInPDFPageFoot").''; + print ''.$langs->trans("ShowDetailsInPDFPageFoot").''; print $arraydetailsforpdffoot[$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS]; print ''; @@ -493,7 +493,7 @@ else // Show if (! empty($dolibarr_pdf_force_fpdf)) { - print ''."\n"; + print ''."\n"; print 'dolibarr_pdf_force_fpdf'."\n"; print ''; print $dolibarr_pdf_force_fpdf; @@ -502,7 +502,7 @@ else // Show } - print ''."\n"; + print ''."\n"; print ''.$langs->trans("LibraryToBuildPDF").''."\n"; print ''; $i=0; diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index 1c557a83296..86108be0136 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -313,7 +313,7 @@ foreach ($dirmodels as $reldir) if ($modulequalified) { $var = !$var; - print ''; + print ''; print (empty($module->name)?$name:$module->name); print "\n"; if (method_exists($module,'info')) print $module->info($langs); diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index 0d041cad2b7..bff56b4f776 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -311,7 +311,7 @@ foreach ($dirmodels as $reldir) if ($module->isEnabled()) { - print ''.$module->nom."\n"; + print ''.$module->nom."\n"; print $module->info(); print ''; @@ -450,7 +450,7 @@ foreach ($dirmodels as $reldir) if ($modulequalified) { $var = !$var; - print ''; + print ''; print (empty($module->name)?$name:$module->name); print "\n"; if (method_exists($module,'info')) print $module->info($langs); @@ -562,7 +562,7 @@ $var=! $var; print ''; print ''; print ''; -print ''; +print ''; print $langs->trans("UseCustomerContactAsPropalRecipientIfExist"); print ''; print $form->selectyesno("value",$conf->global->PROPALE_USE_CUSTOMER_CONTACT_AS_RECIPIENT,1); @@ -576,7 +576,7 @@ $var=! $var; print ''; print ''; print ''; -print ''; +print ''; print $langs->trans("FreeLegalTextOnProposal").' '.img_info($langs->trans("AddCRIfTooLong")).'
'; $variablename='PROPOSAL_FREE_TEXT'; if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) @@ -598,7 +598,7 @@ print '
'; print "
"; print ''; print ""; -print ''; +print ''; print $langs->trans("WatermarkOnDraftProposal").''; print ''; print ''; @@ -610,7 +610,7 @@ print '
'; if ($conf->banque->enabled) { - print ''; + print ''; print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").' '; if (! empty($conf->use_javascript_ajax)) { @@ -632,7 +632,7 @@ if ($conf->banque->enabled) else { - print ''; + print ''; print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").' '.$langs->trans('NotAvailable').''; } */ @@ -668,7 +668,7 @@ print ''; print ' '; print "\n"; -print ''; +print ''; print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'
'; print ''; print "\n"; diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php index 449180d25da..4d0415dbd01 100644 --- a/htdocs/admin/security.php +++ b/htdocs/admin/security.php @@ -250,7 +250,7 @@ foreach ($arrayhandler as $key => $module) if ($module->isEnabled()) { $var = !$var; - print ''; + print ''; print ucfirst($key); print "\n"; print $module->getDescription().'
'; diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index 4227116eaea..faf05b7fb0f 100644 --- a/htdocs/admin/sms.php +++ b/htdocs/admin/sms.php @@ -176,30 +176,30 @@ if ($action == 'edit') // Disable - print ''.$langs->trans("MAIN_DISABLE_ALL_SMS").''; + print ''.$langs->trans("MAIN_DISABLE_ALL_SMS").''; print $form->selectyesno('MAIN_DISABLE_ALL_SMS',$conf->global->MAIN_DISABLE_ALL_SMS,1); print ''; // Separator - print ' '; + print ' '; // Method - print ''.$langs->trans("MAIN_SMS_SENDMODE").''; + print ''.$langs->trans("MAIN_SMS_SENDMODE").''; if (count($listofmethods)) print $form->selectarray('MAIN_SMS_SENDMODE',$listofmethods,$conf->global->MAIN_SMS_SENDMODE,1); else print ''.$langs->trans("None").''; print ''; // From - print ''.$langs->trans("MAIN_MAIL_SMS_FROM",$langs->transnoentities("Undefined")).''; + print ''.$langs->trans("MAIN_MAIL_SMS_FROM",$langs->transnoentities("Undefined")).''; print ''; // Autocopy to /* - print ''.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").''; + print ''.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").''; print ''; */ @@ -225,15 +225,15 @@ else // Disable - print ''.$langs->trans("MAIN_DISABLE_ALL_SMS").''.yn($conf->global->MAIN_DISABLE_ALL_SMS).''; + print ''.$langs->trans("MAIN_DISABLE_ALL_SMS").''.yn($conf->global->MAIN_DISABLE_ALL_SMS).''; // Separator - print ' '; + print ' '; // Method - print ''.$langs->trans("MAIN_SMS_SENDMODE").''; + print ''.$langs->trans("MAIN_SMS_SENDMODE").''; $text=$listofmethods[$conf->global->MAIN_SMS_SENDMODE]; if (empty($text)) $text=$langs->trans("Undefined").' '.img_warning(); print $text; @@ -241,14 +241,14 @@ else // From - print ''.$langs->trans("MAIN_MAIL_SMS_FROM",$langs->transnoentities("Undefined")).''; + print ''.$langs->trans("MAIN_MAIL_SMS_FROM",$langs->transnoentities("Undefined")).''; print ''.$conf->global->MAIN_MAIL_SMS_FROM; if (!empty($conf->global->MAIN_MAIL_SMS_FROM) && ! isValidPhone($conf->global->MAIN_MAIL_SMS_FROM)) print ' '.img_warning($langs->trans("ErrorBadPhone")); print ''; // Autocopy to /* - print ''.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").''; + print ''.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").''; print ''.$conf->global->MAIN_MAIL_AUTOCOPY_TO; if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO) && ! isValidEmail($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print img_warning($langs->trans("ErrorBadEMail")); print ''; diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php index e20b92be95e..2619951e1b5 100644 --- a/htdocs/admin/supplier_invoice.php +++ b/htdocs/admin/supplier_invoice.php @@ -251,7 +251,7 @@ foreach ($dirmodels as $reldir) if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue; - print ''.$module->nom."\n"; + print ''.$module->nom."\n"; print $module->info(); print ''; @@ -471,7 +471,7 @@ print ''.$langs->trans("Value").''; print ' '; print "\n"; -print ''; +print ''; print $langs->trans("FreeLegalTextOnInvoices").' '.img_info($langs->trans("AddCRIfTooLong")).'
'; $variablename='SUPPLIER_INVOICE_FREE_TEXT'; if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) @@ -505,7 +505,7 @@ print ''; print ' '; print "\n"; -print ''; +print ''; print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'
'; print ''; print "\n"; diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php index fe7d06ed6a8..d54f0e367aa 100644 --- a/htdocs/admin/supplier_order.php +++ b/htdocs/admin/supplier_order.php @@ -280,7 +280,7 @@ foreach ($dirmodels as $reldir) if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue; - print ''.$module->nom."\n"; + print ''.$module->nom."\n"; print $module->info(); print ''; @@ -493,7 +493,7 @@ print "\n"; $var=false; //if ($conf->global->MAIN_FEATURES_LEVEL > 0) //{ - print ''; + print ''; print $form->textwithpicto($langs->trans("UseDoubleApproval"), $langs->trans("Use3StepsApproval"), 1, 'help').'
'; print $langs->trans("IfSetToYesDontForgetPermission"); print ''; @@ -509,7 +509,7 @@ $var=false; if ($conf->banque->enabled) { - print ''; + print ''; print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").' '; if (! empty($conf->use_javascript_ajax)) { @@ -531,12 +531,12 @@ if ($conf->banque->enabled) else { - print ''; + print ''; print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").' '.$langs->trans('NotAvailable').''; } */ -print ''; +print ''; print $langs->trans("FreeLegalTextOnOrders").' '.img_info($langs->trans("AddCRIfTooLong")).'
'; $variablename='SUPPLIER_ORDER_FREE_TEXT'; if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) @@ -571,7 +571,7 @@ print ''; print ' '; print "\n"; -print ''; +print ''; print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'
'; print ''; print "\n"; diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php index 14e13789887..40caa94c8a8 100644 --- a/htdocs/admin/supplier_payment.php +++ b/htdocs/admin/supplier_payment.php @@ -279,7 +279,7 @@ foreach ($dirmodels as $reldir) if ($module->isEnabled()) { $var = !$var; - print ''; + print ''; echo preg_replace('/\-.*$/','',preg_replace('/mod_supplier_payment_/','',preg_replace('/\.php$/','',$file))); print "\n"; diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php index 621dd302ccb..703fbc482e9 100644 --- a/htdocs/admin/supplier_proposal.php +++ b/htdocs/admin/supplier_proposal.php @@ -289,7 +289,7 @@ foreach ($dirmodels as $reldir) if ($module->isEnabled()) { - print ''.$module->nom."\n"; + print ''.$module->nom."\n"; print $module->info(); print ''; @@ -427,7 +427,7 @@ foreach ($dirmodels as $reldir) if ($modulequalified) { $var = !$var; - print ''; + print ''; print (empty($module->name)?$name:$module->name); print "\n"; if (method_exists($module,'info')) print $module->info($langs); @@ -527,7 +527,7 @@ $var=! $var; print '
'; print ''; print ''; -print ''; +print ''; print $langs->trans("FreeLegalTextOnSupplierProposal").' '.img_info($langs->trans("AddCRIfTooLong")).'
'; $variablename='SUPPLIER_PROPOSAL_FREE_TEXT'; if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) @@ -549,7 +549,7 @@ print '
'; print "
"; print ''; print ""; -print ''; +print ''; print $langs->trans("WatermarkOnDraftSupplierProposal").''; print ''; print ''; @@ -560,7 +560,7 @@ print '
'; if ($conf->banque->enabled) { - print ''; + print ''; print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").' '; if (! empty($conf->use_javascript_ajax)) { @@ -582,7 +582,7 @@ if ($conf->banque->enabled) else { - print ''; + print ''; print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").' '.$langs->trans('NotAvailable').''; } diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index d8927c552b6..71d06ae8e64 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -258,7 +258,7 @@ print '\n"; $var=true; -print ''.$langs->trans("SyslogLevel").''; +print ''.$langs->trans("SyslogLevel").''; print ''; print ''; diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php index 0f6da77fa43..0d1dbf2de53 100644 --- a/htdocs/cashdesk/admin/cashdesk.php +++ b/htdocs/cashdesk/admin/cashdesk.php @@ -101,26 +101,26 @@ print ''; print ''.$langs->trans("Parameters").''.$langs->trans("Value").''; print "\n"; -print ''.$langs->trans("CashDeskThirdPartyForSell").''; +print ''.$langs->trans("CashDeskThirdPartyForSell").''; print ''; print $form->select_company($conf->global->CASHDESK_ID_THIRDPARTY,'socid','s.client in (1,3)',1,0,1,array(),0); print ''; if (! empty($conf->banque->enabled)) { - print ''.$langs->trans("CashDeskBankAccountForSell").''; + print ''.$langs->trans("CashDeskBankAccountForSell").''; print ''; $form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CASH,'CASHDESK_ID_BANKACCOUNT_CASH',0,"courant=2",1); print ''; - print ''.$langs->trans("CashDeskBankAccountForCheque").''; + print ''.$langs->trans("CashDeskBankAccountForCheque").''; print ''; $form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE,'CASHDESK_ID_BANKACCOUNT_CHEQUE',0,"courant=1",1); print ''; - print ''.$langs->trans("CashDeskBankAccountForCB").''; + print ''.$langs->trans("CashDeskBankAccountForCB").''; print ''; $form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CB,'CASHDESK_ID_BANKACCOUNT_CB',0,"courant=1",1); print ''; @@ -129,7 +129,7 @@ if (! empty($conf->banque->enabled)) if (! empty($conf->stock->enabled)) { - print ''.$langs->trans("CashDeskDoNotDecreaseStock").''; // Force warehouse (this is not a default value) + print ''.$langs->trans("CashDeskDoNotDecreaseStock").''; // Force warehouse (this is not a default value) print ''; if (empty($conf->productbatch->enabled)) { print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK',$conf->global->CASHDESK_NO_DECREASE_STOCK,1); @@ -146,7 +146,7 @@ if (! empty($conf->stock->enabled)) $disabled=$conf->global->CASHDESK_NO_DECREASE_STOCK; - print ''.$langs->trans("CashDeskIdWareHouse").''; // Force warehouse (this is not a default value) + print ''.$langs->trans("CashDeskIdWareHouse").''; // Force warehouse (this is not a default value) print ''; if (! $disabled) { @@ -163,7 +163,7 @@ if (! empty($conf->stock->enabled)) if (! empty($conf->service->enabled)) { $var=! $var; - print ''; + print ''; print $langs->trans("CashdeskShowServices"); print ''; print $form->selectyesno("CASHDESK_SERVICES",$conf->global->CASHDESK_SERVICES,1); @@ -174,7 +174,7 @@ if (! empty($conf->service->enabled)) if (! empty($conf->receiptprinter->enabled)) { $var=! $var; - print ''; + print ''; print $langs->trans("DolibarrReceiptPrinter").' ('.$langs->trans("FeatureNotYetAvailable").')'; print ''; print $form->selectyesno("CASHDESK_DOLIBAR_RECEIPT_PRINTER",$conf->global->CASHDESK_DOLIBAR_RECEIPT_PRINTER,1); diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 848aa2c05a5..3309598a27d 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -168,7 +168,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) { $obj = $db->fetch_object($resql); - print ''; + print ''; $propalstatic->id=$obj->rowid; $propalstatic->ref=$obj->ref; $propalstatic->ref_client=$obj->ref_client; @@ -199,7 +199,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) else { - print ''.$langs->trans("NoProposal").''; + print ''.$langs->trans("NoProposal").''; } print "
"; @@ -249,7 +249,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos { $obj = $db->fetch_object($resql); - print ''; + print ''; $supplierproposalstatic->id=$obj->rowid; $supplierproposalstatic->ref=$obj->ref; $supplierproposalstatic->total_ht = $obj->total_ht; @@ -279,7 +279,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos else { - print ''.$langs->trans("NoProposal").''; + print ''.$langs->trans("NoProposal").''; } print "
"; @@ -328,7 +328,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire) { $obj = $db->fetch_object($resql); - print ''; + print ''; $orderstatic->id=$obj->rowid; $orderstatic->ref=$obj->ref; $orderstatic->ref_client=$obj->ref_client; @@ -359,7 +359,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire) else { - print ''.$langs->trans("NoOrder").''; + print ''.$langs->trans("NoOrder").''; } print "
"; @@ -409,7 +409,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande { $obj = $db->fetch_object($resql); - print ''; + print ''; $supplierorderstatic->id=$obj->rowid; $supplierorderstatic->ref=$obj->ref; $supplierorderstatic->ref_supplier=$obj->ref_suppliert; @@ -440,7 +440,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande else { - print ''.$langs->trans("NoSupplierOrder").''; + print ''.$langs->trans("NoSupplierOrder").''; } print "
"; @@ -519,7 +519,7 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire) } else { - print ''.$langs->trans("None").''; + print ''.$langs->trans("None").''; } print "
"; } @@ -573,7 +573,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->societe->lire) } else { - print ''.$langs->trans("None").''; + print ''.$langs->trans("None").''; } print '
'; } diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index b114cf92895..52eacf6c115 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -57,10 +57,10 @@ print '
'; print ''; print ''; print ''; - print ''; print ''; - print ''; print "
'.$langs->trans("SearchAMailing").'
'; + print '
'; print $langs->trans("Ref").':
'; + print '
'; print $langs->trans("Other").':

\n"; diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index 07779753c0d..145d1891be3 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -66,7 +66,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele print ''; print ''; print ''; - print ''; print "
'.$langs->trans("Search").'
'; + print '
'; print $langs->trans("Proposal").':

\n"; } diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index b28f86bc412..2364672ccf9 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -58,9 +58,9 @@ if (! empty($conf->propal->enabled)) print ''; print ''; print ''; - print ''; - print ''; + print ''; print ''; print "
'.$langs->trans("SearchAProposal").'
'; + print '
'; print $langs->trans("Ref").':
'.$langs->trans("Other").':
'.$langs->trans("Other").':

\n"; } @@ -97,7 +97,7 @@ if ($resql) { $obj = $db->fetch_object($resql); - print ''; + print ''; print ''; print img_action($langs->trans("Show"),$obj->id).' '; print $langs->trans("StatusProspect".$obj->id); @@ -141,7 +141,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire) { $obj = $db->fetch_object($resql); - print ''; + print ''; print ''.img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.''; print ''; print price($obj->price); @@ -206,7 +206,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire) { $obj = $db->fetch_object($resql); - print ''; + print ''; print ''; print img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.''; @@ -264,7 +264,7 @@ if ($resql) { $obj = $db->fetch_object($resql); - print ''; + print ''; $companystatic->id=$obj->socid; $companystatic->name=$obj->name; $companystatic->client=$obj->client; diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index a1a4d33bfb1..9f7f36f78ca 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -70,7 +70,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele print ''; print ''; print ''; - print ''; print "
'.$langs->trans("Search").'
'; + print '
'; print $langs->trans("CustomerOrder").':

\n"; } @@ -221,7 +221,7 @@ if (! empty($conf->commande->enabled)) else { - print ''.$langs->trans("NoOrder").''; + print ''.$langs->trans("NoOrder").''; } print "
"; } diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index d840a6abf51..a92b23fc617 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -576,7 +576,7 @@ foreach ($accounts as $key=>$type) $i++; } -if (! $found) print ''.$langs->trans("None").''; +if (! $found) print ''.$langs->trans("None").''; // Show total line if (isset($totalarray['totalbalancefield']) && $lastcurrencycode != 'various') // If there is several currency, $lastcurrencycode is set to 'various' before diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php index 9e26d532348..73e94a3d197 100644 --- a/htdocs/compta/bank/transfer.php +++ b/htdocs/compta/bank/transfer.php @@ -168,7 +168,7 @@ print ''.$langs->trans("TransferFrom").''.$langs->trans("TransferTo print ''; $var=false; -print ''; +print ''; $form->select_comptes($account_from,'account_from',0,'',1); print ""; diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index 0748616f255..bb6d58293b6 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -187,7 +187,7 @@ if ($result) } else { - print ''.$langs->trans("None").''; + print ''.$langs->trans("None").''; } print '
'; } diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index a73265288a2..321c2456ddd 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -172,7 +172,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) while ($i < $num) { $obj = $db->fetch_object($resql); - print ''; + print ''; $facturestatic->ref=$obj->facnumber; $facturestatic->id=$obj->rowid; $facturestatic->total_ht=$obj->total_ht; @@ -202,7 +202,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) } else { - print ''.$langs->trans("NoInvoice").''; + print ''.$langs->trans("NoInvoice").''; } print "
"; $db->free($resql); @@ -388,7 +388,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) { $colspan=5; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++; - print ''.$langs->trans("NoInvoice").''; + print ''.$langs->trans("NoInvoice").''; } print '
'; $db->free($resql); @@ -443,7 +443,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- while ($i < $num) { $obj = $db->fetch_object($resql); - print ''; + print ''; $facstatic->ref=$obj->ref; $facstatic->id = $obj->rowid; $facstatic->total_ht = $obj->total_ht; @@ -475,7 +475,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- { $colspan=5; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++; - print ''.$langs->trans("NoInvoice").''; + print ''.$langs->trans("NoInvoice").''; } print '
'; } @@ -545,7 +545,7 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire) } else { - print ''.$langs->trans("None").''; + print ''.$langs->trans("None").''; } print '
'; } @@ -616,7 +616,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) } else { - print ''.$langs->trans("None").''; + print ''.$langs->trans("None").''; } print "
"; $db->free($resql); @@ -845,7 +845,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) { $colspan=6; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++; - print ''.$langs->trans("NoInvoice").''; + print ''.$langs->trans("NoInvoice").''; } print '

'; $db->free($resql); @@ -907,7 +907,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- { $obj = $db->fetch_object($resql); - print ''; + print ''; $facstatic->ref=$obj->ref; $facstatic->id = $obj->rowid; $facstatic->total_ht = $obj->total_ht; @@ -946,7 +946,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- { $colspan=6; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++; - print ''.$langs->trans("NoInvoice").''; + print ''.$langs->trans("NoInvoice").''; } print '

'; } diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index 2997667ab60..32257a71a0f 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -76,14 +76,14 @@ $var=true; print ''; print ''; -print ''; +print ''; print ''; -print ''; +print ''; print '
'.$langs->trans("Statistics").'
'.$langs->trans("NbOfInvoiceToWithdraw").'
'.$langs->trans("NbOfInvoiceToWithdraw").''; print ''; print $bprev->NbFactureAPrelever(); print ''; print '
'.$langs->trans("AmountToWithdraw").'
'.$langs->trans("AmountToWithdraw").''; print price($bprev->SommeAPrelever(),'','',1,-1,-1,'auto'); print '

'; @@ -130,7 +130,7 @@ if ($resql) $alreadypayed=$invoicestatic->getSommePaiement(); - print ''; + print ''; print $invoicestatic->getNomUrl(1,'withdraw'); print ''; diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php index de70ce2a808..aa479ec4369 100644 --- a/htdocs/compta/sociales/card.php +++ b/htdocs/compta/sociales/card.php @@ -617,7 +617,7 @@ if ($id > 0) else { - print ''.$langs->trans("None").''; + print ''.$langs->trans("None").''; } //if ($object->status == ChargeSociales::STATUS_DRAFT) diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 3a779190679..ea9c06d0b2f 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -258,7 +258,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire) while ($i < $num) { $obj = $db->fetch_object($resql); - print ''; + print ''; $staticcontrat->ref=$obj->ref; $staticcontrat->id=$obj->rowid; print $staticcontrat->getNomUrl(1,''); diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 17b904da9db..809a045bacf 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -612,7 +612,7 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin else { $var = false; - print ''.$langs->trans("None").''; + print ''.$langs->trans("None").''; } $db->free($result); } diff --git a/htdocs/core/lib/doleditor.lib.php b/htdocs/core/lib/doleditor.lib.php index 43a53ee7f6f..1981ae63d09 100644 --- a/htdocs/core/lib/doleditor.lib.php +++ b/htdocs/core/lib/doleditor.lib.php @@ -82,7 +82,7 @@ function show_skin($fuser,$edit=0) print ''; // - print ''; + print ''; print ''; print ''; @@ -1227,7 +1227,7 @@ if ($action == 'create') if ($subj == 0) // Line not shown yet, we show it { print ''; - print ''; print ''; diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index da103ae98d1..57ad04a8a1a 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -804,7 +804,7 @@ if ($id > 0 || ! empty($ref)) { $img=img_warning($langs->trans("StockTooLow")); } - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php index 1ecf77252f3..724fb234798 100644 --- a/htdocs/expensereport/index.php +++ b/htdocs/expensereport/index.php @@ -215,7 +215,7 @@ if ($result) } else { - print ''; + print ''; } print '
'; diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php index 8d4f697deff..98000ad6e98 100644 --- a/htdocs/don/admin/donation.php +++ b/htdocs/don/admin/donation.php @@ -270,7 +270,7 @@ if (is_resource($handle)) if ($module->isEnabled()) { - print '
'; + print '
'; echo $module->name; print ''; @@ -384,7 +384,7 @@ print ''; print ''; $var=! $var; -print '
'; +print '
'; print $langs->trans("FreeTextOnDonations").' '.img_info($langs->trans("AddCRIfTooLong")).'
'; print ''; print '
'; diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 619a0089e1e..c7893aefd2f 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -1067,7 +1067,7 @@ if ($action == 'create') else { print ''; - print '
'; + print '
'; print ' '; print '
'; + print '
'; if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) { $disabled=''; diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index 481a6df9d00..c3e277ad7b0 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -53,7 +53,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele print ''; print ''; print ''; - print ''; print "
'.$langs->trans("Search").'
'; + print '
'; print $langs->trans("Shipment").':

\n"; } @@ -275,7 +275,7 @@ if ($resql) $shipment->ref_customer=$obj->ref_customer; - print '
'; + print '
'; print $shipment->getNomUrl(1); print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'
      -> '.$value['fullpath'].' ('.$value['nb'].')
      -> '.$value['fullpath'].' ('.$value['nb'].') '.$value['nb_total'].'  
'.$langs->trans("None").'
'.$langs->trans("None").'

'; } diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index 63792e2c61f..e9f19f49ef4 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -1052,7 +1052,7 @@ if ($step == 4 && $datatoexport) { $obj = $db->fetch_object($resql); - print ''; + print ''; print $obj->label; print ''; print 'rowid.'">'; diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index 0fd45794e02..58810ee84c0 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -68,7 +68,7 @@ if (count($export->array_export_code)) foreach ($export->array_export_code as $key => $value) { - print ''; + print ''; //print img_object($export->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' '; print $export->array_export_module[$key]->getName(); print ''; diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php index 86706dd1eff..fe00c046117 100644 --- a/htdocs/fichinter/index.php +++ b/htdocs/fichinter/index.php @@ -67,7 +67,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele print '
'; print ''; print ''.$langs->trans("Search").''; - print ''; + print ''; print $langs->trans("Intervention").':'; print "

\n"; } diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php index f7323cc8996..ccb54930573 100644 --- a/htdocs/fourn/commande/index.php +++ b/htdocs/fourn/commande/index.php @@ -60,7 +60,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele print ''; print ''; print ''; - print ''; print "
'.$langs->trans("Search").'
'; + print '
'; print $langs->trans("SupplierOrder").':

\n"; } diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 5ca38304495..29afe337e88 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -2381,7 +2381,7 @@ else { $objp = $db->fetch_object($result); - print ''; + print ''; $paymentstatic->id=$objp->rowid; $paymentstatic->datepaye=$db->jdate($objp->dp); $paymentstatic->ref=($objp->ref ? $objp->ref : $objp->rowid);; @@ -2418,7 +2418,7 @@ else } else { - print ''.$langs->trans("None").''; + print ''.$langs->trans("None").''; } /* diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index 47f95104398..32f785460ba 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/index.php @@ -134,7 +134,7 @@ if (! empty($conf->fournisseur->enabled)) { $obj = $db->fetch_object($resql); - print ''; + print ''; $commandestatic->id=$obj->rowid; $commandestatic->ref=$obj->ref; print $commandestatic->getNomUrl(1,'',16); @@ -191,7 +191,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- { $obj = $db->fetch_object($resql); - print ''; + print ''; $facturestatic->ref=$obj->ref; $facturestatic->id=$obj->rowid; $facturestatic->type=$obj->type; diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php index 5d1d0f89488..291169aa30d 100644 --- a/htdocs/hrm/admin/admin_establishment.php +++ b/htdocs/hrm/admin/admin_establishment.php @@ -130,7 +130,7 @@ if ($result) } else { - print ''.$langs->trans("None").''; + print ''.$langs->trans("None").''; } print ''; diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php index 5364f510026..839d65d2f5a 100644 --- a/htdocs/hrm/index.php +++ b/htdocs/hrm/index.php @@ -218,7 +218,7 @@ if (! empty($conf->holiday->enabled) && $user->rights->holiday->read) } else { - print ''.$langs->trans("None").''; + print ''.$langs->trans("None").''; } print '
'; } @@ -286,7 +286,7 @@ if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire) } else { - print ''.$langs->trans("None").''; + print ''.$langs->trans("None").''; } print '
'; } @@ -353,7 +353,7 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire } else { - print ''.$langs->trans("None").''; + print ''.$langs->trans("None").''; } print ''; } diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 8cbc3d742a3..3916770de8a 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -553,7 +553,7 @@ if ($step == 3 && $datatoimport) // Input file name box $var=false; - print ''; + print ''; print '     '; $out = (empty($conf->global->MAIN_UPLOAD_DOC)?' disabled':''); print ''; @@ -1131,7 +1131,7 @@ if ($step == 4 && $datatoimport) { $obj = $db->fetch_object($resql); - print ''; + print ''; print $obj->label; print ''; print '
rowid.'&filetoimport='.urlencode($filetoimport).'">'; diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php index 6446e6c20c5..1a020ab86bf 100644 --- a/htdocs/paybox/admin/paybox.php +++ b/htdocs/paybox/admin/paybox.php @@ -111,21 +111,21 @@ print ''.$langs->trans("Value").''; print "\n"; -print ''; +print ''; print ''.$langs->trans("PAYBOX_PBX_SITE").''; print ''; print '
'.$langs->trans("Example").': 1999888 ('.$langs->trans("Test").')'; print ''; -print ''; +print ''; print ''.$langs->trans("PAYBOX_PBX_RANG").''; print ''; print '
'.$langs->trans("Example").': 99 ('.$langs->trans("Test").')'; print ''; -print ''; +print ''; print ''.$langs->trans("PAYBOX_PBX_IDENTIFIANT").''; print ''; print '
'.$langs->trans("Example").': 2 ('.$langs->trans("Test").')'; @@ -139,7 +139,7 @@ print "\n"; /* -print ''; +print ''; print $langs->trans("PAYBOX_IBS_DEVISE").''; print ''; print '
'.$langs->trans("Example").': 978 (EUR)'; @@ -148,7 +148,7 @@ print ''; /* -print ''; +print ''; print $langs->trans("PAYBOX_CGI_URL_V1").''; print ''; print '
'.$langs->trans("Example").': http://mysite/cgi-bin/module_linux.cgi'; @@ -156,42 +156,42 @@ print ''; */ -print ''; +print ''; print ''.$langs->trans("PAYBOX_CGI_URL_V2").''; print ''; print '
'.$langs->trans("Example").': http://mysite/cgi-bin/modulev2_redhat72.cgi'; print ''; -print ''; +print ''; print $langs->trans("VendorName").''; print ''; print '
'.$langs->trans("Example").': '.$mysoc->name; print ''; -print ''; +print ''; print $langs->trans("CSSUrlForPaymentForm").''; print ''; print '
'.$langs->trans("Example").': http://mysite/mycss.css'; print ''; -print ''; +print ''; print $langs->trans("MessageOK").''; $doleditor=new DolEditor('PAYBOX_MESSAGE_OK',$conf->global->PAYBOX_MESSAGE_OK,'',100,'dolibarr_details','In',false,true,true,ROWS_2,'90%'); $doleditor->Create(); print ''; -print ''; +print ''; print $langs->trans("MessageKO").''; $doleditor=new DolEditor('PAYBOX_MESSAGE_KO',$conf->global->PAYBOX_MESSAGE_KO,'',100,'dolibarr_details','In',false,true,true,ROWS_2,'90%'); $doleditor->Create(); print ''; -print ''; +print ''; print $langs->trans("PAYBOX_PAYONLINE_SENDEMAIL").''; print ''; print '   '.$langs->trans("Example").': myemail@myserver.com'; diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php index 87ca506e653..4942d15a9ce 100644 --- a/htdocs/paypal/admin/paypal.php +++ b/htdocs/paypal/admin/paypal.php @@ -129,33 +129,33 @@ print ''.$langs->trans("Value").''; print "\n"; -print ''; +print ''; print $langs->trans("PAYPAL_API_SANDBOX").''; print $form->selectyesno("PAYPAL_API_SANDBOX",$conf->global->PAYPAL_API_SANDBOX,1); print ''; -print ''; +print ''; print $langs->trans("PAYPAL_API_USER").''; print ''; print '   '.$langs->trans("Example").': paypal_api1.mywebsite.com'; print ''; -print ''; +print ''; print $langs->trans("PAYPAL_API_PASSWORD").''; print ''; print ''; -print ''; +print ''; print $langs->trans("PAYPAL_API_SIGNATURE").''; print ''; print '
'.$langs->trans("Example").': ASsqXEmw4KzmX-CPChWSVDNCNfd.A3YNR7uz-VncXXAERFDFDFDF'; print ''; -print ''; +print ''; print $langs->trans("PAYPAL_SSLVERSION").''; print $form->selectarray("PAYPAL_SSLVERSION",array('1'=> $langs->trans('TLSv1'),'6'=> $langs->trans('TLSv1.2')),$conf->global->PAYPAL_SSLVERSION); print ''; @@ -168,54 +168,54 @@ print ''.$langs->trans("Value").''; print "\n"; -print ''; +print ''; print $langs->trans("PAYPAL_API_INTEGRAL_OR_PAYPALONLY").''; print $form->selectarray("PAYPAL_API_INTEGRAL_OR_PAYPALONLY",array('integral'=> $langs->trans('PaypalModeIntegral'),'paypalonly'=> $langs->trans('PaypalModeOnlyPaypal')),$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY); print ''; /* -print ''; +print ''; print ''.$langs->trans("PAYPAL_API_EXPRESS").''; print $form->selectyesno("PAYPAL_API_EXPRESS",$conf->global->PAYPAL_API_EXPRESS); print ''; */ -print ''; +print ''; print $langs->trans("VendorName").''; print ''; print '   '.$langs->trans("Example").': '.$mysoc->name; print ''; -print ''; +print ''; print $langs->trans("CSSUrlForPaymentForm").''; print ''; print '   '.$langs->trans("Example").': http://mysite/mycss.css'; print ''; -print ''; +print ''; print $langs->trans("PAYPAL_ADD_PAYMENT_URL").''; print $form->selectyesno("PAYPAL_ADD_PAYMENT_URL",$conf->global->PAYPAL_ADD_PAYMENT_URL,1); print ''; -print ''; +print ''; print $langs->trans("MessageOK").''; $doleditor=new DolEditor('PAYPAL_MESSAGE_OK',$conf->global->PAYPAL_MESSAGE_OK,'',100,'dolibarr_details','In',false,true,true,ROWS_4,'90%'); $doleditor->Create(); print ''; -print ''; +print ''; print $langs->trans("MessageKO").''; $doleditor=new DolEditor('PAYPAL_MESSAGE_KO',$conf->global->PAYPAL_MESSAGE_KO,'',100,'dolibarr_details','In',false,true,true,ROWS_4,'90%'); $doleditor->Create(); print ''; -print ''; +print ''; print $langs->trans("PAYPAL_PAYONLINE_SENDEMAIL").''; print ''; print '   '.$langs->trans("Example").': myemail@myserver.com'; @@ -228,7 +228,7 @@ print ''.$langs->trans("Value").''; print "\n"; -print ''; +print ''; print $langs->trans("SecurityToken").''; print ''; if (! empty($conf->use_javascript_ajax)) @@ -236,7 +236,7 @@ if (! empty($conf->use_javascript_ajax)) print ''; -print ''; +print ''; print $langs->trans("SecurityTokenIsUnique").''; print $form->selectyesno("PAYPAL_SECURITY_TOKEN_UNIQUE",(empty($conf->global->PAYPAL_SECURITY_TOKEN)?0:$conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE),1); print ''; diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index ecdefb189b3..3582f8b25b6 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -356,7 +356,7 @@ foreach ($dirproduct as $dirroot) if ($modCodeProduct->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue; $var = !$var; - print ''."\n"; + print ''."\n"; print ''.$modCodeProduct->name.''."\n"; print ''.$modCodeProduct->info($langs).''."\n"; print ''.$modCodeProduct->getExample($langs).''."\n"; @@ -468,7 +468,7 @@ foreach ($dirmodels as $reldir) if ($modulequalified) { $var = !$var; - print ''; + print ''; print (empty($module->name)?$name:$module->name); print "\n"; if (method_exists($module,'info')) print $module->info($langs); diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php index b6f469a893a..671bb9779a7 100644 --- a/htdocs/product/admin/product_tools.php +++ b/htdocs/product/admin/product_tools.php @@ -272,7 +272,7 @@ else print ''."\n"; - print ''."\n"; + print ''."\n"; print ''.$langs->trans("OldVATRates").''."\n"; print ''."\n"; print $form->load_tva('oldvatrate', $oldvatrate, $mysoc); @@ -280,7 +280,7 @@ else print ''."\n"; - print ''."\n"; + print ''."\n"; print ''.$langs->trans("NewVATRates").''."\n"; print ''."\n"; print $form->load_tva('newvatrate', $newvatrate, $mysoc); @@ -289,7 +289,7 @@ else /* - print ''."\n"; + print ''."\n"; print ''.$langs->trans("PriceBaseTypeToChange").''."\n"; print ''."\n"; print $form->selectPriceBaseType($price_base_type); diff --git a/htdocs/product/index.php b/htdocs/product/index.php index dc2628f4dc0..34da4f857b9 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -428,7 +428,7 @@ function activitytrim($product_type) if ($trim1+$trim2+$trim3+$trim4 > 0) { - print ''.$tmpyear.''; + print ''.$tmpyear.''; print ''.price($trim1).''; print ''.price($trim2).''; print ''.price($trim3).''; @@ -462,7 +462,7 @@ function activitytrim($product_type) if ($trim1+$trim2+$trim3+$trim4 > 0) { - print ''.$tmpyear.''; + print ''.$tmpyear.''; print ''.price($trim1).''; print ''.price($trim2).''; print ''.price($trim3).''; diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 912ee7a7cc0..7c524a167b9 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -951,7 +951,7 @@ if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE)) { $ent = new Entrepot($db); $ent->fetch($line['fk_entrepot']); - print ''.$ent->getNomUrl(3).''; + print ''.$ent->getNomUrl(3).''; print ''.$line['seuil_stock_alerte'].''; print ''.$line['desiredstock'].''; print '
'.img_delete().''; diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php index 5295e1a5516..42cacc19272 100644 --- a/htdocs/projet/admin/project.php +++ b/htdocs/projet/admin/project.php @@ -415,7 +415,7 @@ foreach ($dirmodels as $reldir) if ($module->isEnabled()) { - print ''.$module->name."\n"; + print ''.$module->name."\n"; print $module->info(); print ''; @@ -519,7 +519,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) if ($module->isEnabled()) { - print ''.$module->name."\n"; + print ''.$module->name."\n"; print $module->info(); print ''; @@ -661,7 +661,7 @@ foreach ($dirmodels as $reldir) if ($modulequalified) { - print ''; + print ''; print (empty($module->name)?$name:$module->name); print "\n"; if (method_exists($module,'info')) print $module->info($langs); @@ -820,7 +820,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) if ($modulequalified) { $var = !$var; - print ''; + print ''; print (empty($module->name)?$name:$module->name); print "\n"; if (method_exists($module,'info')) print $module->info($langs); diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index b949d5a27ba..517672d14ed 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -354,7 +354,7 @@ foreach ($dirsociete as $dirroot) if ($modCodeTiers->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue; $var = !$var; - print ''."\n"; + print ''."\n"; print ''.$modCodeTiers->name.''."\n"; print ''.$modCodeTiers->info($langs).''."\n"; print ''.$modCodeTiers->getExample($langs).''."\n"; @@ -534,7 +534,7 @@ foreach ($dirsociete as $dirroot) if ($modulequalified) { $var = !$var; - print ''; + print ''; print $module->name; print "\n"; if (method_exists($module,'info')) print $module->info($langs); diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index 0f1450c491a..c3508bd0cef 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -220,7 +220,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS { $obj = $db->fetch_object($result); - print ''.$obj->label.''.$obj->nb.''; + print ''.$obj->label.''.$obj->nb.''; $total+=$obj->nb; $i++; } diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php index 8b77c8f52a4..d547d9e57dc 100644 --- a/htdocs/societe/notify/card.php +++ b/htdocs/societe/notify/card.php @@ -251,7 +251,7 @@ if ($result > 0) $label=($langs->trans("Notify_".$managedeventfornotification['code'])!="Notify_".$managedeventfornotification['code']?$langs->trans("Notify_".$managedeventfornotification['code']):$managedeventfornotification['label']); $actions[$managedeventfornotification['rowid']]=$label; } - print ''; + print ''; print $form->selectarray("contactid", $listofemails, '', 0, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone'); print ''; print ''; @@ -266,7 +266,7 @@ if ($result > 0) } else { - print ''; + print ''; print $langs->trans("YouMustCreateContactFirst"); print ''; } @@ -362,7 +362,7 @@ if ($result > 0) { if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue; $var = ! $var; - print ''; + print ''; $listtmp=explode(',',$val); $first=1; foreach($listtmp as $keyemail => $valemail) @@ -402,7 +402,7 @@ if ($result > 0) /*if ($user->admin) { $var = ! $var; - print ''; + print ''; print '+ '.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).''; print ''; }*/ diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php index 09c7e230739..1c16d48e086 100644 --- a/htdocs/supplier_proposal/index.php +++ b/htdocs/supplier_proposal/index.php @@ -68,7 +68,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele print ''; print ''; print ''; - print ''; print ''; print "
'.$langs->trans("Search").'
'; + print '
'; print $langs->trans("SupplierProposal").':

\n"; diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php index f18197dccc8..4f47578f543 100644 --- a/htdocs/user/notify/card.php +++ b/htdocs/user/notify/card.php @@ -221,7 +221,7 @@ if ($result > 0) $label=($langs->trans("Notify_".$notifiedevent['code'])!="Notify_".$notifiedevent['code']?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label']); $actions[$notifiedevent['rowid']]=$label; } - print ''; + print ''; print $object->getNomUrl(1); if (isValidEmail($object->email)) { @@ -245,7 +245,7 @@ if ($result > 0) } else { - print ''; + print ''; print $langs->trans("YouMustAssignUserMailFirst"); print ''; } @@ -307,7 +307,7 @@ if ($result > 0) $userstatic->id=$obj->userid; $userstatic->lastname=$obj->lastname; $userstatic->firstname=$obj->firstname; - print ''.$userstatic->getNomUrl(1); + print ''.$userstatic->getNomUrl(1); if ($obj->type == 'email') { if (isValidEmail($obj->email)) @@ -343,7 +343,7 @@ if ($result > 0) { if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue; $var = ! $var; - print ''; + print ''; $listtmp=explode(',',$val); $first=1; foreach($listtmp as $keyemail => $valemail) @@ -382,7 +382,7 @@ if ($result > 0) /*if ($user->admin) { $var = ! $var; - print ''; + print ''; print '+ '.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).''; print ''; }*/ diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 0348eb0e288..956291f1e9d 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -242,7 +242,7 @@ if ($action == 'edit') // Landing page - print ''.$langs->trans("LandingPage").''; + print ''.$langs->trans("LandingPage").''; print ''; print (empty($conf->global->MAIN_LANDING_PAGE)?'':$conf->global->MAIN_LANDING_PAGE); print ''; @@ -256,7 +256,7 @@ if ($action == 'edit') // Langue par defaut - print ''.$langs->trans("Language").''; + print ''.$langs->trans("Language").''; print ''; $s=picto_from_langcode($conf->global->MAIN_LANG_DEFAULT); print $s?$s.' ':''; @@ -271,7 +271,7 @@ if ($action == 'edit') // Taille max des listes - print ''.$langs->trans("MaxSizeList").''; + print ''.$langs->trans("MaxSizeList").''; print ''.$conf->global->MAIN_SIZE_LISTE_LIMIT.''; print 'conf->MAIN_SIZE_LISTE_LIMIT)?" checked":""); print empty($dolibarr_main_demo)?'':' disabled="disabled"'; // Disabled for demo @@ -308,7 +308,7 @@ else // Landing page - print ''.$langs->trans("LandingPage").''; + print ''.$langs->trans("LandingPage").''; print ''; print (empty($conf->global->MAIN_LANDING_PAGE)?'':$conf->global->MAIN_LANDING_PAGE); print ''; @@ -326,7 +326,7 @@ else // Language - print ''.$langs->trans("Language").''; + print ''.$langs->trans("Language").''; print ''; $s=picto_from_langcode($conf->global->MAIN_LANG_DEFAULT); print ($s?$s.' ':''); @@ -340,7 +340,7 @@ else print ''; - print ''.$langs->trans("MaxSizeList").''; + print ''.$langs->trans("MaxSizeList").''; print ''.(! empty($conf->global->MAIN_SIZE_LISTE_LIMIT)?$conf->global->MAIN_SIZE_LISTE_LIMIT:' ').''; print 'conf->MAIN_SIZE_LISTE_LIMIT)?" checked":"").'> '.$langs->trans("UsePersonalValue").''; print '' . (! empty($object->conf->MAIN_SIZE_LISTE_LIMIT)?$object->conf->MAIN_SIZE_LISTE_LIMIT:' ') . '';