diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index 644eb34d184..2b7a5f190be 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -1675,7 +1675,7 @@ else print ''; print $form->select_company($object->fk_soc,'socid','',1); print ''; - print ''; + print ''; print ''; } else diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index b2b75010802..d7b3f3304ff 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -875,8 +875,8 @@ if (isset($totalarray['pos'])) { if ($i == 1) { - if ($num < $limit) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; } else print ''; } diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php index b28998ec39e..a8408dc4345 100644 --- a/htdocs/adherents/subscription.php +++ b/htdocs/adherents/subscription.php @@ -584,7 +584,7 @@ if ($rowid > 0) print ''; print $form->select_company($object->fk_soc,'socid','',1); print ''; - print ''; + print ''; print ''; } else diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php index 4b3e24d019e..730ff4e9854 100644 --- a/htdocs/adherents/subscription/list.php +++ b/htdocs/adherents/subscription/list.php @@ -568,8 +568,8 @@ if (isset($totalarray['pos'])) { if ($i == 1) { - if ($num < $limit) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; } else print ''; } diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index bfbeb5cbb6a..15af65fbb8d 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -647,14 +647,14 @@ if ($action == 'edit' || $action == 'updateedit') print ($example!="LocalTax1IsUsedExample"?"".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code)."\n":""); if(! isOnlyOneLocalTax(1)) { - print ': '; + print ': '; $formcompany->select_localtax(1,$conf->global->MAIN_INFO_VALUE_LOCALTAX1, "lt1"); print ''; } $opcions=array($langs->trans("CalcLocaltax1").' '.$langs->trans("CalcLocaltax1Desc"),$langs->trans("CalcLocaltax2").' - '.$langs->trans("CalcLocaltax2Desc"),$langs->trans("CalcLocaltax3").' - '.$langs->trans("CalcLocaltax3Desc")); - print ''.$langs->trans("CalcLocaltax").': '; + print ''.$langs->trans("CalcLocaltax").': '; print $form->selectarray("clt1", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC1); print ''; print ""; @@ -691,11 +691,11 @@ if ($action == 'edit' || $action == 'updateedit') print ($example!="LocalTax2IsUsedExample"?"".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code)."\n":""); if(! isOnlyOneLocalTax(2)) { - print ': '; + print ': '; $formcompany->select_localtax(2,$conf->global->MAIN_INFO_VALUE_LOCALTAX2, "lt2"); print ''; } - print ': '; + print ': '; print $form->selectarray("clt2", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC2); print ''; print ""; @@ -1092,7 +1092,7 @@ else { print ''.$langs->trans("LTRate").': '. $conf->global->MAIN_INFO_VALUE_LOCALTAX1 .''; } - print ''.$langs->trans("CalcLocaltax").': '; + print ''.$langs->trans("CalcLocaltax").': '; if($conf->global->MAIN_INFO_LOCALTAX_CALC1==0) { print $langs->trans("CalcLocaltax1").' - '.$langs->trans("CalcLocaltax1Desc"); @@ -1146,7 +1146,7 @@ else { print ''.$langs->trans("LTRate").': '. $conf->global->MAIN_INFO_VALUE_LOCALTAX2 .''; } - print ''.$langs->trans("CalcLocaltax").': '; + print ''.$langs->trans("CalcLocaltax").': '; if($conf->global->MAIN_INFO_LOCALTAX_CALC2==0) { print $langs->trans("CalcLocaltax1").' - '.$langs->trans("CalcLocaltax1Desc"); diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php index cacebb8e55d..7e72a5ce003 100644 --- a/htdocs/admin/emailcollector_list.php +++ b/htdocs/admin/emailcollector_list.php @@ -508,8 +508,8 @@ if (isset($totalarray['pos'])) { if ($i == 1) { - if ($num < $limit) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; } else print ''; } diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php index 280025b3b35..bbfc2ee2363 100644 --- a/htdocs/admin/mails_senderprofile_list.php +++ b/htdocs/admin/mails_senderprofile_list.php @@ -467,8 +467,8 @@ if (isset($totalarray['pos'])) { if ($i == 1) { - if ($num < $limit) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; } else print ''; } diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 65487c382f1..4694021c233 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -864,9 +864,9 @@ if ($mode == 'marketplace') print ''.$langs->trans("URL").''; print ''; - print "\n"; + print ''."\n"; $url='https://www.dolistore.com'; - print ''; + print ''; print ''.$langs->trans("DoliStoreDesc").''; print ''.$url.''; print ''; @@ -1088,7 +1088,7 @@ if ($mode == 'develop') print ''; print ''."\n"; - print ''; + print ''; //span class="fa fa-bug"> //print ''; print '
'; @@ -1099,7 +1099,7 @@ if ($mode == 'develop') print ''."\n"; $url='https://partners.dolibarr.org'; - print ''; + print ''; print''; print ''; print ''.$langs->trans("DoliPartnersDesc").''; diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index 6d67cab60f9..b69a9ee9d80 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -214,32 +214,32 @@ print ""; // Bank account (from Banks module) print ''.$langs->trans("BankToReceiveWithdraw").''; -print ''; +print ''; $form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT,'PRELEVEMENT_ID_BANKACCOUNT',0,"courant=1",1); print ''; // ICS print ''.$langs->trans("ICS").''; -print ''; +print ''; print ''; print ''; //User print ''.$langs->trans("ResponsibleUser").''; -print ''; +print ''; print $form->select_dolusers($conf->global->PRELEVEMENT_USER, 'PRELEVEMENT_USER', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print ''; print ''; //EntToEnd print ''.$langs->trans("END_TO_END").''; -print ''; +print ''; print ''; print ''; //USTRD print ''.$langs->trans("USTRD").''; -print ''; +print ''; print ''; print ''; @@ -485,7 +485,7 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION)) print ''.$langs->trans("Action").''; print "\n"; - print ''; + print ''; print $form->selectarray('user',$internalusers);// select_dolusers(0,'user',0); print ''; diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index 14a319b8020..a3cceda40da 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -248,7 +248,7 @@ foreach ($syslogModules as $moduleName) } print ''; - print ''; + print ''; if ($module->getInfo()) { print $form->textwithpicto('', $module->getInfo(), 1, 'help'); diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php index 86f6250cede..f94117ef747 100644 --- a/htdocs/admin/ticket.php +++ b/htdocs/admin/ticket.php @@ -359,7 +359,7 @@ print ''; // Activate public interface print ''; -print ''; -print ''; print ''; // Check if email exists print ''; -print ''; { // Show logo for module print ''; - print ''; // Show logo for company print ''; -print '
' . $langs->trans("TicketsActivatePublicInterface") . ''; +print ''; if ($conf->use_javascript_ajax) { print ajax_constantonoff('TICKET_ENABLE_PUBLIC_INTERFACE'); } else { @@ -367,14 +367,14 @@ if ($conf->use_javascript_ajax) { print $form->selectarray("TICKET_ENABLE_PUBLIC_INTERFACE", $arrval, $conf->global->TICKET_ENABLE_PUBLIC_INTERFACE); } print ''; +print ''; print $form->textwithpicto('', $langs->trans("TicketsActivatePublicInterfaceHelp"), 1, 'help'); print '
' . $langs->trans("TicketsEmailMustExist") . ''; +print ''; if ($conf->use_javascript_ajax) { print ajax_constantonoff('TICKET_EMAIL_MUST_EXISTS'); } else { @@ -391,7 +391,7 @@ print '
' . $langs->trans("TicketsShowModuleLogo") . ''; + print ''; if ($conf->use_javascript_ajax) { print ajax_constantonoff('TICKET_SHOW_MODULE_LOGO'); } else { @@ -407,7 +407,7 @@ print '
' . $langs->trans("TicketsShowCompanyLogo") . ''; +print ''; if ($conf->use_javascript_ajax) { print ajax_constantonoff('TICKET_SHOW_COMPANY_LOGO'); } else { @@ -427,7 +427,7 @@ print ''; // Activate email notifications print ''; -print ''; // Activate log by email print ''; -print ''; if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { print ''; - print ''; -print ''; -print ''; -print ''; print ''; // Email de réception des notifications print ''; -print ''; print ''; - else print ''; + if ($num < $limit) print ''; + else print ''; } else print ''; } diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php index 10ce877c7e0..cca978d748b 100644 --- a/htdocs/bookmarks/list.php +++ b/htdocs/bookmarks/list.php @@ -132,7 +132,7 @@ if ($resql) print ''; // Id - print ''; diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index 3f0085ad33a..f39f9efc54a 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -353,7 +353,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire) $companystatic->name=$obj->socname; $companystatic->client=$obj->client; $companystatic->canvas=$obj->canvas; - print ''."\n"; + print ''."\n"; print ''."\n"; diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 47488e96273..2d3917a0d47 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -1030,8 +1030,8 @@ if ($resql) $i++; if ($i == 1) { - if ($num < $limit && empty($offset)) print ''; - else print ''; + if ($num < $limit && empty($offset)) print ''; + else print ''; } elseif ($totalarray['totalhtfield'] == $i) print ''; elseif ($totalarray['totalvatfield'] == $i) print ''; diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index c44d23e8d5c..7f808135ca1 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -251,20 +251,20 @@ print '
'; print '
' . $langs->trans("TicketsDisableEmail") . ''; +print ''; if ($conf->use_javascript_ajax) { print ajax_constantonoff('TICKET_DISABLE_ALL_MAILS'); } else { @@ -442,7 +442,7 @@ print '
' . $langs->trans("TicketsLogEnableEmail") . ''; +print ''; if ($conf->use_javascript_ajax) { print ajax_constantonoff('TICKET_ACTIVATE_LOG_BY_EMAIL'); } else { @@ -459,7 +459,7 @@ print '
' . $langs->trans("TicketsEmailAlsoSendToMainAddress") . ''; + print ''; if ($conf->use_javascript_ajax) { print ajax_constantonoff('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS'); } else { @@ -475,7 +475,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) // Limiter la vue des tickets à ceux assignés à l'utilisateur print '
' . $langs->trans("TicketsLimitViewAssignedOnly") . ''; +print ''; if ($conf->use_javascript_ajax) { print ajax_constantonoff('TICKET_LIMIT_VIEW_ASSIGNED_ONLY'); } else { @@ -495,7 +495,7 @@ if (!$conf->use_javascript_ajax) { // Auto assign ticket at user who created it print '
' . $langs->trans("TicketsAutoAssignTicket") . ''; +print ''; if ($conf->use_javascript_ajax) { print ajax_constantonoff('TICKET_AUTO_ASSIGN_USER_CREATE'); } else { @@ -535,7 +535,7 @@ if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) { // Email d'envoi des notifications print '
' . $langs->trans("TicketEmailNotificationFrom") . ''; +print ''; print ''; print $form->textwithpicto('', $langs->trans("TicketEmailNotificationFromHelp"), 1, 'help'); @@ -544,7 +544,7 @@ print '
' . $langs->trans("TicketEmailNotificationTo") . ''; +print ''; print ''; print $form->textwithpicto('', $langs->trans("TicketEmailNotificationToHelp"), 1, 'help'); diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php index 431276b67a8..cb0a8cca7b2 100644 --- a/htdocs/asset/list.php +++ b/htdocs/asset/list.php @@ -474,8 +474,8 @@ if (isset($totalarray['pos'])) { if ($i == 1) { - if ($num < $limit) print ''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.$langs->trans("Total").''.$langs->trans("Totalforthispage").'
'; + print ''; print "rowid."\">".img_object($langs->trans("ShowBookmark"),"bookmark").' '.$obj->rowid.""; print ''.$companystatic->getNomUrl(1,'customer',44).''.$companystatic->getNomUrl(1,'customer',44).''; print dol_print_date($db->jdate($obj->dp),'day').''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.price($totalarray['totalht']).''.price($totalarray['totalvat']).'
'; print ''; // Company - print ''; // User - print ''; // Status - print ''; // Year - print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; $num = $db->num_rows($resql); @@ -240,7 +240,7 @@ if ($socid > 0) print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; $i++; @@ -286,7 +286,7 @@ if ($socid > 0) print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; $num = $db->num_rows($resql); @@ -299,7 +299,7 @@ if ($socid > 0) print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; $i++; diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php index 2f7e1831457..ff9cb2c37fb 100644 --- a/htdocs/commande/customer.php +++ b/htdocs/commande/customer.php @@ -173,8 +173,8 @@ if ($resql) print $result; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; print "\n"; $i++; diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index a5ff8bf0dc8..739e3699133 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -1115,8 +1115,8 @@ if ($resql) $i++; if ($i == 1) { - if ($num < $limit && empty($offset)) print ''; - else print ''; + if ($num < $limit && empty($offset)) print ''; + else print ''; } elseif ($totalarray['totalhtfield'] == $i) print ''; elseif ($totalarray['totalvatfield'] == $i) print ''; diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index a40d27b4e14..578f08b7af3 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -263,16 +263,16 @@ print ''; print '
'.$langs->trans("Filter").'
'.$langs->trans("ThirdParty").''; + print '
'.$langs->trans("ThirdParty").''; $filter='s.client in (1,2,3)'; print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"'); print '
'.$langs->trans("CreatedBy").''; + print '
'.$langs->trans("CreatedBy").''; print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print '
'.$langs->trans("Status").''; + print '
'.$langs->trans("Status").''; $formpropal->selectProposalStatus(($object_status!=''?$object_status:-1),0,0,1,$mode,'object_status'); print '
'.$langs->trans("Year").''; + print '
'.$langs->trans("Year").''; if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year; if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear; arsort($arrayyears); diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index f045e570c6e..37f08eb6b48 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -227,7 +227,7 @@ if ($socid > 0) print '
'.$langs->trans("Date").''.$langs->trans("CustomerRelativeDiscountShort").''.$langs->trans("NoteReason").''.$langs->trans("NoteReason").''.$langs->trans("User").'
'.dol_print_date($db->jdate($obj->dc),"dayhour").''.price2num($obj->remise_percent).'%'.$obj->note.''.$obj->note.''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'
'.$langs->trans("Date").''.$langs->trans("CustomerRelativeDiscountShort").''.$langs->trans("NoteReason").''.$langs->trans("NoteReason").''.$langs->trans("User").'
'.dol_print_date($db->jdate($obj->dc),"dayhour").''.price2num($obj->remise_percent).'%'.$obj->note.''.$obj->note.''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'
'.$obj->town.' '.$obj->code_client.' '.$obj->code_compta.' '.$obj->code_client.' '.$obj->code_compta.' '.dol_print_date($db->jdate($obj->datec)).'
'.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.price($totalarray['totalht']).''.price($totalarray['totalvat']).'
'; print ''; // Company -print ''; // User -print ''; // Year -print '
'.$langs->trans("Filter").'
'.$langs->trans("ThirdParty").''; +print '
'.$langs->trans("ThirdParty").''; if ($mode == 'customer') $filter='s.client in (1,2,3)'; if ($mode == 'supplier') $filter='s.fournisseur = 1'; print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"'); print '
'.$langs->trans("CreatedBy").''; +print '
'.$langs->trans("CreatedBy").''; print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); // Status -print '
'.$langs->trans("Status").''; +print '
'.$langs->trans("Status").''; if ($mode == 'customer') { $liststatus=array( @@ -290,7 +290,7 @@ if ($mode == 'supplier') } print '
'.$langs->trans("Year").''; +print '
'.$langs->trans("Year").''; if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year; if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear; arsort($arrayyears);