From ce47de453e4d9388db447d2416c13db8cb8d504d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 12 Dec 2019 10:31:08 +0100 Subject: [PATCH] Fix HTML5 --- htdocs/accountancy/bookkeeping/list.php | 2 +- htdocs/admin/bank.php | 4 +-- htdocs/admin/fichinter.php | 14 +++++----- htdocs/admin/holiday.php | 14 +++++----- htdocs/admin/livraison.php | 8 +++--- htdocs/admin/mails_templates.php | 6 ++-- htdocs/admin/multicurrency.php | 10 +++---- htdocs/admin/payment.php | 4 +-- htdocs/admin/perms.php | 4 +-- htdocs/admin/prelevement.php | 10 +++---- htdocs/admin/propal.php | 10 +++---- htdocs/admin/reception_setup.php | 14 +++++----- htdocs/admin/security.php | 6 ++-- htdocs/admin/stock.php | 4 +-- htdocs/admin/supplier_invoice.php | 14 +++++----- htdocs/admin/supplier_order.php | 14 +++++----- htdocs/admin/supplier_payment.php | 14 +++++----- htdocs/admin/supplier_proposal.php | 10 +++---- htdocs/admin/ticket.php | 24 ++++++++-------- htdocs/admin/ticket_public.php | 20 ++++++------- htdocs/admin/translation.php | 6 ++-- htdocs/admin/user.php | 10 +++---- htdocs/admin/usergroup.php | 10 +++---- htdocs/admin/website.php | 2 +- htdocs/admin/workflow.php | 2 +- htdocs/api/class/api_setup.class.php | 28 +++++++++---------- htdocs/bookmarks/list.php | 6 ++-- htdocs/comm/action/list.php | 4 +-- htdocs/comm/action/pertype.php | 2 +- htdocs/comm/action/peruser.php | 2 +- htdocs/comm/action/rapport/index.php | 16 +++++------ htdocs/comm/mailing/cibles.php | 4 +-- htdocs/comm/mailing/index.php | 8 +++--- htdocs/comm/mailing/list.php | 4 +-- htdocs/comm/propal/list.php | 12 ++++---- htdocs/comm/propal/stats/index.php | 2 +- htdocs/comm/remise.php | 8 +++--- htdocs/comm/remx.php | 2 +- htdocs/commande/list.php | 10 +++---- htdocs/commande/orderstoinvoice.php | 2 +- htdocs/commande/stats/index.php | 2 +- htdocs/compta/bank/bankentries_list.php | 8 +++--- .../compta/cashcontrol/cashcontrol_card.php | 12 ++++---- htdocs/compta/charges/index.php | 8 +++--- htdocs/compta/deplacement/list.php | 2 +- htdocs/compta/deplacement/stats/index.php | 8 +++--- htdocs/compta/facture/card.php | 8 +++--- .../compta/facture/invoicetemplate_list.php | 20 ++++++------- htdocs/compta/facture/list.php | 6 ++-- htdocs/compta/facture/prelevement.php | 18 ++++++------ htdocs/compta/facture/stats/index.php | 2 +- htdocs/compta/index.php | 4 +-- htdocs/compta/paiement.php | 8 +++--- htdocs/compta/paiement/cheque/card.php | 16 +++++------ htdocs/compta/paiement/cheque/list.php | 2 +- htdocs/compta/paiement/list.php | 2 +- htdocs/compta/paiement/tovalidate.php | 2 +- htdocs/compta/paiement_charge.php | 4 +-- htdocs/compta/payment_sc/card.php | 4 +-- htdocs/compta/prelevement/bons.php | 2 +- htdocs/compta/prelevement/create.php | 4 +-- htdocs/compta/prelevement/factures.php | 2 +- htdocs/compta/prelevement/fiche-rejet.php | 4 +-- htdocs/compta/prelevement/list.php | 2 +- htdocs/compta/prelevement/stats.php | 2 +- htdocs/compta/sociales/list.php | 2 +- htdocs/compta/sociales/payments.php | 8 +++--- htdocs/compta/stats/cabyuser.php | 2 +- htdocs/compta/stats/casoc.php | 2 +- htdocs/contact/list.php | 2 +- htdocs/core/ajax/ajaxdirpreview.php | 2 +- htdocs/core/ajax/ajaxdirtree.php | 2 +- htdocs/core/class/html.formticket.class.php | 8 +++--- htdocs/core/lib/admin.lib.php | 4 +-- htdocs/core/lib/agenda.lib.php | 2 +- htdocs/core/lib/company.lib.php | 6 ++-- htdocs/core/lib/project.lib.php | 2 +- htdocs/core/modules/dons/html_cerfafr.html | 2 +- .../modules/printing/printgcp.modules.php | 4 +-- .../modules/printing/printipp.modules.php | 4 +-- .../societe/doc/doc_generic_odt.modules.php | 2 +- htdocs/core/search_page.php | 2 +- htdocs/core/tpl/passwordforgotten.tpl.php | 2 +- htdocs/opensurvey/results.php | 2 +- htdocs/product/fournisseurs.php | 2 +- htdocs/product/list.php | 8 +++--- htdocs/product/stats/commande.php | 6 ++-- htdocs/product/stats/commande_fournisseur.php | 6 ++-- htdocs/product/stats/contrat.php | 6 ++-- htdocs/product/stats/facture.php | 6 ++-- htdocs/product/stats/facture_fournisseur.php | 6 ++-- htdocs/product/stats/propal.php | 4 +-- htdocs/product/stats/supplier_proposal.php | 4 +-- htdocs/public/opensurvey/studs.php | 2 +- htdocs/salaries/list.php | 2 +- htdocs/salaries/stats/index.php | 2 +- htdocs/theme/eldy/global.inc.php | 2 +- htdocs/ticket/tpl/linkedobjectblock.tpl.php | 8 +++--- 98 files changed, 311 insertions(+), 311 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index 0db4c7b6c24..758906cb19d 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -974,7 +974,7 @@ while ($i < min($num, $limit)) // Exported operation date if (! empty($arrayfields['t.date_export']['checked'])) { - print '' . dol_print_date($line->date_export, 'dayhour') . ''; + print '' . dol_print_date($line->date_export, 'dayhour') . ''; if (! $i) $totalarray['nbfield']++; } diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php index 0dc682a32f8..534153a6c37 100644 --- a/htdocs/admin/bank.php +++ b/htdocs/admin/bank.php @@ -442,7 +442,7 @@ print $langs->trans('BankColorizeMovementDesc'); print ""; // Active if ($conf->global->BANK_COLORIZE_MOVEMENT) { - print ''."\n"; + print ''."\n"; print ''; print img_picto($langs->trans("Enabled"), 'switch_on'); print ''; @@ -450,7 +450,7 @@ if ($conf->global->BANK_COLORIZE_MOVEMENT) { } else { - print ''."\n"; + print ''."\n"; print ''.img_picto($langs->trans("Disabled"), 'switch_off').''; print ""; } diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index b9e89450d33..413f14e02df 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -320,7 +320,7 @@ foreach ($dirmodels as $reldir) else print $tmp; print ''."\n"; - print ''; + print ''; if ($conf->global->FICHEINTER_ADDON == $classname) { print img_picto($langs->trans("Activated"), 'switch_on'); @@ -348,7 +348,7 @@ foreach ($dirmodels as $reldir) $htmltooltip .= $langs->trans($module->error).'
'; } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; @@ -486,12 +486,12 @@ foreach ($dirmodels as $reldir) $htmltooltip .= '
'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1); $htmltooltip .= '
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1); $htmltooltip .= '
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1); - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, -1, 0); print ''; // Preview - print ''; + print ''; if ($module->type == 'pdf') { print ''.img_object($langs->trans("Preview"), 'intervention').''; @@ -587,7 +587,7 @@ print ''; print ''; print $langs->trans("UseServicesDurationOnFichinter"); print ''; -print ''; +print ''; print 'global->FICHINTER_USE_SERVICE_DURATION ? ' checked' : '').'>'; print ''; print ''; @@ -603,7 +603,7 @@ print ''; print ''; print $langs->trans("UseDurationOnFichinter"); print ''; -print ''; +print ''; print 'global->FICHINTER_WITHOUT_DURATION ? ' checked' : '').'>'; print ''; print ''; @@ -619,7 +619,7 @@ print ''; print ''; print $langs->trans("UseDateWithoutHourOnFichinter"); print ''; -print ''; +print ''; print 'global->FICHINTER_DATE_WITHOUT_HOUR ? ' checked' : '').'>'; print ''; print ''; diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php index 5eb36b111c8..0920b656e4f 100644 --- a/htdocs/admin/holiday.php +++ b/htdocs/admin/holiday.php @@ -250,7 +250,7 @@ foreach ($dirmodels as $reldir) else print $tmp; print ''."\n"; - print ''; + print ''; if ($conf->global->HOLIDAY_ADDON == "$file") { print img_picto($langs->trans("Activated"), 'switch_on'); @@ -281,7 +281,7 @@ foreach ($dirmodels as $reldir) } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; @@ -397,7 +397,7 @@ foreach ($dirmodels as $reldir) // Active if (in_array($name, $def)) { - print ''."\n"; + print ''."\n"; print ''; print img_picto($langs->trans("Enabled"), 'switch_on'); print ''; @@ -405,13 +405,13 @@ foreach ($dirmodels as $reldir) } else { - print ''."\n"; + print ''."\n"; print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').''; print ""; } // Default - print ''; + print ''; if ($conf->global->HOLIDAY_ADDON_PDF == $name) { print img_picto($langs->trans("Default"), 'on'); @@ -437,12 +437,12 @@ foreach ($dirmodels as $reldir) $htmltooltip .= '
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1); - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; // Preview - print ''; + print ''; if ($module->type == 'pdf') { print ''.img_object($langs->trans("Preview"), 'contract').''; diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index 6d08456a470..a1f6f27883f 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -245,7 +245,7 @@ foreach ($dirmodels as $reldir) else print $tmp; print ''."\n"; - print ''; + print ''; if ($conf->global->LIVRAISON_ADDON_NUMBER == "$file") { print img_picto($langs->trans("Activated"), 'switch_on'); @@ -274,7 +274,7 @@ foreach ($dirmodels as $reldir) } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; @@ -408,12 +408,12 @@ foreach ($dirmodels as $reldir) $htmltooltip .= '
'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur; $htmltooltip .= '

