From 8d877fd289b207a4d124fc2634c401e754dfb8fe Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 22 Jan 2019 11:37:23 +0100 Subject: [PATCH 01/10] update with html5 compliant code --- htdocs/admin/agenda_extsites.php | 2 +- htdocs/admin/agenda_other.php | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php index 236483f5ed4..66f18308931 100644 --- a/htdocs/admin/agenda_extsites.php +++ b/htdocs/admin/agenda_extsites.php @@ -196,7 +196,7 @@ print "".$langs->trans("Parameter").""; print "".$langs->trans("Name").""; print "".$langs->trans("ExtSiteUrlAgenda")." (".$langs->trans("Example").': http://yoursite/agenda/agenda.ics)'; print "".$form->textwithpicto($langs->trans("FixTZ"), $langs->trans("FillFixTZOnlyIfRequired"), 1).''; -print ''.$langs->trans("Color").''; +print ''.$langs->trans("Color").''; print ""; $i=1; diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php index 2a370cdf580..72097057149 100644 --- a/htdocs/admin/agenda_other.php +++ b/htdocs/admin/agenda_other.php @@ -331,7 +331,7 @@ print ''."\n"; print ''."\n"; print ''."\n"; print ''."\n"; -print ''."\n"; +print ''."\n"; print ''."\n"; // Manual or automatic @@ -339,7 +339,7 @@ print ''."\n"; print ''."\n"; print ''."\n"; print ''."\n"; -print ''."\n"; print ''."\n"; print ''."\n"; print ''."\n"; -print ''."\n"; @@ -367,7 +367,7 @@ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) print ''."\n"; print ''."\n"; print ''."\n"; - print ''."\n"; } @@ -376,7 +376,7 @@ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) print ''."\n"; print ''."\n"; print ''."\n"; -print ''."\n"; @@ -385,7 +385,7 @@ print ''."\n"; print ''."\n"; print ''."\n"; print ''."\n"; -print ''."\n"; From 7a7a7e7aa9ac2f9a91b7e07369fcc5e5b646653c Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 22 Jan 2019 11:40:53 +0100 Subject: [PATCH 02/10] update with html5 compliant code --- htdocs/admin/agenda_reminder.php | 8 ++++---- htdocs/admin/chequereceipts.php | 2 +- htdocs/admin/commande.php | 6 +++--- htdocs/admin/company.php | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php index 269880236cb..856d6f19668 100644 --- a/htdocs/admin/agenda_reminder.php +++ b/htdocs/admin/agenda_reminder.php @@ -186,7 +186,7 @@ print '
'.$langs->trans("Parameters").' '.$langs->trans("Value").''.$langs->trans("Value").'
'.$langs->trans("AGENDA_USE_EVENT_TYPE").' '."\n"; +print ''."\n"; //print ajax_constantonoff('AGENDA_USE_EVENT_TYPE'); Do not use ajax here, we need to reload page to change other combo list if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) { @@ -355,7 +355,7 @@ print '
'.$langs->trans("AGENDA_DEFAULT_VIEW").' '."\n"; +print ''."\n"; $tmplist=array(''=>' ', 'show_list'=>$langs->trans("ViewList"), 'show_month'=>$langs->trans("ViewCal"), 'show_week'=>$langs->trans("ViewWeek"), 'show_day'=>$langs->trans("ViewDay"), 'show_peruser'=>$langs->trans("ViewPerUser")); print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $conf->global->AGENDA_DEFAULT_VIEW); print '
'.$langs->trans("AGENDA_USE_EVENT_TYPE_DEFAULT").' '."\n"; + print ''."\n"; $formactions->select_type_actions($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT, "AGENDA_USE_EVENT_TYPE_DEFAULT", 'systemauto', 0, 1); print '
'.$langs->trans("AGENDA_DEFAULT_FILTER_TYPE").' '."\n"; +print ''."\n"; $formactions->select_type_actions($conf->global->AGENDA_DEFAULT_FILTER_TYPE, "AGENDA_DEFAULT_FILTER_TYPE", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 1); print '
'.$langs->trans("AGENDA_DEFAULT_FILTER_STATUS").' '."\n"; +print ''."\n"; $formactions->form_select_status_action('agenda', $conf->global->AGENDA_DEFAULT_FILTER_STATUS, 1, 'AGENDA_DEFAULT_FILTER_STATUS', 1, 2, 'minwidth100'); print '
'."\n"; print ''."\n"; print ''."\n"; print ''."\n"; -print ''."\n"; +print ''."\n"; print ''."\n"; @@ -196,7 +196,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) print ''."\n"; print ''."\n"; print ''."\n"; - print ''."\n"; print ''."\n"; print ''."\n"; - print ''."\n"; print ''."\n"; print ''."\n"; - print '\n"; print '
'.$langs->trans("Parameters").' '.$langs->trans("Value").''.$langs->trans("Value").'
'.$langs->trans('AGENDA_REMINDER_EMAIL', $langs->transnoentities("Module2300Name")).' '."\n"; + print ''."\n"; if (empty($conf->global->AGENDA_REMINDER_EMAIL)) { print ''.img_picto($langs->trans('Disabled'),'switch_off').''; @@ -213,7 +213,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) print '
'.$langs->trans('AGENDA_REMINDER_BROWSER').' '."\n"; + print ''."\n"; if (empty($conf->global->AGENDA_REMINDER_BROWSER)) { print ''.img_picto($langs->trans('Disabled'),'switch_off').''; @@ -225,7 +225,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) print '
'.$langs->trans('AGENDA_REMINDER_BROWSER_SOUND').' '."\n"; + print ''."\n"; if (empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) { print ''.img_picto($langs->trans('Disabled'),'switch_off').''; diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php index f85018c03b8..013b140ee60 100644 --- a/htdocs/admin/chequereceipts.php +++ b/htdocs/admin/chequereceipts.php @@ -267,7 +267,7 @@ else $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes'); print $doleditor->Create(); } -print ''; +print ''; print ''; print "
'; diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index d4d7b789974..2360c1f7b6e 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -556,7 +556,7 @@ else $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes'); print $doleditor->Create(); } -print ''; +print ''; print ''; print "\n"; print ''; @@ -570,7 +570,7 @@ print ''; print $form->textwithpicto($langs->trans("WatermarkOnDraftOrders"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'
'; print ''; print ''; -print ''; +print ''; print ''; print "\n"; print ''; @@ -674,7 +674,7 @@ print "\n"; print ''; print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'
'; -print ''; +print ''; print "\n"; print ''; diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 15af65fbb8d..f0a0cde4c92 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -602,7 +602,7 @@ if ($action == 'edit' || $action == 'updateedit') print ''; print ''; print ''; - print ''; + print ''; print "\n"; @@ -635,7 +635,7 @@ if ($action == 'edit' || $action == 'updateedit') print '
'.$langs->trans("VATManagement").''.$langs->trans("Description").'  
'; print ''; print ''; - print ''; + print ''; print "\n"; // Note: When option is not set, it must not appears as set on on, because there is no default value for this option @@ -678,7 +678,7 @@ if ($action == 'edit' || $action == 'updateedit') print '
'.$langs->transcountry("LocalTax1Management",$mysoc->country_code).''.$langs->trans("Description").'  
'; print ''; print ''; - print ''; + print ''; print "\n"; @@ -1040,7 +1040,7 @@ else print '
'.$langs->transcountry("LocalTax2Management",$mysoc->country_code).''.$langs->trans("Description").'  
'; print ''; print ''; - print ''; + print ''; print "\n"; @@ -1077,7 +1077,7 @@ else print '
'.$langs->trans("VATManagement").''.$langs->trans("Description").'  
'; print ''; print ''; - print ''; + print ''; print "\n"; @@ -1131,7 +1131,7 @@ else print '
'.$langs->transcountry("LocalTax1Management",$mysoc->country_code).''.$langs->trans("Description").'  
'; print ''; print ''; - print ''; + print ''; print "\n"; From 05b33c149c4a960507d70bafe84fa8e739bb44a7 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 22 Jan 2019 11:46:12 +0100 Subject: [PATCH 03/10] update with html5 compliant code --- htdocs/admin/emailcollector_card.php | 8 ++++---- htdocs/admin/emailcollector_list.php | 2 +- htdocs/admin/expensereport_ik.php | 2 +- htdocs/admin/expensereport_rules.php | 2 +- htdocs/admin/external_rss.php | 2 +- htdocs/admin/facture.php | 12 +++++------ htdocs/admin/fichinter.php | 12 +++++------ htdocs/admin/geoipmaxmind.php | 2 +- htdocs/admin/ldap_contacts.php | 30 ++++++++++++++-------------- 9 files changed, 36 insertions(+), 36 deletions(-) diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php index eaef18c9543..b165f60b21c 100644 --- a/htdocs/admin/emailcollector_card.php +++ b/htdocs/admin/emailcollector_card.php @@ -449,7 +449,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea print ''; - print ''; + print ''; print ''; // List filters foreach($object->filters as $rulefilter) @@ -462,7 +462,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea print $langs->trans($arrayoftypes[$rulefilter['type']]); print ''; print ''; - print ''; @@ -492,7 +492,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea print $form->textwithpicto('', $htmltext); print ''; print ''; - print ''; + print ''; print ''; // List operations $nboflines = count($object->actions); @@ -509,7 +509,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea print $langs->trans($arrayoftypes[$ruleaction['type']]); print ''; print ''; - print ''; diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php index 7e72a5ce003..f388cea8b55 100644 --- a/htdocs/admin/emailcollector_list.php +++ b/htdocs/admin/emailcollector_list.php @@ -503,7 +503,7 @@ if (isset($totalarray['pos'])) while ($i < $totalarray['nbfield']) { $i++; - if (! empty($totalarray['pos'][$i])) print ''; + if (! empty($totalarray['pos'][$i])) print ''; else { if ($i == 1) diff --git a/htdocs/admin/expensereport_ik.php b/htdocs/admin/expensereport_ik.php index d3937a98ba7..0f01fa7a750 100644 --- a/htdocs/admin/expensereport_ik.php +++ b/htdocs/admin/expensereport_ik.php @@ -154,7 +154,7 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab) echo ''; // Action - echo ''; echo ''; echo ''; - echo ''; + echo ''; echo ''; echo '
'.$langs->transcountry("LocalTax2Management",$mysoc->country_code).''.$langs->trans("Description").'  
'; print ''; print '
'.$rulefilter['rulevalue'].''; + print ''; //print $rulefilterobj->getLibStatut(3); print ' '.img_delete().''; print '
'.$ruleaction['actionparam'].''; + print ''; //print $ruleactionobj->getLibStatut(3); print ' '.img_delete().''; print ''.price($totalarray['val'][$totalarray['pos'][$i]]).''.price($totalarray['val'][$totalarray['pos'][$i]]).''.$langs->trans('expenseReportPrintExample', price($range->ik->offset + 5 * $range->ik->coef)).''; + echo ''; if ($range->range_active == 1) { if ($action == 'edit' && $range->ik->id == $id && $range->rowid == $fk_range && $range->fk_c_exp_tax_cat == $fk_c_exp_tax_cat) diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php index 7b2baf0ed94..8594d060951 100644 --- a/htdocs/admin/expensereport_rules.php +++ b/htdocs/admin/expensereport_rules.php @@ -187,7 +187,7 @@ if ($action != 'edit') echo ''.$form->selectDate(strtotime(date('Y-m-t', dol_now())), 'end', '', '', 0, '', 1, 0).''.$conf->currency.''.$form->selectyesno('restrictive', 0, 1).'
'; diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php index 048d002a3b7..c289c64b217 100644 --- a/htdocs/admin/external_rss.php +++ b/htdocs/admin/external_rss.php @@ -259,7 +259,7 @@ if ($resql) print ""; print "".$langs->trans("RSS")." ".($i+1).""; - print ''; + print ''; print "trans("Modify")."\">"; print "   "; print "trans("Delete")."\">"; diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 683453023b9..fe78e5aa5b6 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -619,7 +619,7 @@ if(!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) // Hidden conf print ''; print ''.$langs->trans("Type").''; print ''.$langs->trans("Name").''; - print ''; + print ''; print "\n"; $listtype=array( @@ -662,7 +662,7 @@ print ''; print ''; print ''; print $langs->trans("PaymentMode").''; -print ''; +print ''; print "\n"; print ''; @@ -762,7 +762,7 @@ print ''; print $langs->trans("ForceInvoiceDate"); print ''; print $form->selectyesno("forcedate",$conf->global->FAC_FORCE_DATE_VALIDATION,1); -print ''; +print ''; print ''; print "\n"; print ''; @@ -789,7 +789,7 @@ else $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes'); print $doleditor->Create(); } -print ''; +print ''; print ''; print "\n"; print ''; @@ -802,7 +802,7 @@ print ''; print $form->textwithpicto($langs->trans("WatermarkOnDraftBill"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'
'; print ''; print ''; -print ''; +print ''; print ''; print "\n"; print ''; @@ -842,7 +842,7 @@ print "\n"; print ''; print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'
'; -print ''; +print ''; print "\n"; print ''; diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index 7fd349363e1..9a259fd3c0d 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -554,7 +554,7 @@ else $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes'); print $doleditor->Create(); } -print ''; +print ''; print ''; print "\n"; print ''; @@ -567,7 +567,7 @@ print ''; print $form->textwithpicto($langs->trans("WatermarkOnDraftInterventionCards"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'
'; print ''; print ''; -print ''; +print ''; print ''; print "\n"; print ''; @@ -581,7 +581,7 @@ print 'global->FICHINTER_PRINT_PRODUCTS) print 'checked '; print '/>'; -print ''; +print ''; print ''; print "\n"; print ''; @@ -596,7 +596,7 @@ print ''; print ''; print 'global->FICHINTER_USE_SERVICE_DURATION?' checked':'') . '>'; print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -612,7 +612,7 @@ print ''; print ''; print 'global->FICHINTER_WITHOUT_DURATION?' checked':'') . '>'; print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -628,7 +628,7 @@ print ''; print ''; print 'global->FICHINTER_DATE_WITHOUT_HOUR?' checked':'') . '>'; print ''; -print ''; +print ''; print ''; print ''; print ''; diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php index 47c51069299..98ab10a988e 100644 --- a/htdocs/admin/geoipmaxmind.php +++ b/htdocs/admin/geoipmaxmind.php @@ -102,7 +102,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print "\n"; print ''; diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php index f5f5f868801..cb4972e84b3 100644 --- a/htdocs/admin/ldap_contacts.php +++ b/htdocs/admin/ldap_contacts.php @@ -143,105 +143,105 @@ print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("PathToGeoIPMaxmindCountryDataFile").'
'; print ''; print ''; print ''; -print ''; +print ''; print "\n"; // Common name print ''; -print '"; +print '"; print ''; // Name print ''; -print '"; +print '"; print ''; // Firstname print ''; -print '"; +print '"; print ''; // Company print ''; -print '"; +print '"; print ''; // Mail print ''; -print '"; +print '"; print ''; // Phone pro print ''; -print '"; +print '"; print ''; // Phone home print ''; -print '"; +print '"; print ''; // Mobile print ''; -print '"; +print '"; print ''; // Skype print ''; -print '"; +print '"; print ''; // Fax print ''; -print '"; +print '"; print ''; // Address print ''; -print '"; +print '"; print ''; // ZIP print ''; -print '"; +print '"; print ''; // TOWN print ''; -print '"; +print '"; print ''; // COUNTRY print ''; -print '"; +print '"; print ''; print '
'.$langs->trans("LDAPDolibarrMapping").''.$langs->trans("LDAPLdapMapping").''.$langs->trans("LDAPNamingAttribute").''.$langs->trans("LDAPNamingAttribute").'
'.$langs->trans("LDAPFieldFullname").''; print ''; print ''.$langs->trans("LDAPFieldFullnameExample").'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_FULLNAME?' checked':'').">global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_FULLNAME?' checked':'').">
'.$langs->trans("LDAPFieldName").''; print ''; print ''.$langs->trans("LDAPFieldNameExample").'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_NAME?' checked':'').">global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_NAME?' checked':'').">
'.$langs->trans("LDAPFieldFirstName").''; print ''; print ''.$langs->trans("LDAPFieldFirstNameExample").'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_FIRSTNAME?' checked':'').">global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_FIRSTNAME?' checked':'').">
'.$langs->trans("LDAPFieldCompany").''; print ''; print ''.$langs->trans("LDAPFieldCompanyExample").'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_COMPANY?' checked':'').">global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_COMPANY?' checked':'').">
'.$langs->trans("LDAPFieldMail").''; print ''; print ''.$langs->trans("LDAPFieldMailExample").'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_MAIL?' checked':'').">global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_MAIL?' checked':'').">
'.$langs->trans("LDAPFieldPhone").''; print ''; print ''.$langs->trans("LDAPFieldPhoneExample").'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_PHONE?' checked':'').">global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_PHONE?' checked':'').">
'.$langs->trans("LDAPFieldHomePhone").''; print ''; print ''.$langs->trans("LDAPFieldHomePhoneExample").'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_HOMEPHONE?' checked':'').">global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_HOMEPHONE?' checked':'').">
'.$langs->trans("LDAPFieldMobile").''; print ''; print ''.$langs->trans("LDAPFieldMobileExample").'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_MOBILE?' checked':'').">global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_MOBILE?' checked':'').">
'.$langs->trans("LDAPFieldSkype").''; print ''; print ''.$langs->trans("LDAPFieldSkypeExample").'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_SKYPE?' checked':'').">global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_SKYPE?' checked':'').">
'.$langs->trans("LDAPFieldFax").''; print ''; print ''.$langs->trans("LDAPFieldFaxExample").'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_FAX?' checked':'').">global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_FAX?' checked':'').">
'.$langs->trans("LDAPFieldAddress").''; print ''; print ''.$langs->trans("LDAPFieldAddressExample").'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_ADDRESS?' checked':'').">global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_ADDRESS?' checked':'').">
'.$langs->trans("LDAPFieldZip").''; print ''; print ''.$langs->trans("LDAPFieldZipExample").'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_ZIP?' checked':'').">global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_ZIP?' checked':'').">
'.$langs->trans("LDAPFieldTown").''; print ''; print ''.$langs->trans("LDAPFieldTownExample").'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_TOWN?' checked':'').">global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_TOWN?' checked':'').">
'.$langs->trans("LDAPFieldCountry").''; print ''; print ' global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_COUNTRY?' checked':'').">global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_COUNTRY?' checked':'').">
'; From a609c113838babe1d7fa5fe5f5c623f4c9b0f3f5 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 22 Jan 2019 11:48:15 +0100 Subject: [PATCH 04/10] update with html5 compliant code --- htdocs/admin/ldap_groups.php | 10 +++--- htdocs/admin/ldap_members.php | 56 ++++++++++++++--------------- htdocs/admin/ldap_members_types.php | 8 ++--- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php index 247ecfb28aa..43f66147123 100644 --- a/htdocs/admin/ldap_groups.php +++ b/htdocs/admin/ldap_groups.php @@ -135,7 +135,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print "\n"; // Filtre @@ -144,7 +144,7 @@ print "\n"; print ''; -print '"; +print '"; print ''; // Name @@ -152,7 +152,7 @@ print ''; print ''; -print '"; +print '"; print ''; */ @@ -160,14 +160,14 @@ print ''; print ''; -print '"; +print '"; print ''; // User group print ''; -print '"; +print '"; print ''; print '
'.$langs->trans("LDAPDolibarrMapping").''.$langs->trans("LDAPLdapMapping").''.$langs->trans("LDAPNamingAttribute").''.$langs->trans("LDAPNamingAttribute").'
'.$langs->trans("LDAPFieldName").''; print ''; print ''.$langs->trans("LDAPFieldCommonNameExample").'global->LDAP_KEY_GROUPS && $conf->global->LDAP_KEY_GROUPS==$conf->global->LDAP_GROUP_FIELD_FULLNAME)?' checked':'').">global->LDAP_KEY_GROUPS && $conf->global->LDAP_KEY_GROUPS==$conf->global->LDAP_GROUP_FIELD_FULLNAME)?' checked':'').">
'.$langs->trans("LDAPFieldName").''; print ''; print ''.$langs->trans("LDAPFieldNameExample").'global->LDAP_KEY_GROUPS==$conf->global->LDAP_GROUP_FIELD_NAME?' checked':'').">global->LDAP_KEY_GROUPS==$conf->global->LDAP_GROUP_FIELD_NAME?' checked':'').">
'.$langs->trans("LDAPFieldDescription").''; print ''; print ''.$langs->trans("LDAPFieldDescriptionExample").'global->LDAP_KEY_GROUPS && $conf->global->LDAP_KEY_GROUPS==$conf->global->LDAP_GROUP_FIELD_DESCRIPTION)?' checked':'').">global->LDAP_KEY_GROUPS && $conf->global->LDAP_KEY_GROUPS==$conf->global->LDAP_GROUP_FIELD_DESCRIPTION)?' checked':'').">
'.$langs->trans("LDAPFieldGroupMembers").''; print ''; print ''.$langs->trans("LDAPFieldGroupMembersExample").'global->LDAP_KEY_GROUPS && $conf->global->LDAP_KEY_GROUPS==$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS)?' checked':'').">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 818ec5aaff6..48d2aace5d7 100644 --- a/htdocs/admin/ldap_members.php +++ b/htdocs/admin/ldap_members.php @@ -167,7 +167,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print "\n"; // Filtre @@ -176,63 +176,63 @@ print "\n"; print ''; -print '"; +print '"; print ''; // Name print ''; -print '"; +print '"; print ''; // Firstname print ''; -print ''; +print ''; print ''; // Login unix print ''; -print '"; +print '"; print ''; // Login samba print ''; -print '"; +print '"; print ''; // Password not crypted print ''; -print ''; +print ''; print ''; // Password crypted print ''; -print ''; +print ''; print ''; // Mail print ''; -print '"; +print '"; print ''; // Phone pro print ''; -print ''; +print ''; print ''; // Phone perso @@ -240,77 +240,77 @@ print ''; print ''; -print ''; +print ''; print ''; // Mobile print ''; -print ''; +print ''; print ''; // Skype print ''; -print ''; +print ''; print ''; // Fax print ''; -print ''; +print ''; print ''; // Company print ''; -print ''; +print ''; print ''; // Address print ''; -print ''; +print ''; print ''; // ZIP print ''; -print ''; +print ''; print ''; // TOWN print ''; -print ''; +print ''; print ''; // COUNTRY print ''; -print ''; +print ''; print ''; // Description print ''; -print ''; +print ''; print ''; // Public Note print ''; -print ''; +print ''; print ''; // Birthday @@ -318,14 +318,14 @@ print ''; print ''; -print ''; +print ''; print ''; // Status print ''; -print ''; +print ''; print ''; // First subscription date @@ -333,35 +333,35 @@ print ''; print ''; -print ''; +print ''; print ''; // First subscription amount print ''; -print ''; +print ''; print ''; // Last subscription date print ''; -print ''; +print ''; print ''; // Last subscription amount print ''; -print ''; +print ''; print ''; // End last subscriptions print ''; -print ''; +print ''; print ''; print '
'.$langs->trans("LDAPDolibarrMapping").''.$langs->trans("LDAPLdapMapping").''.$langs->trans("LDAPNamingAttribute").''.$langs->trans("LDAPNamingAttribute").'
'.$langs->trans("LDAPFieldFullname").''; print ''; print ''.$langs->trans("LDAPFieldFullnameExample").'global->LDAP_KEY_MEMBERS && $conf->global->LDAP_KEY_MEMBERS==$conf->global->LDAP_MEMBER_FIELD_FULLNAME)?' checked':'').">global->LDAP_KEY_MEMBERS && $conf->global->LDAP_KEY_MEMBERS==$conf->global->LDAP_MEMBER_FIELD_FULLNAME)?' checked':'').">
'.$langs->trans("LDAPFieldName").''; print ''; print ''.$langs->trans("LDAPFieldNameExample").'global->LDAP_KEY_MEMBERS && $conf->global->LDAP_KEY_MEMBERS==$conf->global->LDAP_MEMBER_FIELD_NAME)?' checked':'').">global->LDAP_KEY_MEMBERS && $conf->global->LDAP_KEY_MEMBERS==$conf->global->LDAP_MEMBER_FIELD_NAME)?' checked':'').">
'.$langs->trans("LDAPFieldFirstName").''; print ''; print ''.$langs->trans("LDAPFieldFirstNameExample").'  
'.$langs->trans("LDAPFieldLoginUnix").''; print ''; print ''.$langs->trans("LDAPFieldLoginExample").'global->LDAP_KEY_MEMBERS && $conf->global->LDAP_KEY_MEMBERS==$conf->global->LDAP_MEMBER_FIELD_LOGIN)?' checked':'').">global->LDAP_KEY_MEMBERS && $conf->global->LDAP_KEY_MEMBERS==$conf->global->LDAP_MEMBER_FIELD_LOGIN)?' checked':'').">
'.$langs->trans("LDAPFieldLoginSamba").''; print ''; print ''.$langs->trans("LDAPFieldLoginSambaExample").'global->LDAP_KEY_MEMBERS && $conf->global->LDAP_KEY_MEMBERS==$conf->global->LDAP_MEMBER_FIELD_LOGIN_SAMBA)?' checked':'').">global->LDAP_KEY_MEMBERS && $conf->global->LDAP_KEY_MEMBERS==$conf->global->LDAP_MEMBER_FIELD_LOGIN_SAMBA)?' checked':'').">
'.$langs->trans("LDAPFieldPasswordNotCrypted").''; print ''; print ''.$langs->trans("LDAPFieldPasswordExample").'  
'.$langs->trans("LDAPFieldPasswordCrypted").''; print ''; print ''.$langs->trans("LDAPFieldPasswordExample").'  
'.$langs->trans("LDAPFieldMail").''; print ''; print ''.$langs->trans("LDAPFieldMailExample").'global->LDAP_KEY_MEMBERS && $conf->global->LDAP_KEY_MEMBERS==$conf->global->LDAP_MEMBER_FIELD_MAIL)?' checked':'').">global->LDAP_KEY_MEMBERS && $conf->global->LDAP_KEY_MEMBERS==$conf->global->LDAP_MEMBER_FIELD_MAIL)?' checked':'').">
'.$langs->trans("LDAPFieldPhone").''; print ''; print ''.$langs->trans("LDAPFieldPhoneExample").'  
'.$langs->trans("LDAPFieldHomePhone").''; print ''; print ''.$langs->trans("LDAPFieldHomePhoneExample").'  
'.$langs->trans("LDAPFieldMobile").''; print ''; print ''.$langs->trans("LDAPFieldMobileExample").'  
'.$langs->trans("LDAPFieldSkype").''; print ''; print ''.$langs->trans("LDAPFieldSkypeExample").'  
'.$langs->trans("LDAPFieldFax").''; print ''; print ''.$langs->trans("LDAPFieldFaxExample").'  
'.$langs->trans("LDAPFieldCompany").''; print ''; print ''.$langs->trans("LDAPFieldCompanyExample").'  
'.$langs->trans("LDAPFieldAddress").''; print ''; print ''.$langs->trans("LDAPFieldAddressExample").'  
'.$langs->trans("LDAPFieldZip").''; print ''; print ''.$langs->trans("LDAPFieldZipExample").'  
'.$langs->trans("LDAPFieldTown").''; print ''; print ''.$langs->trans("LDAPFieldTownExample").'  
'.$langs->trans("LDAPFieldCountry").''; print ''; print '   
'.$langs->trans("LDAPFieldDescription").''; print ''; print ''.$langs->trans("LDAPFieldDescriptionExample").'  
'.$langs->trans("LDAPFieldNotePublic").''; print ''; print ''.$langs->trans("LDAPFieldNotePublicExample").'  
'.$langs->trans("LDAPFieldBirthdate").''; print ''; print '   
'.$langs->trans("LDAPFieldStatus").''; print ''; print '   
'.$langs->trans("LDAPFieldFirstSubscriptionDate").''; print ''; print '   
'.$langs->trans("LDAPFieldFirstSubscriptionAmount").''; print ''; print '   
'.$langs->trans("LDAPFieldLastSubscriptionDate").''; print ''; print '   
'.$langs->trans("LDAPFieldLastSubscriptionAmount").''; print ''; print '   
'.$langs->trans("LDAPFieldEndLastSubscription").''; print ''; print '   
'; diff --git a/htdocs/admin/ldap_members_types.php b/htdocs/admin/ldap_members_types.php index 912d4ee3ea9..b07bf0b1484 100644 --- a/htdocs/admin/ldap_members_types.php +++ b/htdocs/admin/ldap_members_types.php @@ -134,7 +134,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print "\n"; // Filtre @@ -143,21 +143,21 @@ print "\n"; print ''; -print '"; +print '"; print ''; // Description print ''; -print '"; +print '"; print ''; // User group print ''; -print '"; +print '"; print ''; print '
'.$langs->trans("LDAPDolibarrMapping").''.$langs->trans("LDAPLdapMapping").''.$langs->trans("LDAPNamingAttribute").''.$langs->trans("LDAPNamingAttribute").'
'.$langs->trans("LDAPFieldName").''; print ''; print ''.$langs->trans("LDAPFieldCommonNameExample").'global->LDAP_KEY_MEMBERS_TYPES && $conf->global->LDAP_KEY_MEMBERS_TYPES==$conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME)?' checked':'').">global->LDAP_KEY_MEMBERS_TYPES && $conf->global->LDAP_KEY_MEMBERS_TYPES==$conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME)?' checked':'').">
'.$langs->trans("LDAPFieldDescription").''; print ''; print ''.$langs->trans("LDAPFieldDescriptionExample").'global->LDAP_KEY_MEMBERS_TYPES && $conf->global->LDAP_KEY_MEMBER_TYPES==$conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION)?' checked':'').">global->LDAP_KEY_MEMBERS_TYPES && $conf->global->LDAP_KEY_MEMBER_TYPES==$conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION)?' checked':'').">
'.$langs->trans("LDAPFieldGroupMembers").''; print ''; print ''.$langs->trans("LDAPFieldGroupMembersExample").'global->LDAP_KEY_MEMBERS_TYPES && $conf->global->LDAP_KEY_MEMBERS_TYPES==$conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS)?' checked':'').">global->LDAP_KEY_MEMBERS_TYPES && $conf->global->LDAP_KEY_MEMBERS_TYPES==$conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS)?' checked':'').">
'; From a75ecc08322adf53bf02b4bc6e7f351021dbc9fc Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 22 Jan 2019 11:51:03 +0100 Subject: [PATCH 05/10] update with html5 compliant code --- htdocs/admin/ldap_users.php | 42 +++++++++++------------ htdocs/admin/limits.php | 8 ++--- htdocs/admin/livraison.php | 2 +- htdocs/admin/mails_senderprofile_list.php | 2 +- htdocs/admin/mails_templates.php | 2 +- htdocs/admin/multicurrency.php | 18 +++++----- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php index 934fcf8e03e..124bec14f6d 100644 --- a/htdocs/admin/ldap_users.php +++ b/htdocs/admin/ldap_users.php @@ -158,147 +158,147 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print "\n"; // Common name print ''; -print '"; +print '"; print ''; // Name print ''; -print '"; +print '"; print ''; // Firstname print ''; -print '"; +print '"; print ''; // Login unix print ''; -print '"; +print '"; print ''; // Login samba print ''; -print '"; +print '"; print ''; // Password not crypted print ''; -print ''; +print ''; print ''; // Password crypted print ''; -print ''; +print ''; print ''; // Mail print ''; -print '"; +print '"; print ''; // Phone print ''; -print '"; +print '"; print ''; // Mobile print ''; -print '"; +print '"; print ''; // Skype print ''; -print '"; +print '"; print ''; // Fax print ''; -print '"; +print '"; print ''; // Company print ''; -print ''; +print ''; print ''; // Address print ''; -print ''; +print ''; print ''; // ZIP print ''; -print ''; +print ''; print ''; // TOWN print ''; -print ''; +print ''; print ''; // COUNTRY print ''; -print ''; +print ''; print ''; // Title print ''; -print ''; +print ''; print ''; // Note print ''; -print ''; +print ''; print ''; // Sid print ''; -print '"; +print '"; print ''; print '
'.$langs->trans("LDAPDolibarrMapping").''.$langs->trans("LDAPLdapMapping").''.$langs->trans("LDAPNamingAttribute").''.$langs->trans("LDAPNamingAttribute").'
'.$langs->trans("LDAPFieldFullname").''; print ''; print ''.$langs->trans("LDAPFieldFullnameExample").'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_FULLNAME)?' checked':'').">global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_FULLNAME)?' checked':'').">
'.$langs->trans("LDAPFieldName").''; print ''; print ''.$langs->trans("LDAPFieldNameExample").'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_NAME)?' checked':'').">global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_NAME)?' checked':'').">
'.$langs->trans("LDAPFieldFirstName").''; print ''; print ''.$langs->trans("LDAPFieldFirstNameExample").'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_FIRSTNAME)?' checked':'').">global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_FIRSTNAME)?' checked':'').">
'.$langs->trans("LDAPFieldLoginUnix").''; print ''; print ''.$langs->trans("LDAPFieldLoginExample").'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_LOGIN)?' checked':'').">global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_LOGIN)?' checked':'').">
'.$langs->trans("LDAPFieldLoginSamba").''; print ''; print ''.$langs->trans("LDAPFieldLoginSambaExample").'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_LOGIN_SAMBA)?' checked':'').">global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_LOGIN_SAMBA)?' checked':'').">
'.$langs->trans("LDAPFieldPasswordNotCrypted").''; print ''; print ''.$langs->trans("LDAPFieldPasswordExample").'  
'.$langs->trans("LDAPFieldPasswordCrypted").''; print ''; print ''.$langs->trans("LDAPFieldPasswordExample").'  
'.$langs->trans("LDAPFieldMail").''; print ''; print ''.$langs->trans("LDAPFieldMailExample").'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_MAIL)?' checked':'').">global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_MAIL)?' checked':'').">
'.$langs->trans("LDAPFieldPhone").''; print ''; print ''.$langs->trans("LDAPFieldPhoneExample").'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_PHONE)?' checked':'').">global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_PHONE)?' checked':'').">
'.$langs->trans("LDAPFieldMobile").''; print ''; print ''.$langs->trans("LDAPFieldMobileExample").'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_MOBILE)?' checked':'').">global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_MOBILE)?' checked':'').">
'.$langs->trans("LDAPFieldSkype").''; print ''; print ''.$langs->trans("LDAPFieldSkypeExample").'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_SKYPE)?' checked':'').">global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_SKYPE)?' checked':'').">
'.$langs->trans("LDAPFieldFax").''; print ''; print ''.$langs->trans("LDAPFieldFaxExample").'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_FAX)?' checked':'').">global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_FAX)?' checked':'').">
'.$langs->trans("LDAPFieldCompany").''; print ''; print ''.$langs->trans("LDAPFieldCompanyExample").'  
'.$langs->trans("LDAPFieldAddress").''; print ''; print ''.$langs->trans("LDAPFieldAddressExample").'  
'.$langs->trans("LDAPFieldZip").''; print ''; print ''.$langs->trans("LDAPFieldZipExample").'  
'.$langs->trans("LDAPFieldTown").''; print ''; print ''.$langs->trans("LDAPFieldTownExample").'  
'.$langs->trans("LDAPFieldCountry").''; print ''; print '   
'.$langs->trans("LDAPFieldTitle").''; print ''; print ''.$langs->trans("LDAPFieldTitleExample").'  
'.$langs->trans("Note").''; print ''; print ''.$langs->trans("LDAPFieldDescriptionExample").'  
'.$langs->trans("LDAPFieldSid").''; print ''; print ''.$langs->trans("LDAPFieldSidExample").'global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS==$conf->global->LDAP_FIELD_SID)?' checked':'').">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 6342f731347..ad41d7bd945 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -139,20 +139,20 @@ else print ''; print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"),$langs->trans("ParameterActiveForNextInputOnly")); - print ''.$conf->global->MAIN_MAX_DECIMALS_UNIT.''; + print ''.$conf->global->MAIN_MAX_DECIMALS_UNIT.''; print ''; print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"),$langs->trans("ParameterActiveForNextInputOnly")); - print ''.$conf->global->MAIN_MAX_DECIMALS_TOT.''; + 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 $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"),$langs->trans("ParameterActiveForNextInputOnly")); - print ''.$conf->global->MAIN_ROUNDING_RULE_TOT.''; + print ''.$conf->global->MAIN_ROUNDING_RULE_TOT.''; print ''; diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index bc82d03d8d7..a7c38a95e1f 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -471,7 +471,7 @@ else $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes'); print $doleditor->Create(); } -print ''; +print ''; print ''; print "\n"; print ''; diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php index bbfc2ee2363..12703d5d38a 100644 --- a/htdocs/admin/mails_senderprofile_list.php +++ b/htdocs/admin/mails_senderprofile_list.php @@ -462,7 +462,7 @@ if (isset($totalarray['pos'])) while ($i < $totalarray['nbfield']) { $i++; - if (! empty($totalarray['pos'][$i])) print ''.price($totalarray['val'][$totalarray['pos'][$i]]).''; + if (! empty($totalarray['pos'][$i])) print ''.price($totalarray['val'][$totalarray['pos'][$i]]).''; else { if ($i == 1) diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php index 289a3ecd081..da31a794374 100644 --- a/htdocs/admin/mails_templates.php +++ b/htdocs/admin/mails_templates.php @@ -525,7 +525,7 @@ if (empty($reshook)) } } -print ''; +print ''; print ''; print ""; diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php index 0a64145e9a4..fbf6603d139 100644 --- a/htdocs/admin/multicurrency.php +++ b/htdocs/admin/multicurrency.php @@ -193,7 +193,7 @@ print ''; print ''; print ''.$langs->transnoentitiesnoconv("multicurrency_buyPriceInCurrency").''; -print ''; +print ''; print '
'; print ''; print ''; @@ -207,7 +207,7 @@ print ''; print ''; print ''.$langs->transnoentitiesnoconv("multicurrency_modifyRateApplication").''; -print ''; +print ''; print ''; print ''; print ''; @@ -229,7 +229,7 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION)) print ''; print ''.$form->textwithpicto($langs->trans("CurrencyLayerAccount"), $langs->trans("CurrencyLayerAccount_help_to_synchronize")).''."\n"; - print ''; + print ''; print ''; print ''; print ''; @@ -240,7 +240,7 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION)) print ''; print ''.$langs->transnoentitiesnoconv("multicurrency_appId").''; - print ''; + print ''; print ''; print ''; print ''; @@ -252,7 +252,7 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION)) print ''; print ''.$langs->transnoentitiesnoconv("multicurrency_appCurrencySource").''; - print ''; + print ''; print ''; print ''; print ''; @@ -263,7 +263,7 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION)) print ''; print ''.$langs->transnoentitiesnoconv("multicurrency_alternateCurrencySource").''; - print ''; + print ''; print ''; print ''; print ''; @@ -289,7 +289,7 @@ print ''; print ''; print ''; print ''.$form->selectCurrency('', 'code').''; -print ''; +print ''; print ''; print ''; print ' '; @@ -300,7 +300,7 @@ print '
'; print ''; print ''.$conf->currency.$form->textwithpicto(' ', $langs->trans("BaseCurrency")).''; -print '1'; +print '1'; print ''; foreach ($TCurrency as &$currency) @@ -309,7 +309,7 @@ foreach ($TCurrency as &$currency) print ''; print ''.$currency->code.' - '.$currency->name.''; - print ''; + print ''; print '
'; print ''; print ''; From 0a45d87f4afb46df11e405d8411a379877ad426c Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 22 Jan 2019 11:56:09 +0100 Subject: [PATCH 06/10] update with html5 compliant code --- htdocs/admin/notification.php | 2 +- htdocs/admin/payment.php | 2 +- htdocs/admin/prelevement.php | 6 +++--- htdocs/admin/propal.php | 12 ++++++------ htdocs/admin/proxy.php | 14 +++++++------- htdocs/admin/resource.php | 2 +- htdocs/admin/security_file.php | 2 +- htdocs/admin/security_other.php | 10 +++++----- htdocs/admin/stock.php | 4 ++-- htdocs/admin/supplier_invoice.php | 4 ++-- htdocs/admin/supplier_order.php | 6 +++--- htdocs/admin/supplier_proposal.php | 6 +++--- htdocs/admin/syslog.php | 2 +- htdocs/admin/translation.php | 2 +- 14 files changed, 37 insertions(+), 37 deletions(-) diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php index 92ba0bec200..af2aed5a744 100644 --- a/htdocs/admin/notification.php +++ b/htdocs/admin/notification.php @@ -151,7 +151,7 @@ print ''; print ''.$langs->trans("Label").''; /*print ''.$langs->trans("Code").''; print ''.$langs->trans("Label").'';*/ -//print ''.$langs->trans("NbOfTargetedContacts").''; +//print ''.$langs->trans("NbOfTargetedContacts").''; print "\n"; // Load array of available notifications diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php index 816ab8344ce..f01794c6c17 100644 --- a/htdocs/admin/payment.php +++ b/htdocs/admin/payment.php @@ -247,7 +247,7 @@ print ''; print $langs->trans("PaymentOnDifferentThirdBills"); print ''; print $form->selectyesno("FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS",$conf->global->FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS,1); -print ''; +print ''; print "\n"; print ''; diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index a56e8ad6def..e0caadc9677 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -495,7 +495,7 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION)) print ''; print ''.$langs->trans("User").''; print ''.$langs->trans("Value").''; - print ''.$langs->trans("Action").''; + print ''.$langs->trans("Action").''; print "\n"; print ''; @@ -506,7 +506,7 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION)) print $form->selectarray('action',$actions);// select_dolusers(0,'user',0); print ''; - print ''; + print ''; // List of current notifications for objet_type='withdraw' $sql = "SELECT u.lastname, u.firstname,"; @@ -532,7 +532,7 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION)) print ''.dolGetFirstLastname($obj->firstname,$obj->lastname).''; $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label); print ''.$label.''; - print 'rowid.'">'.img_delete().''; + print 'rowid.'">'.img_delete().''; print ''; $i++; } diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index cf860cd64ba..beb63b8eb0c 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -522,7 +522,7 @@ print ""; print ''; print ''.$langs->trans("DefaultProposalDurationValidity").''; print ''."global->PROPALE_VALIDITY_DURATION."\">"; -print ''; +print ''; print ''; print ''; @@ -534,7 +534,7 @@ print ''; print $langs->trans("UseCustomerContactAsPropalRecipientIfExist"); print ''; print $form->selectyesno("value",$conf->global->PROPALE_USE_CUSTOMER_CONTACT_AS_RECIPIENT,1); -print ''; +print ''; print ''; print "\n"; print ''; @@ -562,7 +562,7 @@ else $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes'); print $doleditor->Create(); } -print ''; +print ''; print ''; print "\n"; print ''; @@ -575,7 +575,7 @@ print ''; print $form->textwithpicto($langs->trans("WatermarkOnDraftProposal"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'
'; print ''; print ''; -print ''; +print ''; print ''; print "\n"; print ''; @@ -585,7 +585,7 @@ if ($conf->banque->enabled) { print ''; - print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").' '; + print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").' '; if (! empty($conf->use_javascript_ajax)) { print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL'); @@ -644,7 +644,7 @@ print "\n"; print ''; print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'
'; -print ''; +print ''; print "\n"; print ''; diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index 9490a291729..5a4581e7e83 100644 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -132,7 +132,7 @@ print "\n"; print ''; -print ''.$langs->trans("ConnectionTimeout").''; +print ''.$langs->trans("ConnectionTimeout").''; print ''; print ''; print 'global->MAIN_USE_CONNECT_TIMEOUT).'">'; @@ -142,7 +142,7 @@ print ''; print ''; -print ''.$langs->trans("ResponseTimeout").''; +print ''.$langs->trans("ResponseTimeout").''; print ''; print ''; print ''; @@ -152,7 +152,7 @@ print ''; print ''; -print ''.$langs->trans("MAIN_PROXY_USE").''; +print ''.$langs->trans("MAIN_PROXY_USE").''; print ''; print ''; print $form->selectyesno('MAIN_PROXY_USE',$conf->global->MAIN_PROXY_USE,1); @@ -161,7 +161,7 @@ print ''; print ''; -print ''.$langs->trans("MAIN_PROXY_HOST").''; +print ''.$langs->trans("MAIN_PROXY_HOST").''; print ''; print ''; print ''; @@ -170,7 +170,7 @@ print ''; print ''; -print ''.$langs->trans("MAIN_PROXY_PORT").''; +print ''.$langs->trans("MAIN_PROXY_PORT").''; print ''; print ''; print ''; @@ -179,7 +179,7 @@ print ''; print ''; -print ''.$langs->trans("MAIN_PROXY_USER").''; +print ''.$langs->trans("MAIN_PROXY_USER").''; print ''; print ''; print ''; @@ -188,7 +188,7 @@ print ''; print ''; -print ''.$langs->trans("MAIN_PROXY_PASS").''; +print ''.$langs->trans("MAIN_PROXY_PASS").''; print ''; print ''; print ''; diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php index 566e57e587b..c70d8c08a91 100644 --- a/htdocs/admin/resource.php +++ b/htdocs/admin/resource.php @@ -103,7 +103,7 @@ else ); print $form->selectarray("activate_RESOURCE_USE_SEARCH_TO_SELECT",$arrval,$conf->global->RESOURCE_USE_SEARCH_TO_SELECT); print ''; - print ''; + print ''; print ''; print ''; } diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php index 87e0d6dd941..f551aafaaff 100644 --- a/htdocs/admin/security_file.php +++ b/htdocs/admin/security_file.php @@ -126,7 +126,7 @@ print ''; print ''; -print ''.$langs->trans("UMask").''; +print ''.$langs->trans("UMask").''; print $form->textwithpicto('',$langs->trans("UMaskExplanation")); print ''; print ''; diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index b1e4f745560..e26fcf900be 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -109,13 +109,13 @@ dol_fiche_head($head, 'misc', $langs->trans("Security"), -1); print ''; print ''; print ''; -print ''; +print ''; print ''; // Enable Captcha code print ''; print ''; -print ''; // Enable advanced perms print ''; print ''; -print '\n"; $sessiontimeout=ini_get("session.gc_maxlifetime"); if (empty($conf->global->MAIN_SESSION_TIMEOUT)) $conf->global->MAIN_SESSION_TIMEOUT=$sessiontimeout; print ''; -print ''; print ''; $sessiontimeout=ini_get("session.gc_maxlifetime"); if (empty($conf->global->MAIN_APPLICATION_TITLE)) $conf->global->MAIN_APPLICATION_TITLE=""; print ''; -print ''; print ''; print ''; - print ''; print ''; - print '\n"; @@ -514,7 +514,7 @@ print "\n"; print '\n"; print '
'.$langs->trans("Parameters").''.$langs->trans("Status").''.$langs->trans("Status").'
'.$langs->trans("UseCaptchaCode").''; +print ''; if (function_exists("imagecreatefrompng")) { if (! empty($conf->use_javascript_ajax)) @@ -144,7 +144,7 @@ print '
'.$langs->trans("UseAdvancedPerms").''; +print ''; if (! empty($conf->use_javascript_ajax)) { print ajax_constantonoff('MAIN_USE_ADVANCED_PERMS'); @@ -179,7 +179,7 @@ print "
'.$langs->trans("SessionTimeOut").''; +print ''.$langs->trans("SessionTimeOut").''; print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor"))); print ''; @@ -191,7 +191,7 @@ print '
'.$langs->trans("MAIN_APPLICATION_TITLE").''; +print ''.$langs->trans("MAIN_APPLICATION_TITLE").''; print ''; print ' '; diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index 7a60d234405..f358d3310da 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -454,7 +454,7 @@ if (! empty($conf->fournisseur->enabled) && !empty($conf->global->STOCK_CALCULAT print '
'.$langs->trans("UseDispatchStatus").''; + print ''; if ($conf->use_javascript_ajax) { print ajax_constantonoff('SUPPLIER_ORDER_USE_DISPATCH_STATUS'); } else { @@ -522,7 +522,7 @@ if ($conf->global->PRODUIT_SOUSPRODUITS) print '
'.$langs->trans("IndependantSubProductStock").''; + print ''; print "
"; print ''; print ""; diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php index 45d588fb031..c3c25c9e4e6 100644 --- a/htdocs/admin/supplier_invoice.php +++ b/htdocs/admin/supplier_invoice.php @@ -491,7 +491,7 @@ else $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes'); print $doleditor->Create(); } -print '
'; +print ''; print ''; print "
'; print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'
'; -print '		'; +print ''; print "
'; diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php index 88cb18d5d80..b23e821b31e 100644 --- a/htdocs/admin/supplier_order.php +++ b/htdocs/admin/supplier_order.php @@ -503,7 +503,7 @@ $var=false; print $langs->trans("IfSetToYesDontForgetPermission"); print ''; print ''; - print ''; + print ''; print ''; print "\n"; @@ -560,7 +560,7 @@ else $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes'); print $doleditor->Create(); } -print ''; +print ''; print ''; print "\n"; @@ -584,7 +584,7 @@ print "\n"; print ''; print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'
'; -print ''; +print ''; print "\n"; print ''; diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php index 056982c4d08..1756974379c 100644 --- a/htdocs/admin/supplier_proposal.php +++ b/htdocs/admin/supplier_proposal.php @@ -517,7 +517,7 @@ else $doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes'); print $doleditor->Create(); } -print ''; +print ''; print ''; print "\n"; print ''; @@ -530,7 +530,7 @@ print ''; print $form->textwithpicto($langs->trans("WatermarkOnDraftProposal"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'
'; print ''; print ''; -print ''; +print ''; print ''; print "\n"; print ''; @@ -539,7 +539,7 @@ if ($conf->banque->enabled) { print ''; - print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").' '; + print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").' '; if (! empty($conf->use_javascript_ajax)) { print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL'); diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index a3cceda40da..0eaa7161d5e 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -275,7 +275,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print "\n"; print ''; diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index 6b893a4a78b..37b6bb5cc52 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -520,7 +520,7 @@ if ($mode == 'searchkey') if ($i > ($offset + $limit)) break; print ''; $out.=''; $out.=''; - $out.=''; - $out.=''; + $out.=''; + $out.=''; $out.=''."\n"; $tmpfilelist2 = dol_sort_array($file_list['updated'], 'filename'); if (is_array($tmpfilelist2) && count($tmpfilelist2)) @@ -1097,8 +1097,8 @@ class Setup extends DolibarrApi $out.='' . "\n"; $size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']); $totalsize += $size; - $out.='' . "\n"; - $out.='' . "\n"; + $out.='' . "\n"; + $out.='' . "\n"; $out.="\n"; } $out.=''; @@ -1106,8 +1106,8 @@ class Setup extends DolibarrApi $out.='' . "\n"; $out.='' . "\n"; $out.='' . "\n"; - $out.='' . "\n"; - $out.='' . "\n"; + $out.='' . "\n"; + $out.='' . "\n"; $out.="\n"; } else @@ -1130,8 +1130,8 @@ class Setup extends DolibarrApi $out.=''; $out.=''; $out.=''; - $out.=''; - $out.=''; + $out.=''; + $out.=''; $out.=''."\n"; $tmpfilelist3 = dol_sort_array($file_list['added'], 'filename'); if (is_array($tmpfilelist3) && count($tmpfilelist3)) @@ -1147,8 +1147,8 @@ class Setup extends DolibarrApi $out.='' . "\n"; $size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']); $totalsize += $size; - $out.='' . "\n"; - $out.='' . "\n"; + $out.='' . "\n"; + $out.='' . "\n"; $out.="\n"; } $out.=''; @@ -1156,8 +1156,8 @@ class Setup extends DolibarrApi $out.='' . "\n"; $out.='' . "\n"; $out.='' . "\n"; - $out.='' . "\n"; - $out.='' . "\n"; + $out.='' . "\n"; + $out.='' . "\n"; $out.="\n"; } else diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php index cb0a8cca7b2..fa1ef9f2760 100644 --- a/htdocs/asset/list.php +++ b/htdocs/asset/list.php @@ -469,7 +469,7 @@ if (isset($totalarray['pos'])) while ($i < $totalarray['nbfield']) { $i++; - if (! empty($totalarray['pos'][$i])) print ''; + if (! empty($totalarray['pos'][$i])) print ''; else { if ($i == 1) diff --git a/htdocs/asset/type.php b/htdocs/asset/type.php index b8a282430cc..861bbd2130e 100644 --- a/htdocs/asset/type.php +++ b/htdocs/asset/type.php @@ -299,9 +299,9 @@ if (! $rowid && $action != 'create' && $action != 'edit') print ''; if ($user->rights->asset->write) - print ''; + print ''; else - print ''; + print ''; print ""; $i++; } From 4c281f4ff33846879d80066687d518565782fdb9 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 22 Jan 2019 13:56:14 +0100 Subject: [PATCH 08/10] update with html5 compliant code --- htdocs/blockedlog/admin/blockedlog_list.php | 2 +- htdocs/bookmarks/list.php | 2 +- htdocs/categories/index.php | 2 +- htdocs/categories/viewcat.php | 16 ++++++++-------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php index 49a4daa3b3f..7ce4ef04303 100644 --- a/htdocs/blockedlog/admin/blockedlog_list.php +++ b/htdocs/blockedlog/admin/blockedlog_list.php @@ -498,7 +498,7 @@ if (is_array($blocks)) print ''.$object_link.''; // Amount - print ''; + print ''; // Details link print ''; diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php index cca978d748b..e26b38c2513 100644 --- a/htdocs/bookmarks/list.php +++ b/htdocs/bookmarks/list.php @@ -179,7 +179,7 @@ if ($resql) print '"; // Position - print '"; + print '"; // Actions print ''; if ($action != 'editconditions' && ! empty($object->brouillon) && $usercancreate) - print ''; + print ''; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("SyslogLevel").'
'.$langcode.''.$key.''; print dol_escape_htmltag($val); - print ''; + print ''; if (! empty($newlangfileonly->tab_translate[$key])) { if ($val != $newlangfileonly->tab_translate[$key]) From cf62d285d916c39d6aa58b5e3f34a5dd18262a2a Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 22 Jan 2019 13:54:04 +0100 Subject: [PATCH 07/10] update with html5 compliant code --- htdocs/api/class/api_setup.class.php | 24 ++++++++++++------------ htdocs/asset/list.php | 2 +- htdocs/asset/type.php | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php index 39c1f8d6db6..498abb61a7b 100644 --- a/htdocs/api/class/api_setup.class.php +++ b/htdocs/api/class/api_setup.class.php @@ -1080,8 +1080,8 @@ class Setup extends DolibarrApi $out.='' . $langs->trans("Filename") . '' . $langs->trans("ExpectedChecksum") . '' . $langs->trans("CurrentChecksum") . '' . $langs->trans("Size") . '' . $langs->trans("DateModification") . '' . $langs->trans("Size") . '' . $langs->trans("DateModification") . '
'.$file['md5'].''.dol_print_size($size).''.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']),'dayhour').''.dol_print_size($size).''.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']),'dayhour').'
'.$langs->trans("Total").''.dol_print_size($totalsize).''.dol_print_size($totalsize).'
' . $langs->trans("Filename") . '' . $langs->trans("ExpectedChecksum") . '' . $langs->trans("CurrentChecksum") . '' . $langs->trans("Size") . '' . $langs->trans("DateModification") . '' . $langs->trans("Size") . '' . $langs->trans("DateModification") . '
'.$file['md5'].''.dol_print_size($size).''.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']),'dayhour').''.dol_print_size($size).''.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']),'dayhour').'
'.$langs->trans("Total").''.dol_print_size($totalsize).''.dol_print_size($totalsize).'
'.price($totalarray['val'][$totalarray['pos'][$i]]).''.price($totalarray['val'][$totalarray['pos'][$i]]).'rowid.'">'.img_edit().'rowid.'">'.img_edit().'  
'.price($block->amounts).''.price($block->amounts).''.img_info($langs->trans('ShowDetails')).''.dol_print_date($db->jdate($obj->dateb),'day')."'.$obj->position."'.$obj->position."'; diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index b7e99e50ca0..273a23f5b1e 100644 --- a/htdocs/categories/index.php +++ b/htdocs/categories/index.php @@ -178,7 +178,7 @@ foreach($fulltree as $key => $val) //print_barre_liste('', 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, 0, '', 0, $newcardbutton, '', 0, 1, 1); print ''; -print ''; if ($action != 'editecheance' && ! empty($object->brouillon) && $usercancreate) - print ''; + print ''; print '
'.$langs->trans("Categories").''; +print '
'.$langs->trans("Categories").''; if (! empty($conf->use_javascript_ajax)) { print ''; diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index 2092c6c52c5..37bf6ed60a3 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -278,7 +278,7 @@ else { print "
"; print "\n"; - print "\n"; print '\n"; // Link to delete from category - print '\n"; // Link to delete from category - print '\n"; // Link to delete from category - print '\n"; print '\n"; // Link to delete from category - print '\n"; // Link to delete from category - print '\n"; print '\n"; // Link to delete from category - print '\n"; print '\n"; // Link to delete from category - print ''; print ''; print ''; - print ''; + print ''; $num = $db->num_rows($result); if ($num > 0) @@ -178,7 +178,7 @@ if ($result) print ''; print ''; $mailstatic=new Mailing($db); - print ''; + print ''; print ''; $i++; } diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 9605f413435..c6ba6781423 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -2046,7 +2046,7 @@ if ($action == 'create') print $langs->trans('Date'); print ''; if ($action != 'editdate' && ! empty($object->brouillon) && $usercancreate) - print ''; + print ''; print '
".$langs->trans("SubCats").''; + print "
".$langs->trans("SubCats").''; if ($user->rights->categorie->creer) { print ""; @@ -366,7 +366,7 @@ if ($type == Categorie::TYPE_PRODUCT) print "'.$prod->label."'; + print ''; $permission=0; if ($type == Categorie::TYPE_PRODUCT) $permission=($user->rights->produit->creer || $user->rights->service->creer); if ($type == Categorie::TYPE_SUPPLIER) $permission=$user->rights->societe->creer; @@ -413,7 +413,7 @@ if ($type == Categorie::TYPE_SUPPLIER) print $soc->getNomUrl(1); print "'; + print ''; $permission=0; if ($type == Categorie::TYPE_PRODUCT) $permission=($user->rights->produit->creer || $user->rights->service->creer); if ($type == Categorie::TYPE_SUPPLIER) $permission=$user->rights->societe->creer; @@ -466,7 +466,7 @@ if($type == Categorie::TYPE_CUSTOMER) print $soc->getNomUrl(1); print "'; + print ''; $permission=0; if ($type == Categorie::TYPE_PRODUCT) $permission=($user->rights->produit->creer || $user->rights->service->creer); if ($type == Categorie::TYPE_SUPPLIER) $permission=$user->rights->societe->creer; @@ -519,7 +519,7 @@ if ($type == Categorie::TYPE_MEMBER) print ''.$member->lastname."'.$member->firstname."'; + print ''; $permission=0; if ($type == Categorie::TYPE_PRODUCT) $permission=($user->rights->produit->creer || $user->rights->service->creer); if ($type == Categorie::TYPE_SUPPLIER) $permission=$user->rights->societe->creer; @@ -569,7 +569,7 @@ if ($type == Categorie::TYPE_CONTACT) print $contact->getNomUrl(1,'category'); print "'; + print ''; $permission=0; if ($type == Categorie::TYPE_PRODUCT) $permission=($user->rights->produit->creer || $user->rights->service->creer); if ($type == Categorie::TYPE_SUPPLIER) $permission=$user->rights->societe->creer; @@ -621,7 +621,7 @@ if ($type == Categorie::TYPE_ACCOUNT) print ''.$account->bank."'.$account->number."'; + print ''; $permission=0; if ($type == Categorie::TYPE_PRODUCT) $permission=($user->rights->produit->creer || $user->rights->service->creer); if ($type == Categorie::TYPE_SUPPLIER) $permission=$user->rights->societe->creer; @@ -672,7 +672,7 @@ if ($type == Categorie::TYPE_PROJECT) print ''.$project->ref."'.$project->title."'; + print ''; $permission=0; if ($type == Categorie::TYPE_PRODUCT) $permission=($user->rights->produit->creer || $user->rights->service->creer); if ($type == Categorie::TYPE_SUPPLIER) $permission=$user->rights->societe->creer; From 4668052f95fec60e5812f25ee2300ed9c4773b99 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 22 Jan 2019 14:04:33 +0100 Subject: [PATCH 09/10] update with html5 compliant code --- htdocs/comm/mailing/cibles.php | 2 +- htdocs/comm/mailing/index.php | 6 ++-- htdocs/comm/propal/card.php | 26 +++++++------- htdocs/comm/propal/index.php | 16 ++++----- htdocs/comm/propal/list.php | 16 ++++----- htdocs/comm/propal/stats/index.php | 36 +++++++++---------- .../comm/propal/tpl/linkedobjectblock.tpl.php | 6 ++-- 7 files changed, 54 insertions(+), 54 deletions(-) diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 84c1f5954b9..ac23177652f 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -602,7 +602,7 @@ if ($object->fetch($id) >= 0) } // Search Icon - print ''; + print ''; if ($obj->statut == 0) // Not sent yet { if ($user->rights->mailing->creer && $allowaddtarget) { diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index cb062e00777..0c98800b3ea 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -118,7 +118,7 @@ if (is_resource($handle)) while ($i < $num ) { $obj = $db->fetch_object($result); - print ''.img_object('',$mailmodule->picto).' '.$obj->label.''.$obj->nb.''; + print ''.img_object('',$mailmodule->picto).' '.$obj->label.''.$obj->nb.''; $i++; } @@ -161,7 +161,7 @@ if ($result) print ''.$langs->trans("LastMailings",$limit).''.$langs->trans("DateCreation").''.$langs->trans("NbOfEMails").''.$langs->trans("AllEMailings").'
'.$langs->trans("AllEMailings").'
'.dol_print_date($db->jdate($obj->date_creat),'day').''.($obj->nbemail?$obj->nbemail:"0").''.$mailstatic->LibStatut($obj->statut,5).''.$mailstatic->LibStatut($obj->statut,5).'
id . '">' . img_edit($langs->trans('SetDate'), 1) . 'id . '">' . img_edit($langs->trans('SetDate'), 1) . '
'; print '		'; if (! empty($object->brouillon) && $action == 'editdate' && $usercancreate) { @@ -2072,7 +2072,7 @@ if ($action == 'create') print $langs->trans('DateEndPropal'); print 'id . '">' . img_edit($langs->trans('SetConditions'), 1) . 'id . '">' . img_edit($langs->trans('SetConditions'), 1) . '
'; print '		'; if (! empty($object->brouillon) && $action == 'editecheance' && $usercancreate) { @@ -2100,7 +2100,7 @@ if ($action == 'create') print $langs->trans('PaymentConditionsShort'); print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetConditions'), 1) . 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetConditions'), 1) . '
'; print ''; if (! empty($object->brouillon) && $action == 'editconditions' && $usercancreate) { @@ -2128,7 +2128,7 @@ if ($action == 'create') print ' (' . $langs->trans('AfterOrder') . ')'; print ''; if ($action != 'editavailability' && ! empty($object->brouillon) && $usercancreate) - print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1) . ''; + print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1) . ''; print ''; print ''; if (! empty($object->brouillon) && $action == 'editavailability' && $usercancreate) { @@ -2147,7 +2147,7 @@ if ($action == 'create') print $langs->trans('SendingMethod'); print ''; if ($action != 'editshippingmethod' && $usercancreate) - print 'id.'">'.img_edit($langs->trans('SetShippingMode'),1).''; + print 'id.'">'.img_edit($langs->trans('SetShippingMode'),1).''; print ''; print ''; if ($action == 'editshippingmethod' && $usercancreate) { @@ -2165,7 +2165,7 @@ if ($action == 'create') print $langs->trans('Source'); print ''; if ($action != 'editdemandreason' && ! empty($object->brouillon) && $usercancreate) - print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetDemandReason'), 1) . ''; + print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetDemandReason'), 1) . ''; print ''; print ''; if (! empty($object->brouillon) && $action == 'editdemandreason' && $usercancreate) { @@ -2183,7 +2183,7 @@ if ($action == 'create') print $langs->trans('PaymentMode'); print ''; if ($action != 'editmode' && ! empty($object->brouillon) && $usercancreate) - print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMode'), 1) . ''; + print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMode'), 1) . ''; print ''; print ''; if (! empty($object->brouillon) && $action == 'editmode' && $usercancreate) { @@ -2203,7 +2203,7 @@ if ($action == 'create') print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0); print ''; if ($action != 'editmulticurrencycode' && ! empty($object->brouillon) && $usercancreate) - print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ''; + print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ''; print ''; print ''; if (! empty($object->brouillon) && $action == 'editmulticurrencycode' && $usercancreate) { @@ -2220,7 +2220,7 @@ if ($action == 'create') print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0); print ''; if ($action != 'editmulticurrencyrate' && ! empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency && $usercancreate) - print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ''; + print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ''; print ''; print ''; if (! empty($object->brouillon) && ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') && $usercancreate) { @@ -2244,7 +2244,7 @@ if ($action == 'create') // Outstanding Bill print ''; print $langs->trans('OutstandingBill'); - print ''; + print ''; print price($soc->get_OutstandingBill()) . ' / '; print price($soc->outstanding_limit, 0, $langs, 1, - 1, - 1, $conf->currency); print ''; @@ -2259,7 +2259,7 @@ if ($action == 'create') print $langs->trans('BankAccount'); print ''; if ($action != 'editbankaccount' && $usercancreate) - print 'id.'">'.img_edit($langs->trans('SetBankAccount'),1).''; + print 'id.'">'.img_edit($langs->trans('SetBankAccount'),1).''; print ''; print ''; if ($action == 'editbankaccount') { @@ -2293,7 +2293,7 @@ if ($action == 'create') print ''; print '
'; print $langs->trans('IncotermLabel'); - print ''; + print ''; if ($usercancreate) print ''.img_edit().''; else print ' '; print '
'; @@ -2370,7 +2370,7 @@ if ($action == 'create') print ''; // Statut - //print '' . $langs->trans('Status') . '' . $object->getLibStatut(4) . ''; + //print '' . $langs->trans('Status') . '' . $object->getLibStatut(4) . ''; print ''; diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index f39f9efc54a..b96a95d8e64 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -123,7 +123,7 @@ if ($resql) print ''; print ''.$propalstatic->LibStatut($status,0).''; - print ''.(isset($vals[$status])?$vals[$status]:0).''; + print ''.(isset($vals[$status])?$vals[$status]:0).''; print "\n"; } } @@ -144,8 +144,8 @@ if ($resql) print ''; } //if ($totalinprocess != $total) - //print ''.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')'.$totalinprocess.''; - print ''.$langs->trans("Total").''.$total.''; + //print ''.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')'.$totalinprocess.''; + print ''.$langs->trans("Total").''.$total.''; print "
"; } else @@ -260,7 +260,7 @@ if ($resql) print ' '; print ''; - print ''; + print ''; $filename=dol_sanitizeFileName($obj->ref); $filedir=$conf->propal->multidir_output[$obj->entity] . '/' . dol_sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; @@ -276,7 +276,7 @@ if ($resql) print ''.$companystatic->getNomUrl(1,'customer').''; print ''.dol_print_date($db->jdate($obj->datec),'day').''; - print ''.$propalstatic->LibStatut($obj->fk_statut,5).''; + print ''.$propalstatic->LibStatut($obj->fk_statut,5).''; print ''; $i++; } @@ -355,9 +355,9 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire) $companystatic->canvas=$obj->canvas; print ''.$companystatic->getNomUrl(1,'customer',44).''."\n"; - print ''; + print ''; print dol_print_date($db->jdate($obj->dp),'day').''."\n"; - print ''.price($obj->total_ttc).''; + print ''.price($obj->total_ttc).''; print ''.$propalstatic->LibStatut($obj->fk_statut,3).''."\n"; print ''."\n"; $i++; @@ -441,7 +441,7 @@ if (! empty($conf->propal->enabled)) print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).''; - print ''.$propalstatic->LibStatut($obj->fk_statut,$obj->facture,5).''; + print ''.$propalstatic->LibStatut($obj->fk_statut,$obj->facture,5).''; print ''; $i++; diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 2d3917a0d47..61fa1d548d7 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -890,7 +890,7 @@ if ($resql) // Amount HT if (! empty($arrayfields['p.total_ht']['checked'])) { - print ''.price($obj->total_ht)."\n"; + print ''.price($obj->total_ht)."\n"; if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['totalhtfield']=$totalarray['nbfield']; $totalarray['totalht'] += $obj->total_ht; @@ -898,7 +898,7 @@ if ($resql) // Amount VAT if (! empty($arrayfields['p.total_vat']['checked'])) { - print ''.price($obj->total_vat)."\n"; + print ''.price($obj->total_vat)."\n"; if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['totalvatfield']=$totalarray['nbfield']; $totalarray['totalvat'] += $obj->total_vat; @@ -906,7 +906,7 @@ if ($resql) // Amount TTC if (! empty($arrayfields['p.total_ttc']['checked'])) { - print ''.price($obj->total_ttc)."\n"; + print ''.price($obj->total_ttc)."\n"; if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield']; $totalarray['totalttc'] += $obj->total_ttc; @@ -995,7 +995,7 @@ if ($resql) // Status if (! empty($arrayfields['p.fk_statut']['checked'])) { - print ''.$objectstatic->LibStatut($obj->fk_statut,5).''; + print ''.$objectstatic->LibStatut($obj->fk_statut,5).''; if (! $i) $totalarray['nbfield']++; } // Action column @@ -1033,14 +1033,14 @@ if ($resql) if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; else print ''.$langs->trans("Totalforthispage").''; } - elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).''; - elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).''; - elseif ($totalarray['totalttcfield'] == $i) print ''.price($totalarray['totalttc']).''; + elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).''; + elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).''; + elseif ($totalarray['totalttcfield'] == $i) print ''.price($totalarray['totalttc']).''; elseif ($totalarray['totalizable']) { $printed = false; foreach ($totalarray['totalizable'] as $totalizable) { if ($totalizable['pos']==$i && ! $printed) { - print ''.price($totalizable['total']).''; + print ''.price($totalizable['total']).''; $printed = true; } } diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index 5c54baf7360..29afd62d780 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -280,12 +280,12 @@ print '
'; print ''; print ''; print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; print ''; $oldyear=0; @@ -298,22 +298,22 @@ foreach ($data as $val) print ''; print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; print ''; } print ''; print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; print ''; $oldyear=$year; } diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php index 0d8c2064010..118bc3fbd37 100644 --- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php +++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php @@ -82,9 +82,9 @@ if (count($linkedObjectBlock) > 1) - - - + + + Date: Tue, 22 Jan 2019 14:09:14 +0100 Subject: [PATCH 10/10] update with html5 compliant code --- htdocs/comm/card.php | 88 +++++++++++++++++----------------- htdocs/comm/prospect/index.php | 4 +- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index a9167c43c32..916143b896a 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -322,7 +322,7 @@ if ($object->id > 0) print '
'.$langs->trans("Year").''.$langs->trans("NbOfProposals").'%'.$langs->trans("AmountTotal").'%'.$langs->trans("AmountAverage").'%'.$langs->trans("NbOfProposals").'%'.$langs->trans("AmountTotal").'%'.$langs->trans("AmountAverage").'%
0?'&userid='.$userid:'').'">'.$oldyear.'000000
0?'&userid='.$userid:'').'">'.$year.''.$val['nb'].''.round($val['nb_diff']).''.price(price2num($val['total'],'MT'),1).''.round($val['total_diff']).''.price(price2num($val['avg'],'MT'),1).''.round($val['avg_diff']).''.$val['nb'].''.round($val['nb_diff']).''.price(price2num($val['total'],'MT'),1).''.round($val['total_diff']).''.price(price2num($val['avg'],'MT'),1).''.round($val['avg_diff']).'
'; + if (($action != 'editconditions') && $user->rights->societe->creer) print ''; print '
'; print $langs->trans('PaymentConditions'); print ''; - if (($action != 'editconditions') && $user->rights->societe->creer) print 'id.'">'.img_edit($langs->trans('SetConditions'),1).'id.'">'.img_edit($langs->trans('SetConditions'),1).'
'; print ''; if ($action == 'editconditions') @@ -341,7 +341,7 @@ if ($object->id > 0) print ''; + if (($action != 'editmode') && $user->rights->societe->creer) print ''; print '
'; print $langs->trans('PaymentMode'); print ''; - if (($action != 'editmode') && $user->rights->societe->creer) print 'id.'">'.img_edit($langs->trans('SetMode'),1).'id.'">'.img_edit($langs->trans('SetMode'),1).'
'; print ''; if ($action == 'editmode') @@ -362,7 +362,7 @@ if ($object->id > 0) print ''; + if (($action != 'editbankaccount') && $user->rights->societe->creer) print ''; print '
'; print $langs->trans('PaymentBankAccount'); print ''; - if (($action != 'editbankaccount') && $user->rights->societe->creer) print 'id.'">'.img_edit($langs->trans('SetBankAccount'),1).'id.'">'.img_edit($langs->trans('SetBankAccount'),1).'
'; print ''; if ($action == 'editbankaccount') @@ -381,7 +381,7 @@ if ($object->id > 0) print ''; print '
'; print $langs->trans("CustomerRelativeDiscountShort"); - print ''; + print ''; if ($user->rights->societe->creer && !$user->societe_id > 0) { print ''.img_edit($langs->trans("Modify")).''; @@ -395,7 +395,7 @@ if ($object->id > 0) print ''; print '
'; print $langs->trans("CustomerAbsoluteDiscountShort"); - print ''; + print ''; if ($user->rights->societe->creer && !$user->societe_id > 0) { print ''.img_edit($langs->trans("Modify")).''; @@ -447,7 +447,7 @@ if ($object->id > 0) print '
'; print '
'; print $langs->trans("PriceLevel"); - print ''; + print ''; if ($user->rights->societe->creer) { print ''.img_edit($langs->trans("Modify")).''; @@ -467,7 +467,7 @@ if ($object->id > 0) print ''; + if (($action != 'editshipping') && $user->rights->societe->creer) print ''; print '
'; print $langs->trans('SendingMethod'); print ''; - if (($action != 'editshipping') && $user->rights->societe->creer) print 'id.'">'.img_edit($langs->trans('SetMode'),1).'id.'">'.img_edit($langs->trans('SetMode'),1).'
'; print '		'; if ($action == 'editshipping') @@ -535,7 +535,7 @@ if ($object->id > 0) print ''; + if ($action != 'editlevel' && $user->rights->societe->creer) print ''; print '
'; print $langs->trans('ProspectLevel'); print ''; - if ($action != 'editlevel' && $user->rights->societe->creer) print 'id.'">'.img_edit($langs->trans('Modify'),1).'id.'">'.img_edit($langs->trans('Modify'),1).'
'; print '		'; if ($action == 'editlevel') @@ -691,8 +691,8 @@ if ($object->id > 0) print ''; print ''; - print '
'; - print ''; + print ''; print ''; } @@ -714,9 +714,9 @@ if ($object->id > 0) if ( ($db->jdate($objp->datelimite) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == 1 ) { print " ".img_warning(); } - print '\n"; - print ''; - print ''; + print '\n"; + print ''; + print ''; $i++; } $db->free($resql); @@ -776,10 +776,10 @@ if ($object->id > 0) print '
'.$langs->trans("LastPropals",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllPropals").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').''; + print ''; print '
'.$langs->trans("LastPropals",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllPropals").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').'
'.dol_print_date($db->jdate($objp->dp),'day')."'.price($objp->total_ht).''.$propal_static->LibStatut($objp->fk_statut,5).'
'.dol_print_date($db->jdate($objp->dp),'day')."'.price($objp->total_ht).''.$propal_static->LibStatut($objp->fk_statut,5).'
'; print ''; - print '
'; - print ''; - //if($num2 > 0) print ''; - //else print ''; + print ''; print ''; } @@ -800,9 +800,9 @@ if ($object->id > 0) print ''; print '\n"; - print ''; - print ''; + print '\n"; + print ''; + print ''; $i++; } $db->free($resql); @@ -852,8 +852,8 @@ if ($object->id > 0) print '
'.$langs->trans("LastCustomerOrders",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllOrders").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').''.img_picto($langs->trans("CreateInvoiceForThisCustomer"),'object_bill').''.img_picto($langs->trans("NoOrdersToInvoice"),'object_bill').''; + print ''; + //if($num2 > 0) print ''; + //else print ''; print '
'.$langs->trans("LastCustomerOrders",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllOrders").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').''.img_picto($langs->trans("CreateInvoiceForThisCustomer"),'object_bill').''.img_picto($langs->trans("NoOrdersToInvoice"),'object_bill').'
'; print $commande_static->getNomUrl(1); - print ''.dol_print_date($db->jdate($objp->dc),'day')."'.price($objp->total_ht).''.$commande_static->LibStatut($objp->fk_statut,$objp->facture,5).'
'.dol_print_date($db->jdate($objp->dc),'day')."'.price($objp->total_ht).''.$commande_static->LibStatut($objp->fk_statut,$objp->facture,5).'
'; print ''; - print '
'; - print ''; + print ''; print ''; } @@ -871,9 +871,9 @@ if ($object->id > 0) print $sendingstatic->getNomUrl(1); print ''; if ($objp->date_creation > 0) { - print ''; + print ''; } else { - print ''; + print ''; } print ''; @@ -917,8 +917,8 @@ if ($object->id > 0) print ''; print ''; print ''; } @@ -939,8 +939,8 @@ if ($object->id > 0) print $contrat->getNomUrl(1,12); print "\n"; print '\n"; - print '\n"; - print '\n"; + print '\n"; + print '\n"; print ''; print '
'.$langs->trans("LastSendings",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllSendings").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').''; + print ''; print '
'.$langs->trans("LastSendings",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllSendings").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').'
'.dol_print_date($db->jdate($objp->date_creation),'day').''.dol_print_date($db->jdate($objp->date_creation),'day').'!!!!!!' . $sendingstatic->LibStatut($objp->statut, 5) . '
'; - print ''; - //print ''; + print ''; + //print ''; print '
'.$langs->trans("LastContracts",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllContracts").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').''.$langs->trans("AllContracts").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').'
'.dol_trunc($objp->refsup,12)."'.dol_print_date($db->jdate($objp->dc),'day')."'.dol_print_date($db->jdate($objp->dcon),'day')."'.dol_print_date($db->jdate($objp->dc),'day')."'.dol_print_date($db->jdate($objp->dcon),'day')." '; print $contrat->getLibStatut(4); @@ -986,8 +986,8 @@ if ($object->id > 0) print ''; print ''; - print '
'; - print ''; + print ''; print ''; } @@ -1002,8 +1002,8 @@ if ($object->id > 0) print ''; print ''."\n"; - //print ''."\n"; - print ''."\n"; + //print ''."\n"; + print ''."\n"; print ''."\n"; print ''; @@ -1059,7 +1059,7 @@ if ($object->id > 0) print '
'.$langs->trans("LastInterventions",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllInterventions").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').''; + print ''; print '
'.$langs->trans("LastInterventions",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllInterventions").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').'
'.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.''.dol_print_date($db->jdate($objp->startdate)).''.convertSecondToTime($objp->duration).''.dol_print_date($db->jdate($objp->startdate)).''.convertSecondToTime($objp->duration).''.$fichinter_static->getLibStatut(5).'
'; print ''; - print '
'; + print ''; print ''; } @@ -1086,26 +1086,26 @@ if ($object->id > 0) print ''; if ($objp->frequency && $objp->date_last_gen > 0) { - print ''; + print ''; } else { if ($objp->dc > 0) { - print ''; + print ''; } else { - print ''; + print ''; } } - print ''; if (! empty($conf->global->MAIN_SHOW_PRICE_WITH_TAX_IN_SUMMARIES)) { - print ''; } @@ -1164,8 +1164,8 @@ if ($object->id > 0) print '
'.$langs->trans("LatestCustomerTemplateInvoices",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllCustomerTemplateInvoices").' '.$num.''; print '
'.$langs->trans("LatestCustomerTemplateInvoices",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllCustomerTemplateInvoices").' '.$num.'
'.dol_print_date($db->jdate($objp->date_last_gen),'day').''.dol_print_date($db->jdate($objp->date_last_gen),'day').''.dol_print_date($db->jdate($objp->dc),'day').''.dol_print_date($db->jdate($objp->dc),'day').'!!!!!!'; + print ''; print price($objp->total_ht); print ''; + print ''; print price($objp->total_ttc); print '
'; print ''; - print '"; $i++;
'; - print ''; + print ''; print ''; } @@ -1188,19 +1188,19 @@ if ($object->id > 0) print ''; if ($objp->df > 0) { - print ''; + print ''; } else { - print ''; + print ''; } - print ''; if (! empty($conf->global->MAIN_SHOW_PRICE_WITH_TAX_IN_SUMMARIES)) { - print ''; } diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index 53176c8b76f..5acc81b0cf6 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -100,7 +100,7 @@ if ($resql) print ''; print img_action($langs->trans("Show"),$obj->id).' '; print $langs->trans("StatusProspect".$obj->id); - print ''; + print ''; $i++; } print "
'.$langs->trans("LastCustomersBills",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllBills").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').''; + print ''; print '
'.$langs->trans("LastCustomersBills",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllBills").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').'
'.dol_print_date($db->jdate($objp->df),'day').''.dol_print_date($db->jdate($objp->df),'day').'!!!!!!'; + print ''; print price($objp->total_ht); print ''; + print ''; print price($objp->total_ttc); print ''.$obj->cc.'
'.$obj->cc.'

"; @@ -140,7 +140,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire) print '
'; print ''.img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.''; - print ''; + print ''; print price($obj->price); print "