'.$langs->trans("FeaturesSupported").':'; $htmltooltip .= '
'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1); - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; // Preview - print ''; + print ''; if ($module->type == 'pdf') { print ''.img_object($langs->trans("Preview"), 'sending').''; diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php index aa8a7e79719..47300a5530d 100644 --- a/htdocs/admin/mails_templates.php +++ b/htdocs/admin/mails_templates.php @@ -571,7 +571,7 @@ foreach ($fieldsforcontent as $tmpfieldlist) } print ''; if ($tmpfieldlist == 'topic') { - print ''; + print ''; if ($action != 'edit') { print ''; } @@ -730,7 +730,7 @@ if ($resql) if (empty($reshook)) fieldList($fieldlist, $obj, $tabname[$id], 'edit'); print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -874,7 +874,7 @@ if ($resql) $url.='&'; // Status / Active - print ''; + print ''; if ($canbedisabled) print ''.$actl[$obj->active].''; else print ''.$actl[$obj->active].''; print ""; diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php index d6a7fb26a98..2544b9bd0ee 100644 --- a/htdocs/admin/multicurrency.php +++ b/htdocs/admin/multicurrency.php @@ -189,12 +189,12 @@ dol_fiche_head($head, 'settings', $langs->trans("ModuleSetup"), -1, "multicurren print ''; print ''; print ''."\n"; -print ''."\n"; +print ''."\n"; print ''; print ''; print ''; -print ''; print ''; print ''; -print ''; print ''; - print '
'.$langs->trans("Parameters").''.$langs->trans("Status").''.$langs->trans("Status").'
'.$langs->transnoentitiesnoconv("MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE").''; +print ''; if ($conf->use_javascript_ajax) { print ajax_constantonoff('MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE'); } else { @@ -206,7 +206,7 @@ print '
'.$langs->transnoentitiesnoconv("multicurrency_useOriginTx").''; +print ''; if ($conf->use_javascript_ajax) { print ajax_constantonoff('MULTICURRENCY_USE_ORIGIN_TX'); } else { @@ -220,7 +220,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { print '
'.$langs->transnoentitiesnoconv("MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT").''; + print ''; if ($conf->use_javascript_ajax) { print ajax_constantonoff('MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT'); } else { @@ -313,7 +313,7 @@ print ''; print ''; print ''."\n"; -print ''."\n"; +print ''."\n"; print ''; print ''; diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php index 4fcb3c84786..0aa25d446dd 100644 --- a/htdocs/admin/payment.php +++ b/htdocs/admin/payment.php @@ -175,7 +175,7 @@ foreach ($dirmodels as $reldir) else print $tmp; print ''."\n"; - print ''; print ''; print ''; - print ''; + print ''; print ''; print "\n"; } @@ -193,7 +193,7 @@ if ($result) $perm_libelle=($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id)!=("PermissionAdvanced".$obj->id))?$langs->trans("PermissionAdvanced".$obj->id):(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$obj->libelle)); print ''; - print '"; } // Default - print ''; // Preview - print ''."\n"; - print ''; @@ -442,7 +442,7 @@ foreach ($dirmodels as $reldir) // Active if (in_array($name, $def)) { - print ''; // Preview - print ''."\n"; - print ''; @@ -395,7 +395,7 @@ foreach ($dirmodels as $reldir) // Active if (in_array($name, $def)) { - print '"; } // Defaut - print ''; // Preview - print '
'.$form->textwithpicto($langs->trans("CurrenciesUsed"), $langs->transnoentitiesnoconv("CurrenciesUsed_help_to_add")).''.$langs->trans("Rate").''.$langs->trans("Rate").'
'; + print ''; //print "> ".$conf->global->PAYMENT_ADDON." - ".$file; if ($conf->global->PAYMENT_ADDON == $file || $conf->global->PAYMENT_ADDON.'.php' == $file) { @@ -205,7 +205,7 @@ foreach ($dirmodels as $reldir) } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); if ($conf->global->PAYMENT_ADDON.'.php' == $file) // If module is the one used, we show existing errors diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index a9c581733a4..ea8f839600d 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -178,7 +178,7 @@ if ($result) print '
'.$langs->trans("Module").''.$langs->trans("Permission").''.$langs->trans("Default").''.$langs->trans("Default").' 
'.$perm_libelle. ''; + print ''; if ($obj->bydefault == 1) { print img_picto($langs->trans("Active"), 'tick'); diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index 1d9b181b295..d7061def3e9 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -355,7 +355,7 @@ foreach ($dirmodels as $reldir) // Active if (in_array($name, $def)) { - print ''."\n"; + print ''."\n"; print ''; print img_picto($langs->trans("Enabled"),'switch_on'); print ''; @@ -363,13 +363,13 @@ foreach ($dirmodels as $reldir) } else { - print ''."\n"; + print ''."\n"; print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').''; print "'; + print ''; if ($conf->global->PAYMENTORDER_ADDON_PDF == $name) { print img_picto($langs->trans("Default"),'on'); @@ -397,12 +397,12 @@ foreach ($dirmodels as $reldir) $htmltooltip.='
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1); - print '		'; + print ''; print $form->textwithpicto('',$htmltooltip,1,0); print ''; + print ''; if ($module->type == 'pdf') { print ''.img_object($langs->trans("Preview"),'bill').''; diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index dc58a2c4809..4cde7aa8a20 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -306,7 +306,7 @@ foreach ($dirmodels as $reldir) else print $tmp; print ''; + print ''; if ($conf->global->PROPALE_ADDON == "$file") { print img_picto($langs->trans("Activated"), 'switch_on'); @@ -338,7 +338,7 @@ foreach ($dirmodels as $reldir) } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''."\n"; + print ''."\n"; print ''; print img_picto($langs->trans("Enabled"), 'switch_on'); print ''; @@ -484,12 +484,12 @@ foreach ($dirmodels as $reldir) $htmltooltip.='
'.$langs->trans("WatermarkOnDraftProposal").': '.yn($module->option_draft_watermark, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; if ($module->type == 'pdf') { print ''.img_object($langs->trans("Preview"), 'bill').''; diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php index eacf0deaf68..d705ee0e38d 100644 --- a/htdocs/admin/reception_setup.php +++ b/htdocs/admin/reception_setup.php @@ -259,7 +259,7 @@ foreach ($dirmodels as $reldir) else print $tmp; print ''; + print ''; if ($conf->global->RECEPTION_ADDON_NUMBER == "$file") { print img_picto($langs->trans("Activated"), 'switch_on'); @@ -290,7 +290,7 @@ foreach ($dirmodels as $reldir) } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''."\n"; + print ''."\n"; print ''; print img_picto($langs->trans("Enabled"), 'switch_on'); print ''; @@ -403,13 +403,13 @@ foreach ($dirmodels as $reldir) } else { - print ''."\n"; + print ''."\n"; print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').''; print "'; + print ''; if ($conf->global->RECEPTION_ADDON_PDF == $name) { print img_picto($langs->trans("Default"), 'on'); @@ -434,12 +434,12 @@ foreach ($dirmodels as $reldir) $htmltooltip.='
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1); $htmltooltip.='
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; if ($module->type == 'pdf') { print 'scandir.'&label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'reception').''; diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php index 7a1f5c04dd2..f3004e7b6e7 100644 --- a/htdocs/admin/security.php +++ b/htdocs/admin/security.php @@ -246,7 +246,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print ''; foreach ($arrayhandler as $key => $module) @@ -406,8 +406,8 @@ print ""; print '
'.$langs->trans("RuleForGeneratedPasswords").''.$langs->trans("Example").''.$langs->trans("Activated").''.$langs->trans("Activated").'
'; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print ''; // Disable clear password in database diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index b36106b3e80..d3a361db66f 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -473,7 +473,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) // Example with a yes / no select /*print ''; print ''; - print ''; print ''; - print ''."\n"; - print ''; @@ -395,7 +395,7 @@ foreach ($dirmodels as $reldir) // Active if (in_array($name, $def)) { - print '"; } // Default - print ''; - print ''; diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php index fa87a7f5bb7..9a97ccb640f 100644 --- a/htdocs/admin/supplier_order.php +++ b/htdocs/admin/supplier_order.php @@ -298,7 +298,7 @@ foreach ($dirmodels as $reldir) else print $tmp; print ''."\n"; - print ''; @@ -420,7 +420,7 @@ foreach ($dirmodels as $reldir) // Active if (in_array($name, $def)) { - print '"; } // Default - print ''; - print ''; diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php index e184e98a4b1..1f368eb2b50 100644 --- a/htdocs/admin/supplier_payment.php +++ b/htdocs/admin/supplier_payment.php @@ -259,7 +259,7 @@ foreach ($dirmodels as $reldir) else print $tmp; print ''."\n"; - print '"; } // Default - print ''; - print ''; diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php index 03f144ecd38..783804a3d3f 100644 --- a/htdocs/admin/supplier_proposal.php +++ b/htdocs/admin/supplier_proposal.php @@ -274,7 +274,7 @@ foreach ($dirmodels as $reldir) else print $tmp; print ''."\n"; - print ''; @@ -408,7 +408,7 @@ foreach ($dirmodels as $reldir) // Active if (in_array($name, $def)) { - print ''; // Preview - print ''."\n"; - print ''; @@ -315,7 +315,7 @@ if ($conf->use_javascript_ajax) { print $form->selectarray("TICKET_DISABLE_ALL_MAILS", $arrval, $conf->global->TICKET_DISABLE_ALL_MAILS); } print ''; -print ''; print ''; @@ -330,7 +330,7 @@ if ($conf->use_javascript_ajax) { print $form->selectarray("TICKET_ACTIVATE_LOG_BY_EMAIL", $arrval, $conf->global->TICKET_ACTIVATE_LOG_BY_EMAIL); } print ''; -print ''; print ''; @@ -348,7 +348,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) print $form->selectarray("TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS", $arrval, $conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS); } print ''; - print ''; print ''; @@ -365,7 +365,7 @@ if ($conf->use_javascript_ajax) { print $form->selectarray("TICKET_LIMIT_VIEW_ASSIGNED_ONLY", $arrval, $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY); } print ''; -print ''; print ''; @@ -386,7 +386,7 @@ if ($conf->use_javascript_ajax) { print $form->selectarray("TICKET_AUTO_ASSIGN_USER_CREATE", $arrval, $conf->global->TICKET_AUTO_ASSIGN_USER_CREATE); } print ''; -print ''; print ''; @@ -426,7 +426,7 @@ if ($conf->use_javascript_ajax) { print $form->selectarray("TICKET_ACTIVATE_LOG_BY_EMAIL", $arrval, $conf->global->TICKET_ACTIVATE_LOG_BY_EMAIL); } print ''; -print ''; print ''; @@ -438,7 +438,7 @@ print ''; print ''; print ''; -print ''; print ''; @@ -447,7 +447,7 @@ print ''; print ''; print ''; -print ''; print ''; @@ -460,7 +460,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor = new DolEditor('TICKET_MESSAGE_MAIL_INTRO', $mail_intro, '100%', 120, 'dolibarr_mailings', '', false, true, $conf->global->FCKEDITOR_ENABLE_MAIL, ROWS_2, 70); $doleditor->Create(); print ''; -print ''; @@ -472,7 +472,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor = new DolEditor('TICKET_MESSAGE_MAIL_SIGNATURE', $mail_signature, '100%', 120, 'dolibarr_mailings', '', false, true, $conf->global->FCKEDITOR_ENABLE_MAIL, ROWS_2, 70); $doleditor->Create(); print ''; -print ''; diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php index d216252c329..de46acb69f5 100644 --- a/htdocs/admin/ticket_public.php +++ b/htdocs/admin/ticket_public.php @@ -218,7 +218,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) print $form->selectarray("TICKET_EMAIL_MUST_EXISTS", $arrval, $conf->global->TICKET_EMAIL_MUST_EXISTS); } print ''; - print ''; print ''; @@ -235,7 +235,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) print $form->selectarray("TICKET_SHOW_MODULE_LOGO", $arrval, $conf->global->TICKET_SHOW_MODULE_LOGO); } print ''; - print ''; print ''; @@ -251,7 +251,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) print $form->selectarray("TICKET_SHOW_COMPANY_LOGO", $arrval, $conf->global->TICKET_SHOW_COMPANY_LOGO); } print ''; - print ''; print ''; @@ -268,7 +268,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) print $form->selectarray("TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS", $arrval, $conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS); } print ''; - print ''; print ''; @@ -310,7 +310,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) print ''; print ''; - print ''; @@ -322,7 +322,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) $doleditor = new DolEditor('TICKET_PUBLIC_TEXT_HOME', $public_text_home, '100%', 180, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70); $doleditor->Create(); print ''; - print ''; @@ -334,7 +334,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) $doleditor = new DolEditor('TICKET_PUBLIC_TEXT_HELP_MESSAGE', $public_text_help_message, '100%', 180, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70); $doleditor->Create(); print ''; - print ''; @@ -348,7 +348,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) print $form->selectarray("TICKET_DISABLE_CUSTOMER_MAILS", $arrval, $conf->global->TICKET_DISABLE_CUSTOMER_MAILS); } print ''; - print ''; print ''; @@ -361,7 +361,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) $doleditor = new DolEditor('TICKET_MESSAGE_MAIL_NEW', $mail_mesg_new, '100%', 120, 'dolibarr_mailings', '', false, true, $conf->global->FCKEDITOR_ENABLE_MAIL, ROWS_2, 70); $doleditor->Create(); print ''; - print ''; @@ -371,7 +371,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) print ''; print ''; - print ''; diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index 99a198df394..9be3591a298 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -302,11 +302,11 @@ if ($mode == 'overwrite') print ''; - print ''; - print '"; } // Defaut - print ''; // Preview - print '"; } // Defaut - print ''; // Preview - print ''; - else print ''; + else print ''; print "\n"; } diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php index 81899fee0f0..02abcf59660 100644 --- a/htdocs/admin/workflow.php +++ b/htdocs/admin/workflow.php @@ -162,7 +162,7 @@ foreach ($workflowcodes as $key => $params) print ' '.img_warning($langs->transnoentitiesnoconv($params['warning'])); } print "\n"; - print ''; $out .= ''; $out .= ''; - $out .= ''; - $out .= ''; + $out .= ''; + $out .= ''; $out .= ''."\n"; $i = 0; @@ -1451,8 +1451,8 @@ class Setup extends DolibarrApi $out .= ''; $out .= ''."\n"; $out .= ''."\n"; - $out .= ''."\n"; - $out .= ''."\n"; + $out .= ''."\n"; + $out .= ''."\n"; $out .= "\n"; } @@ -1498,7 +1498,7 @@ class Setup extends DolibarrApi $out .= ''; $out .= ''; $out .= ''; - $out .= ''; + $out .= ''; $out .= ''."\n"; $tmpfilelist = dol_sort_array($file_list['missing'], 'filename'); if (is_array($tmpfilelist) && count($tmpfilelist)) @@ -1510,7 +1510,7 @@ class Setup extends DolibarrApi $out .= ''; $out .= ''."\n"; $out .= ''."\n"; - $out .= ''."\n"; + $out .= ''."\n"; $out .= "\n"; } } @@ -1532,8 +1532,8 @@ class Setup extends DolibarrApi $out .= ''; $out .= ''; $out .= ''; - $out .= ''; - $out .= ''; + $out .= ''; + $out .= ''; $out .= ''; $out .= ''; $out .= ''."\n"; @@ -1547,8 +1547,8 @@ class Setup extends DolibarrApi $out .= ''; $out .= ''."\n"; $out .= ''."\n"; - $out .= ''."\n"; - $out .= ''."\n"; + $out .= ''."\n"; + $out .= ''."\n"; $size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']); $totalsize += $size; $out .= ''."\n"; @@ -1582,8 +1582,8 @@ class Setup extends DolibarrApi $out .= ''; $out .= ''; $out .= ''; - $out .= ''; - $out .= ''; + $out .= ''; + $out .= ''; $out .= ''; $out .= ''; $out .= ''."\n"; @@ -1597,8 +1597,8 @@ class Setup extends DolibarrApi $out .= ''; $out .= ''."\n"; $out .= ''."\n"; - $out .= ''."\n"; - $out .= ''."\n"; + $out .= ''."\n"; + $out .= ''."\n"; $size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']); $totalsize += $size; $out .= ''."\n"; diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php index 351f50438ed..be1afb30bd4 100644 --- a/htdocs/bookmarks/list.php +++ b/htdocs/bookmarks/list.php @@ -213,13 +213,13 @@ while ($i < min($num, $limit)) print "\n"; // Target - print '\n"; // Author - print '\n"; // Date creation - print '"; + print '"; // Position print '"; diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php index 9fca6afab6e..b9519dc377c 100644 --- a/htdocs/comm/action/list.php +++ b/htdocs/comm/action/list.php @@ -618,7 +618,7 @@ if ($resql) $formatToUse = $obj->fulldayevent ? 'day' : 'dayhour'; // Start date if (!empty($arrayfields['a.datep']['checked'])) { - print ''; } diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php index 134e239b66f..43e28b34ca3 100644 --- a/htdocs/comm/action/pertype.php +++ b/htdocs/comm/action/pertype.php @@ -603,7 +603,7 @@ echo ''; $i=0; for ($h = $begin_d; $h < $end_d; $h++) { - echo '"; } diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 54373fcf8a9..a21d6472ec6 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -665,7 +665,7 @@ while($currentdaytoshow<$lastdaytoshow) { } for ($h = $begin_h; $h < $end_h; $h++) { - echo '"; } diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index c6549c5c39a..b26f05a4adb 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -131,11 +131,11 @@ if ($resql) print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; - print ''; - print ''; + print ''; + print ''; print "\n"; while ($i < min($num, $limit)) @@ -150,10 +150,10 @@ if ($resql) print "\n"; // Nb of events - print ''; + print ''; // Button to build doc - print ''; @@ -184,8 +184,8 @@ if ($resql) print $out; print ''; - print ''; - print ''; + print ''; + print ''; } else { print ''; diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index f2754658f37..706153e897c 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -598,7 +598,7 @@ if ($object->fetch($id) >= 0) print ''; print ''; print ''; - print ''; + print ''; print '
'.$langs->trans("Parameters").''.$langs->trans("Activated").''.$langs->trans("Action").''.$langs->trans("Activated").''.$langs->trans("Action").'
'.$langs->trans("INVENTORY_DISABLE_VIRTUAL").''; + print ''; if ($conf->use_javascript_ajax) { print ajax_constantonoff('INVENTORY_DISABLE_VIRTUAL'); } else { @@ -486,7 +486,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) // Example with a yes / no select /*print '
'.$langs->trans("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA").''; + print ''; if ($conf->use_javascript_ajax) { print ajax_constantonoff('INVENTORY_USE_MIN_PA_IF_NO_LAST_PA'); } else { diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php index ff9a621f706..7ebe887f306 100644 --- a/htdocs/admin/supplier_invoice.php +++ b/htdocs/admin/supplier_invoice.php @@ -268,7 +268,7 @@ foreach ($dirmodels as $reldir) else print $tmp; print ''; + print ''; if ($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER == "$file") { print img_picto($langs->trans("Activated"), 'switch_on'); @@ -297,7 +297,7 @@ foreach ($dirmodels as $reldir) } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''."\n"; + print ''."\n"; //if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF != "$name") //{ // Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all @@ -411,13 +411,13 @@ foreach ($dirmodels as $reldir) } else { - print ''."\n"; + print ''."\n"; print 'scandir.'&label='.urlencode($module->name).'&type=invoice_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').''; print "'; + print ''; if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF == "$name") { //print img_picto($langs->trans("Default"),'on'); @@ -438,10 +438,10 @@ foreach ($dirmodels as $reldir) $htmltooltip .= '
'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1); $htmltooltip .= '
'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1); $htmltooltip .= '
'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; print ''.img_object($langs->trans("Preview"), 'order').''; print ''; + print ''; if ($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER == "$file") { print img_picto($langs->trans("Activated"), 'switch_on'); @@ -327,7 +327,7 @@ foreach ($dirmodels as $reldir) } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''."\n"; + print ''."\n"; if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF != "$name") { print 'scandir.'&label='.urlencode($module->name).'&type=order_supplier">'; @@ -435,13 +435,13 @@ foreach ($dirmodels as $reldir) } else { - print ''."\n"; + print ''."\n"; print 'scandir.'&label='.urlencode($module->name).'&type=order_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').''; print "'; + print ''; if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF == "$name") { print img_picto($langs->trans("Default"), 'on'); @@ -460,10 +460,10 @@ foreach ($dirmodels as $reldir) $htmltooltip .= '
'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1); $htmltooltip .= '
'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1); $htmltooltip .= '
'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; print ''.img_object($langs->trans("Preview"), 'order').''; print ''; + print ''; //print "> ".$conf->global->SUPPLIER_PAYMENT_ADDON." - ".$file; if ($conf->global->SUPPLIER_PAYMENT_ADDON == $file || $conf->global->SUPPLIER_PAYMENT_ADDON.'.php' == $file) { @@ -289,7 +289,7 @@ foreach ($dirmodels as $reldir) } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); if ($conf->global->PAYMENT_ADDON.'.php' == $file) // If module is the one used, we show existing errors @@ -366,7 +366,7 @@ foreach ($dirmodels as $reldir) // Active if (in_array($name, $def)) { - print ''."\n"; + print ''."\n"; //if ($conf->global->SUPPLIER_PAYMENT_ADDON_PDF != "$name") //{ // Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all @@ -382,13 +382,13 @@ foreach ($dirmodels as $reldir) } else { - print ''."\n"; + print ''."\n"; print 'scandir.'&label='.urlencode($module->name).'&type=SUPPLIER_PAYMENT">'.img_picto($langs->trans("Disabled"), 'switch_off').''; print "'; + print ''; if ($conf->global->SUPPLIER_PAYMENT_ADDON_PDF == "$name") { //print img_picto($langs->trans("Default"),'on'); @@ -407,10 +407,10 @@ foreach ($dirmodels as $reldir) $htmltooltip .= '
'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur; $htmltooltip .= '

'.$langs->trans("FeaturesSupported").':'; $htmltooltip .= '
'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; print ''.img_object($langs->trans("Preview"), 'order').''; print ''; + print ''; if ($conf->global->SUPPLIER_PROPOSAL_ADDON == "$file") { print img_picto($langs->trans("Activated"), 'switch_on'); @@ -305,7 +305,7 @@ foreach ($dirmodels as $reldir) } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''."\n"; + print ''."\n"; print ''; print img_picto($langs->trans("Enabled"), 'switch_on'); print ''; @@ -450,12 +450,12 @@ foreach ($dirmodels as $reldir) $htmltooltip.='
'.$langs->trans("WatermarkOnDraftProposal").': '.yn($module->option_draft_watermark, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; if ($module->type == 'pdf') { print ''.img_object($langs->trans("Preview"), 'bill').''; diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php index 98d77d47118..a7982d38ab9 100644 --- a/htdocs/admin/ticket.php +++ b/htdocs/admin/ticket.php @@ -250,7 +250,7 @@ foreach ($dirmodels as $reldir) { print ''; + print ''; if ($conf->global->TICKET_ADDON == 'mod_'.$classname) { print img_picto($langs->trans("Activated"), 'switch_on'); } else { @@ -274,7 +274,7 @@ foreach ($dirmodels as $reldir) { } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; +print ''; print $form->textwithpicto('', $langs->trans("TicketsDisableEmailHelp"), 1, 'help'); print '
'; +print ''; print $form->textwithpicto('', $langs->trans("TicketsLogEnableEmailHelp"), 1, 'help'); print '
'; + print ''; print $form->textwithpicto('', $langs->trans("TicketsEmailAlsoSendToMainAddressHelp"), 1, 'help'); print '
'; +print ''; print $form->textwithpicto('', $langs->trans("TicketsLimitViewAssignedOnlyHelp"), 1, 'help'); print '
'; +print ''; print $form->textwithpicto('', $langs->trans("TicketsAutoAssignTicketHelp"), 1, 'help'); print '
'; +print ''; print $form->textwithpicto('', $langs->trans("TicketsLogEnableEmailHelp"), 1, 'help'); print '
'.$langs->trans("TicketEmailNotificationTo").''; print ''; +print ''; print $form->textwithpicto('', $langs->trans("TicketEmailNotificationToHelp"), 1, 'help'); print '
'.$langs->trans("TicketEmailNotificationFrom").''; print ''; +print ''; print $form->textwithpicto('', $langs->trans("TicketEmailNotificationFromHelp"), 1, 'help'); print '
'; +print ''; print $form->textwithpicto('', $langs->trans("TicketMessageMailIntroHelpAdmin"), 1, 'help'); print '
'; +print ''; print $form->textwithpicto('', $langs->trans("TicketMessageMailSignatureHelpAdmin"), 1, 'help'); print '
'; + print ''; print $form->textwithpicto('', $langs->trans("TicketsEmailMustExistHelp"), 1, 'help'); print '
'; + print ''; print $form->textwithpicto('', $langs->trans("TicketsShowModuleLogoHelp"), 1, 'help'); print '
'; + print ''; print $form->textwithpicto('', $langs->trans("TicketsShowCompanyLogoHelp"), 1, 'help'); print '
'; + print ''; print $form->textwithpicto('', $langs->trans("TicketsEmailAlsoSendToMainAddressHelp"), 1, 'help'); print '
'; print ''; + print ''; print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTopicHelp"), 1, 'help'); print '
'; + print ''; print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTextHomeHelpAdmin"), 1, 'help'); print '
'; + print ''; print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTextHelpMessageHelpAdmin"), 1, 'help'); print '
'; + print ''; print $form->textwithpicto('', $langs->trans("TicketsDisableEmailHelp"), 1, 'help'); print '
'; + print ''; print $form->textwithpicto('', $langs->trans("TicketNewEmailBodyHelp"), 1, 'help'); print '
'; print ''; + print ''; print $form->textwithpicto('', $langs->trans("TicketUrlPublicInterfaceHelpAdmin"), 1, 'help'); print '
'; print ''; print ''; + print ''; } else {*/ - print ''; + print ''; print ''; //} print ''; @@ -356,7 +356,7 @@ if ($mode == 'overwrite') } print ''; + print ''; if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int')) { print ''; diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php index cfc5a65cc54..c0db15a48a7 100644 --- a/htdocs/admin/user.php +++ b/htdocs/admin/user.php @@ -263,7 +263,7 @@ foreach ($dirmodels as $reldir) // Active if (in_array($name, $def)) { - print ''."\n"; + print ''."\n"; print ''; print img_picto($langs->trans("Enabled"), 'switch_on'); print ''; @@ -271,13 +271,13 @@ foreach ($dirmodels as $reldir) } else { - print ''."\n"; + print ''."\n"; print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').''; print "'; + print ''; if ($conf->global->USER_ADDON_PDF == $name) { print img_picto($langs->trans("Default"), 'on'); @@ -303,12 +303,12 @@ foreach ($dirmodels as $reldir) $htmltooltip.='
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; if ($module->type == 'pdf') { print ''.img_object($langs->trans("Preview"), 'contract').''; diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php index fd7348bc603..75cdc514518 100644 --- a/htdocs/admin/usergroup.php +++ b/htdocs/admin/usergroup.php @@ -210,7 +210,7 @@ foreach ($dirmodels as $reldir) // Active if (in_array($name, $def)) { - print ''."\n"; + print ''."\n"; print ''; print img_picto($langs->trans("Enabled"), 'switch_on'); print ''; @@ -218,13 +218,13 @@ foreach ($dirmodels as $reldir) } else { - print ''."\n"; + print ''."\n"; print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').''; print "'; + print ''; if ($conf->global->USERGROUP_ADDON_PDF == $name) { print img_picto($langs->trans("Default"), 'on'); @@ -250,12 +250,12 @@ foreach ($dirmodels as $reldir) $htmltooltip.='
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; if ($module->type == 'pdf') { print ''.img_object($langs->trans("Preview"), 'contract').''; diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php index c759b0a8d8c..9840121861a 100644 --- a/htdocs/admin/website.php +++ b/htdocs/admin/website.php @@ -625,7 +625,7 @@ if ($id) // Delete link if ($iserasable) print ''.img_delete().''.img_delete($langs->trans("DisableSiteFirst"), 'class="opacitymedium"').''.img_delete($langs->trans("DisableSiteFirst"), 'class="opacitymedium"').'
'; + print ''; if (!empty($conf->use_javascript_ajax)) { print ajax_constantonoff($key); diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php index 0dfdc9362ed..05bad1bbe7e 100644 --- a/htdocs/api/class/api_setup.class.php +++ b/htdocs/api/class/api_setup.class.php @@ -1430,8 +1430,8 @@ class Setup extends DolibarrApi $out .= '
#'.$langs->trans("Constant").''.$langs->trans("ExpectedValue").''.$langs->trans("Value").''.$langs->trans("ExpectedValue").''.$langs->trans("Value").'
'.$i.''.$constname.''.$constvalue.''.$valueforchecksum.''.$constvalue.''.$valueforchecksum.'
#'.$langs->trans("Filename").''.$langs->trans("ExpectedChecksum").''.$langs->trans("ExpectedChecksum").'
'.$i.''.$file['filename'].''.$file['expectedmd5'].''.$file['expectedmd5'].'
#'.$langs->trans("Filename").''.$langs->trans("ExpectedChecksum").''.$langs->trans("CurrentChecksum").''.$langs->trans("ExpectedChecksum").''.$langs->trans("CurrentChecksum").''.$langs->trans("Size").''.$langs->trans("DateModification").'
'.$i.''.$file['filename'].''.$file['expectedmd5'].''.$file['md5'].''.$file['expectedmd5'].''.$file['md5'].''.dol_print_size($size).'
#'.$langs->trans("Filename").''.$langs->trans("ExpectedChecksum").''.$langs->trans("CurrentChecksum").''.$langs->trans("ExpectedChecksum").''.$langs->trans("CurrentChecksum").''.$langs->trans("Size").''.$langs->trans("DateModification").'
'.$i.''.$file['filename'].''.$file['expectedmd5'].''.$file['md5'].''.$file['expectedmd5'].''.$file['md5'].''.dol_print_size($size).''; + print ''; if ($obj->target == 0) print $langs->trans("BookmarkTargetReplaceWindowShort"); if ($obj->target == 1) print $langs->trans("BookmarkTargetNewWindowShort"); print "'; + print ''; if ($obj->fk_user) { $userstatic->id=$obj->fk_user; @@ -233,7 +233,7 @@ while ($i < min($num, $limit)) print "'.dol_print_date($db->jdate($obj->dateb), 'day')."'.dol_print_date($db->jdate($obj->dateb), 'day')."'.$obj->position."'; + print ''; print dol_print_date($db->jdate($obj->dp), $formatToUse); $late = 0; if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late = 1; @@ -631,7 +631,7 @@ if ($resql) // End date if (!empty($arrayfields['a.datep2']['checked'])) { - print ''; + print ''; print dol_print_date($db->jdate($obj->dp2), $formatToUse); print ''; + echo ''; print ''.sprintf("%02d", $h).''; print "'; + echo ''; print ''.sprintf("%02d", $h).''; print "
'.$langs->trans("Period").''.$langs->trans("EventsNb").''.$langs->trans("Action").''.$langs->trans("EventsNb").''.$langs->trans("Action").''.$langs->trans("PDF").''.$langs->trans("Date").''.$langs->trans("Size").''.$langs->trans("Date").''.$langs->trans("Size").'
".$obj->df."'.$obj->cc.''.$obj->cc.''; + print ''; print 'month.'&year='.$obj->year.'">'.img_picto($langs->trans('BuildDoc'), 'filenew').''; print ''.dol_print_date(dol_filemtime($file), 'dayhour').''.dol_print_size(dol_filesize($file)).''.dol_print_date(dol_filemtime($file), 'dayhour').''.dol_print_size(dol_filesize($file)).' '.$obj->lastname.''.$obj->firstname.''.$obj->other.''; + print ''; if (empty($obj->source_id) || empty($obj->source_type)) { print empty($obj->source_url) ? '' : $obj->source_url; // For backward compatibility @@ -649,7 +649,7 @@ if ($object->fetch($id) >= 0) else { // Date sent - print ''.$obj->date_envoi.''.$obj->date_envoi.''; print $object::libStatutDest($obj->statut, 2, $obj->error_text); diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index 1dc7a430575..b0cbcc23784 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -165,8 +165,8 @@ if ($result) { print ''; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; $num = $db->num_rows($result); @@ -184,8 +184,8 @@ if ($result) { print ''; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; print ''; $i++; diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php index cbd0c244bb3..b3b07a8a875 100644 --- a/htdocs/comm/mailing/list.php +++ b/htdocs/comm/mailing/list.php @@ -228,14 +228,14 @@ if ($result) print ''; // Date creation - print ''; // Nb of email if (!$filteremail) { - print ''; @@ -890,7 +890,7 @@ if ($resql) { if (!is_array($typenArray) || empty($typenArray)) $typenArray = $formcompany->typent_array(1); - print ''; if (!$i) $totalarray['nbfield']++; @@ -899,7 +899,7 @@ if ($resql) // Date proposal if (!empty($arrayfields['p.date']['checked'])) { - print '\n"; if (!$i) $totalarray['nbfield']++; @@ -910,7 +910,7 @@ if ($resql) { if ($obj->dfv) { - print ''; } else @@ -924,7 +924,7 @@ if ($resql) { if ($obj->ddelivery) { - print ''; } else @@ -936,7 +936,7 @@ if ($resql) // Availability if (! empty($arrayfields['ava.rowid']['checked'])) { - print ''; if (! $i) $totalarray['nbfield']++; diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index 4c7b393c8db..4a2b8dea419 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -274,7 +274,7 @@ print '
'; print '
'; print '
'.$langs->trans("LastMailings", $limit).''.$langs->trans("DateCreation").''.$langs->trans("NbOfEMails").''.$langs->trans("DateCreation").''.$langs->trans("NbOfEMails").''.$langs->trans("AllEMailings").'
'.$mailstatic->getNomUrl(1).''.dol_trunc($obj->titre, 38).''.dol_print_date($db->jdate($obj->date_creat), 'day').''.($obj->nbemail ? $obj->nbemail : "0").''.dol_print_date($db->jdate($obj->date_creat), 'day').''.($obj->nbemail ? $obj->nbemail : "0").''.$mailstatic->LibStatut($obj->statut, 5).'
'.$obj->titre.''; + print ''; print dol_print_date($db->jdate($obj->datec), 'day'); print ''; + print ''; $nbemail = $obj->nbemail; /*if ($obj->statut != 3 && !empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) { diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 1a44efa45ec..887c99e7aeb 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -879,7 +879,7 @@ if ($resql) // Country if (!empty($arrayfields['country.code_iso']['checked'])) { - print ''; + print ''; $tmparray = getCountry($obj->fk_pays, 'all'); print $tmparray['label']; print ''; + print ''; print $typenArray[$obj->typent_code]; print ''; + print ''; print dol_print_date($db->jdate($obj->dp), 'day'); print "'.dol_print_date($db->jdate($obj->dfv), 'day'); + print ''.dol_print_date($db->jdate($obj->dfv), 'day'); print ''.dol_print_date($db->jdate($obj->ddelivery), 'day'); + print ''.dol_print_date($db->jdate($obj->ddelivery), 'day'); print ''; + print ''; $form->form_availability('', $obj->availability, 'none', 1); print '
'; print ''; -print ''; +print ''; print ''; print ''; print ''; diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index a4f3fb0503b..2b8c8ef5df2 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -235,7 +235,7 @@ if ($socid > 0) print ''; print ''; print ''; - print ''; + print ''; print ''; $num = $db->num_rows($resql); if ($num > 0) @@ -246,7 +246,7 @@ if ($socid > 0) $obj = $db->fetch_object($resql); print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -294,7 +294,7 @@ if ($socid > 0) print ''; print ''; print ''; - print ''; + print ''; print ''; $num = $db->num_rows($resql); if ($num > 0) @@ -305,7 +305,7 @@ if ($socid > 0) $obj = $db->fetch_object($resql); print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index 272e0173980..c4b6ac18987 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -1062,7 +1062,7 @@ if ($socid > 0) { print ''; } - print ''; print ''; diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 70a504f23f3..e8dde584661 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -1020,7 +1020,7 @@ if ($resql) // Country if (! empty($arrayfields['country.code_iso']['checked'])) { - print ''; @@ -1029,7 +1029,7 @@ if ($resql) // Type ent if (! empty($arrayfields['typent.code']['checked'])) { - print ''; @@ -1039,7 +1039,7 @@ if ($resql) // Order date if (! empty($arrayfields['c.date_commande']['checked'])) { - print ''; if (! $i) $totalarray['nbfield']++; @@ -1047,7 +1047,7 @@ if ($resql) // Plannned date of delivery if (! empty($arrayfields['c.date_delivery']['checked'])) { - print ''; if (! $i) $totalarray['nbfield']++; @@ -1116,7 +1116,7 @@ if ($resql) // Billed if (! empty($arrayfields['c.facture']['checked'])) { - print ''; + print ''; if (! $i) $totalarray['nbfield']++; } diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index 20014e58767..ced7d258167 100644 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -705,7 +705,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error) print ''; // Checkbox - print ''; diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index e3413f5b927..e9eca9dafa9 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -301,7 +301,7 @@ print '

'; print '
'; print '
'.$langs->trans("Year").''.$langs->trans("Year").''.$langs->trans("NbOfProposals").'%'.$langs->trans("AmountTotal").''.$langs->trans("Date").''.$langs->trans("CustomerRelativeDiscountShort").''.$langs->trans("NoteReason").''.$langs->trans("User").''.$langs->trans("User").'
'.dol_print_date($db->jdate($obj->dc), "dayhour").''.price2num($obj->remise_percent).'%'.price2num($obj->remise_percent).'%'.$obj->note.''.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'
'.$langs->trans("Date").''.$langs->trans("CustomerRelativeDiscountShort").''.$langs->trans("NoteReason").''.$langs->trans("User").''.$langs->trans("User").'
'.dol_print_date($db->jdate($obj->dc), "dayhour").''.price2num($obj->remise_percent).'%'.price2num($obj->remise_percent).'%'.$obj->note.''.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'
'.price($obj->multicurrency_amount_ttc).''; + print ''; print ''.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.''; print ' '; + print ''; $tmparray=getCountry($obj->fk_pays, 'all'); print $tmparray['label']; print ''; + print ''; if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1); print $typenArray[$obj->typent_code]; print ''; + print ''; print dol_print_date($db->jdate($obj->date_commande), 'day'); print ''; + print ''; print dol_print_date($db->jdate($obj->date_delivery), 'day'); print ''.yn($obj->billed).''.yn($obj->billed).''.$generic_commande->LibStatut($objp->fk_statut, $objp->billed, 5).''; + print ''; print ''; print '
'; print ''; -print ''; +print ''; print ''; print ''; print ''; diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index 59a602fa706..0980f70df29 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -703,7 +703,7 @@ if ($resql) print ''; /*if (! empty($conf->accounting->enabled)) { - print ''; }*/ @@ -739,11 +739,11 @@ if ($resql) print ''; /*if (! empty($conf->accounting->enabled)) { - print ''; }*/ - print ''; @@ -1101,7 +1101,7 @@ if ($resql) print ''; } - print '
'.$langs->trans("Year").''.$langs->trans("Year").''.$langs->trans("NbOfOrders").'%'.$langs->trans("AmountTotal").''.$langs->trans("Credit").''; + print ''; print $langs->trans("AccountAccounting"); print ''; + print ''; print $formaccounting->select_account($search_accountancy_code, 'search_accountancy_code', 1, null, 1, 1, ''); print ''; + print ''; print '
'; print ''; print '
'; + print ''; print ''; print '