From 2463ee47bac7af64f7242ea8304e1aa99adea044 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 15 Mar 2019 09:40:52 +0100 Subject: [PATCH 01/16] update with html5 compliant code --- .../fourn/class/fournisseur.product.class.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index 9eedea68335..c0a7bbc97c7 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -893,13 +893,13 @@ class ProductFournisseur extends Product $langs->load("suppliers"); if (count($productFournList) > 0) { $out .= ''; - $out .= ''; - $out .= ''; + $out .= ''; + $out .= ''; $out .= ''; $out .= ''; foreach ($productFournList as $productFourn) { - $out.= ''; - $out.= ''; + $out.= ''; + $out.= ''; $out.= ''; $out.= ''; } @@ -992,13 +992,13 @@ class ProductFournisseur extends Product if (count($productFournLogList) > 0) { $out .= '
'.($showunitprice?$langs->trans("Price").' '.$langs->trans("HT"):'').''.($showunitprice?$langs->trans("QtyMin"):'').'
'.($showunitprice?$langs->trans("Price").' '.$langs->trans("HT"):'').''.($showunitprice?$langs->trans("QtyMin"):'').''.$langs->trans("Supplier").''.$langs->trans("SupplierRef").'
'.($showunitprice?price($productFourn->fourn_unitprice * (1 -$productFourn->fourn_remise_percent/100) - $productFourn->fourn_remise):'').''.($showunitprice?$productFourn->fourn_qty:'').'
'.($showunitprice?price($productFourn->fourn_unitprice * (1 -$productFourn->fourn_remise_percent/100) - $productFourn->fourn_remise):'').''.($showunitprice?$productFourn->fourn_qty:'').''.$productFourn->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).''.$productFourn->fourn_ref.'
'; $out .= ''; - $out .= ''; - //$out .= ''; + $out .= ''; + //$out .= ''; $out .= ''; foreach ($productFournLogList as $productFournLog) { - $out.= ''; - $out.= ''; - //$out.= ''; + $out.= ''; + $out.= ''; + //$out.= ''; $out.= ''; } $out .= '
'.$langs->trans("Date").''.$langs->trans("Price").''.$langs->trans("QtyMin").''.$langs->trans("Price").''.$langs->trans("QtyMin").''.$langs->trans("User").'
'.dol_print_date($productFournLog['datec'], 'dayhour', 'tzuser').''.price($productFournLog['price']).''.$productFournLog['quantity'].'
'.dol_print_date($productFournLog['datec'], 'dayhour', 'tzuser').''.price($productFournLog['price']).''.$productFournLog['quantity'].''.$productFournLog['lastname'].'
'; From 6536efa81c58935db4f580c5a922ac7675296c71 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 15 Mar 2019 09:41:56 +0100 Subject: [PATCH 02/16] update with html5 compliant code --- htdocs/imports/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index c58ee993702..f03fb1d6519 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.php @@ -111,7 +111,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print ''; include_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php'; @@ -125,7 +125,7 @@ foreach($liste as $key) $text=$model->getDriverDescForKey($key); print ''; print ''; - print ''; + print ''; print ''; } From f028f74c7c0f65aa4ff14e1b190a06d5b701b6ae Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 15 Mar 2019 09:43:33 +0100 Subject: [PATCH 03/16] update with html5 compliant code --- htdocs/install/repair.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php index ac044d21cf6..fa1b070cc40 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.php @@ -113,13 +113,13 @@ $db=getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf-> if ($db->connected) { print '"; + print $langs->trans("ServerConnection")." : $dolibarr_main_db_host"; dolibarr_install_syslog("repair: " . $langs->transnoentities("ServerConnection") . ": " . $dolibarr_main_db_host . $langs->transnoentities("OK")); $ok = 1; } else { - print ""; + print ""; dolibarr_install_syslog("repair: " . $langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)); $ok = 0; } @@ -129,13 +129,13 @@ if ($ok) if($db->database_selected) { print '"; + print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name.""; dolibarr_install_syslog("repair: database connection successful: " . $dolibarr_main_db_name); $ok=1; } else { - print ""; + print ""; dolibarr_install_syslog("repair: " . $langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)); $ok=0; } @@ -147,9 +147,9 @@ if ($ok) $version=$db->getVersion(); $versionarray=$db->getVersionArray(); print ''; - print ''; + print ''; dolibarr_install_syslog("repair: " . $langs->transnoentities("ServerVersion") . ": " . $version); - //print ''; + //print ''; } $conf->setValues($db); @@ -206,7 +206,7 @@ if ($ok && GETPOST('standard', 'alpha')) foreach($filelist as $file) { print ''; + print $langs->trans("Script").''; $name = substr($file, 0, dol_strlen($file) - 4); From 404872298f7a2874faed3c7f4a964041d97d6321 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 15 Mar 2019 09:44:17 +0100 Subject: [PATCH 04/16] update with html5 compliant code --- htdocs/install/step2.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php index e0af9a7f771..1a8a4108827 100644 --- a/htdocs/install/step2.php +++ b/htdocs/install/step2.php @@ -125,11 +125,11 @@ if ($action == "set") $versionarray=$db->getVersionArray(); print ''; print ''; - //print ''; + //print ''; print ''; print ''; - //print ''; + //print ''; } $requestnb=0; From 3d93fba4b8f1cbc6b6629d974a998d9a3539000e Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 15 Mar 2019 09:45:01 +0100 Subject: [PATCH 05/16] update with html5 compliant code --- htdocs/install/upgrade.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index 6a821d8dbaf..1e912545638 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -181,16 +181,16 @@ if (! GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'a $version=$db->getVersion(); $versionarray=$db->getVersionArray(); print ''; - print ''; + print ''; dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ServerVersion") . ": " .$version); if ($db->type == 'mysqli' && function_exists('mysqli_get_charset')) { $tmparray = $db->db->get_charset(); print ''; - print ''; + print ''; dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ClientCharset") . ": " .$tmparray->charset); print ''; - print ''; + print ''; dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ClientCollation") . ": " .$tmparray->collation); } @@ -201,7 +201,7 @@ if (! GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'a && versioncompare($versionarray, $versionmindb) < 0) { // Warning: database version too low. - print "\n"; + print "\n"; dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ErrorDatabaseVersionTooLow", join('.', $versionarray), join('.', $versionmindb))); $ok=0; } @@ -228,7 +228,7 @@ if (! GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'a ) { // Warning: database version too low. - print '\n"; + print '\n"; dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ErrorDatabaseVersionForbiddenForMigration", join('.', $versionarray), $listofforbiddenversion)); $ok=0; break; @@ -367,7 +367,7 @@ if (! GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'a if (in_array($dir.$file, $listoffileprocessed)) continue; print ''; - print ''."\n"; + print ''."\n"; // Run sql script $ok=run_sql($dir.$file, 0, '', 1); @@ -401,7 +401,7 @@ if (! GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'a if (in_array($modulefilelong, $listoffileprocessed)) continue; print ''; - print ''."\n"; + print ''."\n"; // Run sql script $okmodule=run_sql($modulefilelong, 0, '', 1); // Note: Result of migration of external module should not decide if we continue migration of Dolibarr or not. From 2e4bf72382365d7640e791d129b6fade5feb4b37 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 15 Mar 2019 09:45:48 +0100 Subject: [PATCH 06/16] update with html5 compliant code --- htdocs/install/upgrade2.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 45b5f8fe95c..b5d05a4dd4a 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -143,7 +143,7 @@ if (! GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'a if (!$db->connected) { - print ''; + print ''; dolibarr_install_syslog('upgrade2: failed to connect to database :' . $conf->db->name . ' on ' . $conf->db->host . ' for user ' . $conf->db->user, LOG_ERR); $error++; } @@ -3666,13 +3666,13 @@ function migrate_clean_association($db, $langs, $conf, $versionto) if (! $error) { print ''; - print ''; + print ''; $db->commit(); } else { print ''; - print ''; + print ''; $db->rollback(); } } @@ -3680,7 +3680,7 @@ function migrate_clean_association($db, $langs, $conf, $versionto) else { print ''; - print ''; + print ''; } } } From cd168a951afc69c3658d100c460af708352e8039 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 15 Mar 2019 09:46:39 +0100 Subject: [PATCH 07/16] update with html5 compliant code --- htdocs/opensurvey/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/opensurvey/index.php b/htdocs/opensurvey/index.php index c36d27b64db..413572ca4f6 100644 --- a/htdocs/opensurvey/index.php +++ b/htdocs/opensurvey/index.php @@ -68,9 +68,9 @@ else dol_print_error($db, ''); print '
'.$langs->trans("AvailableFormats").''.$langs->trans("LibraryShort").''.$langs->trans("LibraryVersion").''.$langs->trans("LibraryVersion").'
'.$form->textwithpicto($model->getDriverLabelForKey($key), $text).''.$model->getLibLabelForKey($key).''.$model->getLibVersionForKey($key).''.$model->getLibVersionForKey($key).'
'; - print $langs->trans("ServerConnection")." : $dolibarr_main_db_host".$langs->trans("OK")."
".$langs->trans("OK")."
".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."".$langs->transnoentities("Error")."
".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."".$langs->transnoentities("Error")."
'; - print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."".$langs->trans("OK")."
".$langs->trans("OK")."
".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."".$langs->trans("Error")."
".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."".$langs->trans("Error")."
'.$langs->trans("ServerVersion").''.$version.'
'.$version.'
'.join('.',$versionarray).'
'.join('.',$versionarray).'
*** '; - print $langs->trans("Script").''.$file.'
'.$file.'
'.$langs->trans("DatabaseVersion").''.$version.'
'.join('.',$versionarray).'
'.join('.',$versionarray).'
'.$langs->trans("DatabaseName").''.$db->database_name.'
'.join('.',$versionarray).'
'.join('.',$versionarray).'
'.$langs->trans("ServerVersion").''.$version.'
'.$version.'
'.$langs->trans("ClientCharset").''.$tmparray->charset.'
'.$tmparray->charset.'
'.$langs->trans("ClientSortingCharset").''.$tmparray->collation.'
'.$tmparray->collation.'
".$langs->trans("ErrorDatabaseVersionTooLow", join('.', $versionarray), join('.', $versionmindb))."".$langs->trans("Error")."
".$langs->trans("ErrorDatabaseVersionTooLow", join('.', $versionarray), join('.', $versionmindb))."".$langs->trans("Error")."
'.$langs->trans("ErrorDatabaseVersionForbiddenForMigration", join('.', $versionarray), $listofforbiddenversion)."
".$langs->trans("Error")."
'.$langs->trans("ErrorDatabaseVersionForbiddenForMigration", join('.', $versionarray), $listofforbiddenversion)."
".$langs->trans("Error")."
'.$langs->trans("ChoosedMigrateScript").''.$file.'
'.$langs->trans("ChoosedMigrateScript").''.$file.'
'.$langs->trans("ChoosedMigrateScript").' (external modules)'.$modulefileshort.'
'.$langs->trans("ChoosedMigrateScript").' (external modules)'.$modulefileshort.'
'.$langs->trans("ErrorFailedToConnectToDatabase", $conf->db->name).''.$langs->trans('Error').'
'.$langs->trans("ErrorFailedToConnectToDatabase", $conf->db->name).''.$langs->trans('Error').'
'.$langs->trans("MigrationCategorieAssociation").''.$langs->trans("RemoveDuplicates").' '.$langs->trans("Success").' ('.$num.'=>'.count($couples).')
'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Success").' ('.$num.'=>'.count($couples).')
'.$langs->trans("MigrationCategorieAssociation").''.$langs->trans("RemoveDuplicates").' '.$langs->trans("Failed").'
'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Failed").'
'.$langs->trans("Error").'
'.$db->lasterror().'
'.$db->lasterror().'
'; print ''; print ""; -print ''; +print ''; print ""; -//print ''; print '
'.$langs->trans("OpenSurveyArea").'
'.$langs->trans("NbOfSurveys").''.$nbsondages.''.$langs->trans("NbOfSurveys").''.$nbsondages.'
'.$langs->trans("Total").''; +//print '
'.$langs->trans("Total").''; //print $total; //print '
'; From 81510717ce6607ec23d3882a73084ee219198061 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 15 Mar 2019 09:47:56 +0100 Subject: [PATCH 08/16] update with html5 compliant code --- htdocs/opensurvey/list.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php index e736cadf8ce..713ade2f736 100644 --- a/htdocs/opensurvey/list.php +++ b/htdocs/opensurvey/list.php @@ -315,7 +315,7 @@ $parameters=array('arrayfields'=>$arrayfields); $reshook=$hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action column -print ''; +print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print ''; @@ -401,13 +401,13 @@ while ($i < min($num, $limit)) print ''; // Nb of voters - print''.$nbuser.''."\n"; + print''.$nbuser.''."\n"; - print ''.dol_print_date($db->jdate($obj->date_fin), 'day'); + print ''.dol_print_date($db->jdate($obj->date_fin), 'day'); if ($db->jdate($obj->date_fin) < $now && $obj->status == Opensurveysondage::STATUS_VALIDATED) { print img_warning($langs->trans("Expired")); } print ''; - print''.$opensurvey_static->getLibStatut(5).''."\n"; + print''.$opensurvey_static->getLibStatut(5).''."\n"; // Extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php'; @@ -416,7 +416,7 @@ while ($i < min($num, $limit)) $reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action column - print ''; + print ''; if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined { $selected=0; @@ -437,7 +437,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) From 7c916666a62527079f543c9925df13fa7b8effc8 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 15 Mar 2019 09:48:32 +0100 Subject: [PATCH 09/16] update with html5 compliant code --- htdocs/product/admin/dynamic_prices.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php index 542618d76a7..bbaa5f43e2f 100644 --- a/htdocs/product/admin/dynamic_prices.php +++ b/htdocs/product/admin/dynamic_prices.php @@ -176,7 +176,7 @@ if ($action != 'create_updater' && $action != 'edit_updater') { print ''.$entry->code.''; print ''.$entry->description.''; print ''.price($entry->value).''; - print 'id.'">'.img_edit().'  '; + print 'id.'">'.img_edit().'  '; print 'id.'">'.img_delete().''; print ''; } @@ -228,7 +228,7 @@ if ($action == 'create_variable' || $action == 'edit_variable') { print ''; //Form Buttons - print '
'; + print '
'; print '  '; print ''; print '
'; @@ -267,7 +267,7 @@ if ($action != 'create_variable' && $action != 'edit_variable') { print ''.$entry->parameters.''; print ''.$entry->update_interval.''; print ''.$entry->getLastUpdated().''; - print 'id.'">'.img_edit().'  '; + print 'id.'">'.img_edit().'  '; print 'id.'">'.img_delete().''; print ''; } @@ -350,7 +350,7 @@ if ($action == 'create_updater' || $action == 'edit_updater') { print ''; //Form Buttons - print '
'; + print '
'; print '  '; print ''; print '
'; From 89da4fbdc1403cdcba09b4e6ade3951db3e7c9dc Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 15 Mar 2019 09:49:07 +0100 Subject: [PATCH 10/16] update with html5 compliant code --- htdocs/product/admin/product_tools.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php index e7c89294b56..e76c6884b7f 100644 --- a/htdocs/product/admin/product_tools.php +++ b/htdocs/product/admin/product_tools.php @@ -300,13 +300,13 @@ else print ''; print ''; print ''."\n"; - print ''."\n"; + print ''."\n"; print ''."\n"; print ''."\n"; print ''."\n"; - print ''."\n"; print ''."\n"; @@ -314,7 +314,7 @@ else print ''."\n"; print ''."\n"; - print ''."\n"; print ''."\n"; @@ -323,7 +323,7 @@ else print ''."\n"; print ''."\n"; - print ''."\n"; print ''."\n"; From 6bdac445c5015ab4f853d9bfa2bd50b9c31bb181 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 15 Mar 2019 09:50:53 +0100 Subject: [PATCH 11/16] update with html5 compliant code --- htdocs/product/admin/product.php | 62 ++++++++++++++++---------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index 1d95e2c9fa3..2efd3ab14f1 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -304,8 +304,8 @@ print ''."\n"; print ' '; print ' '; print ' '; -print ' '; -print ' '; +print ' '; +print ' '; print "\n"; $var = true; @@ -345,7 +345,7 @@ foreach ($dirproduct as $dirroot) if (! empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) && $conf->global->PRODUCT_CODEPRODUCT_ADDON == $file) { - print '\n"; } @@ -353,14 +353,14 @@ foreach ($dirproduct as $dirroot) { $disabled = false; if (! empty($conf->multicompany->enabled) && (is_object($mc) && ! empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true); - print ''; } - print ''; @@ -404,10 +404,10 @@ print '
'.$langs->trans("Parameters").''.$langs->trans("Value").''.$langs->trans("Value").'
'.$langs->trans("OldVATRates").''."\n"; + print ''."\n"; print $form->load_tva('oldvatrate', $oldvatrate, $mysoc, null, 0, 0, '', false, 1); print '
'.$langs->trans("NewVATRates").''."\n"; + print ''."\n"; print $form->load_tva('newvatrate', $newvatrate, $mysoc, null, 0, 0, '', false, 1); print '
'.$langs->trans("PriceBaseTypeToChange").''."\n"; + print ''."\n"; print $form->selectPriceBaseType($price_base_type); print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("Status").''.$langs->trans("ShortInfo").''.$langs->trans("Status").''.$langs->trans("ShortInfo").'
'."\n"; + print ''."\n"; print img_picto($langs->trans("Activated"), 'switch_on'); print "'; + print ''; if (! $disabled) print ''; print img_picto($langs->trans("Disabled"), 'switch_off'); if (! $disabled) print ''; print ''; + print ''; $s=$modCodeProduct->getToolTip($langs, null, -1); print $form->textwithpicto('', $s, 1); print '
'; print ''; print ''; print ''; -print '\n"; -print '\n"; -print ''; -print ''; +print '\n"; +print '\n"; +print ''; +print ''; print "\n"; clearstatcache(); @@ -458,7 +458,7 @@ foreach ($dirmodels as $reldir) // Active if (in_array($name, $def)) { - print '"; } // Defaut - print ''; // Preview - print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Status")."'.$langs->trans("Default")."'.$langs->trans("ShortInfo").''.$langs->trans("Preview").''.$langs->trans("Status")."'.$langs->trans("Default")."'.$langs->trans("ShortInfo").''.$langs->trans("Preview").'
'."\n"; + print ''."\n"; print ''; print img_picto($langs->trans("Enabled"), 'switch_on'); print ''; @@ -466,13 +466,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->PRODUCT_ADDON_PDF == $name) { print img_picto($langs->trans("Default"), 'on'); @@ -495,12 +495,12 @@ foreach ($dirmodels as $reldir) $htmltooltip.='
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; if ($module->type == 'pdf') { print ''.img_object($langs->trans("Preview"), 'contract').''; @@ -540,7 +540,7 @@ print ''; print ''; print ''; print ''."\n"; -print ''."\n"; +print ''."\n"; print ''."\n"; @@ -557,7 +557,7 @@ if (! empty($conf->fournisseur->enabled)) $rowspan++; print ''; print ''; -print ''; print ''; @@ -579,7 +579,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES) || ! empty($conf->global->PRODUI { print ''; print ''; - print ''; + print ''; print ''; } @@ -587,7 +587,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES) || ! empty($conf->global->PRODUI print ''; print ''; -print ''; print ''; @@ -598,13 +598,13 @@ print ''; print ''; if (empty($conf->use_javascript_ajax)) { - print ''; } else { - print ''; print ''; - print ''; + print ''; print ''; } // Visualiser description produit dans les formulaires activation/desactivation print ''; print ''; -print ''; print ''; @@ -637,7 +637,7 @@ print ''; print ''; print ''; -print ''; print ''; @@ -648,7 +648,7 @@ print ''; print ''; print ''; -print ''; print ''; @@ -659,7 +659,7 @@ if (! empty($conf->global->MAIN_MULTILANGS)) { print ''; print ''; - print ''; print ''; @@ -669,7 +669,7 @@ if (! empty($conf->fournisseur->enabled)) { print ''; print ''; - print ''; print ''; @@ -682,7 +682,7 @@ if (! empty($conf->global->PRODUCT_CANVAS_ABILITY)) print ''; print ''."\n"; - print ''."\n"; + print ''."\n"; print ''."\n"; if (is_dir($dir)) @@ -710,19 +710,19 @@ if (! empty($conf->global->PRODUCT_CANVAS_ABILITY)) print $object->description; - print ''; print ''; print ''; - print ''; - print ''; - if (! empty($conf->stock->enabled)) print ''; - print ''; - print ''; + print ''; + print ''; + if (! empty($conf->stock->enabled)) print ''; + print ''; + print ''; print ''."\n"; $class='pair'; @@ -361,7 +361,7 @@ if ($id > 0 || ! empty($ref)) print ''; // Best buying price - print ''; @@ -393,20 +393,20 @@ if ($id > 0 || ! empty($ref)) $totallinesell=price2num($value['nb'] * ($pricesell), 'MT'); $totalsell+=$totallinesell; } - print ''; // Stock - if (! empty($conf->stock->enabled)) print ''; // Real stock + if (! empty($conf->stock->enabled)) print ''; // Real stock // Qty + IncDec if ($user->rights->produit->creer || $user->rights->service->creer) { - print ''; - print ''; + print ''; + print ''; } else{ print ''; @@ -438,7 +438,7 @@ if ($id > 0 || ! empty($ref)) print ''; if (! empty($conf->stock->enabled)) print ''; // Real stock - print ''; + print ''; print ''; print ''."\n"; @@ -450,29 +450,29 @@ if ($id > 0 || ! empty($ref)) print ''; // Minimum buying price - print ''; - print ''; // Minimum selling price - print ''; - print ''; // Stock - if (! empty($conf->stock->enabled)) print ''; + if (! empty($conf->stock->enabled)) print ''; - print ''; print ''; + //print ''; print ''; if ($resql) { @@ -613,13 +613,13 @@ if ($id > 0 || ! empty($ref)) $incdec=0; } // Contained into package - /*print '';*/ // Qty - print ''; + print ''; // Inc Dec - print ' - + barcode->enabled)) { ?> - + - - - + + + global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){ - echo ''; + echo ''; $total_current_pa+=$row['current_pa_stock']; } ?> - - + rights->stock->changePMP)) { - echo ''; + echo ''; } ?> - + global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){ - echo ''; + echo ''; $total_current_pa_actual+=$row['current_pa_actual']; } ?> - + - + Date: Fri, 15 Mar 2019 09:55:06 +0100 Subject: [PATCH 14/16] update with html5 compliant code --- htdocs/product/inventory/list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php index 3b40cc38792..23539566a4d 100644 --- a/htdocs/product/inventory/list.php +++ b/htdocs/product/inventory/list.php @@ -380,7 +380,7 @@ $parameters=array('arrayfields'=>$arrayfields); $reshook=$hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action column -print ''; @@ -486,7 +486,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) From 8054f61bac89ed6fd4490c4db6430620d27c1dbb Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Sat, 16 Mar 2019 09:14:57 +0100 Subject: [PATCH 15/16] Update fournisseur.product.class.php Oops...to much alcohol.. --- htdocs/fourn/class/fournisseur.product.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index c0a7bbc97c7..6de51fdc359 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -898,8 +898,8 @@ class ProductFournisseur extends Product $out .= ''; $out .= ''; foreach ($productFournList as $productFourn) { - $out.= ''; - $out.= ''; + $out.= ''; + $out.= ''; $out.= ''; $out.= ''; } From 8de8657b8259e56e71f862030bccb4a514c5e64c Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Sat, 16 Mar 2019 09:16:36 +0100 Subject: [PATCH 16/16] Update index.php Too much copy and paste... --- htdocs/imports/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index f03fb1d6519..b493534f772 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.php @@ -111,7 +111,7 @@ print '
'.$langs->trans("Parameters").''.$langs->trans("Value").''.$langs->trans("Value").' 
'.$langs->trans("PricingRule").''; +print ''; $current_rule = 'PRODUCT_PRICE_UNIQ'; if (!empty($conf->global->PRODUIT_MULTIPRICES)) $current_rule='PRODUIT_MULTIPRICES'; if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) $current_rule='PRODUIT_CUSTOMER_PRICES_BY_QTY'; @@ -568,7 +568,7 @@ if ( empty($conf->multicompany->enabled)) { print $langs->trans("SamePriceAlsoForSharedCompanies"); } -print ''; +print ''; print ''; print '
'.$langs->trans("MultiPricesNumPrices").'
'.$langs->trans("AssociatedProductsAbility").''; +print ''; print $form->selectyesno("PRODUIT_SOUSPRODUITS", $conf->global->PRODUIT_SOUSPRODUITS, 1); print '
'.$form->textwithpicto($langs->trans("UseSearchToSelectProduct"), $langs->trans('UseSearchToSelectProductTooltip'), 1).''; + print ''; print $langs->trans("NotAvailableWhenAjaxDisabled"); print ''; + print ''; $arrval=array( '0'=>$langs->trans("No"), '1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')', @@ -620,14 +620,14 @@ if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) { print '
'.$langs->trans("NumberOfProductShowInSelect").'
'.$langs->trans("ViewProductDescInFormAbility").''; +print ''; print $form->selectyesno("activate_viewProdDescInForm", $conf->global->PRODUIT_DESC_IN_FORM, 1); print '
'.$langs->trans("MergePropalProductCard").''; +print ''; print $form->selectyesno("activate_mergePropalProductCard",$conf->global->PRODUIT_PDF_MERGE_PROPAL,1); print '
'.$langs->trans("UseUnits").''; +print ''; print $form->selectyesno("activate_units",$conf->global->PRODUCT_USE_UNITS,1); print '
'.$langs->trans("ViewProductDescInThirdpartyLanguageAbility").''; + print ''; print $form->selectyesno("activate_viewProdTextsInThirdpartyLanguage", (! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)?$conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE:0), 1); print '
'.$langs->trans("UseProductFournDesc").''; + print ''; print $form->selectyesno("activate_useProdFournDesc", (! empty($conf->global->PRODUIT_FOURN_TEXTS)?$conf->global->PRODUIT_FOURN_TEXTS:0), 1); print '
'.$langs->trans("ProductSpecial").''.$langs->trans("Value").''.$langs->trans("Value").' 
'; + print ''; $const = "PRODUCT_SPECIAL_".strtoupper($file); if ($conf->global->$const) { print img_picto($langs->trans("Active"), 'tick'); - print ''; + print ''; print ''.$langs->trans("Disable").''; } else { - print ' '; + print ' '; print ''.$langs->trans("Activate").''; } From 14abf357e71d5690a106f0b882b3c71a3bf12774 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 15 Mar 2019 09:53:06 +0100 Subject: [PATCH 12/16] update with html5 compliant code --- htdocs/product/composition/card.php | 48 ++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php index fdf11eb1c9e..f27aac68eb4 100644 --- a/htdocs/product/composition/card.php +++ b/htdocs/product/composition/card.php @@ -333,11 +333,11 @@ if ($id > 0 || ! empty($ref)) print '
'.$langs->trans('ComposedProduct').''.$langs->trans('Label').''.$langs->trans('MinSupplierPrice').''.$langs->trans('MinCustomerPrice').''.$langs->trans('Stock').''.$langs->trans('Qty').''.$langs->trans('ComposedProductIncDecStock').''.$langs->trans('MinSupplierPrice').''.$langs->trans('MinCustomerPrice').''.$langs->trans('Stock').''.$langs->trans('Qty').''.$langs->trans('ComposedProductIncDecStock').'
'.$productstatic->label.''; + print ''; if ($product_fourn->find_min_price_product_fournisseur($productstatic->id) > 0) { print $langs->trans("BuyingPriceMinShort").': '; @@ -378,7 +378,7 @@ if ($id > 0 || ! empty($ref)) $totalline=price2num($value['nb'] * ($fourn_unitprice * (1 - $fourn_remise_percent/100) - $fourn_remise), 'MT'); $total+=$totalline; - print ''; + print ''; print ($notdefined?'':($value['nb']> 1 ? $value['nb'].'x' : '').price($fourn_unitprice, '', '', 0, 0, -1, $conf->currency)); print ''; + print ''; print ($notdefined?'':($value['nb']> 1 ? $value['nb'].'x' : '')); if (is_numeric($pricesell)) print price($pricesell, '', '', 0, 0, -1, $conf->currency); else print $langs->trans($pricesell); print ''.$value['stock'].''.$value['stock'].''.$nb_of_subproduct.' '.$value['nb'].''.$value['nb'].' 
'; + print ''; print $langs->trans("TotalBuyingPriceMinShort"); print ''; + print ''; if ($atleastonenotdefined) print $langs->trans("Unknown").' ('.$langs->trans("SomeSubProductHaveNoPrices").')'; print ($atleastonenotdefined?'':price($total, '', '', 0, 0, -1, $conf->currency)); print ''; + print ''; print $langs->trans("TotalSellingPriceMinShort"); print ''; + print ''; if ($atleastonenotdefined) print $langs->trans("Unknown").' ('.$langs->trans("SomeSubProductHaveNoPrices").')'; print ($atleastonenotdefined?'':price($totalsell, '', '', 0, 0, -1, $conf->currency)); print '  '; + print ''; if ($user->rights->produit->creer || $user->rights->service->creer) { print ''; @@ -542,9 +542,9 @@ if ($id > 0 || ! empty($ref)) print '
'.$langs->trans("ComposedProduct").''; print ''.$langs->trans("Label").''; - //print ''.$langs->trans("IsInPackage").''; - print ''.$langs->trans("Qty").''; - print ''.$langs->trans('ComposedProductIncDecStock').''.$langs->trans("IsInPackage").''; + print ''.$langs->trans("Qty").''; + print ''.$langs->trans('ComposedProductIncDecStock').'
'; + /*print ''; print ''; + print ''; if ($qty) print ''; else { From c958bf49d05cd5ca2730b3ee85ea656d4a8ed222 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 15 Mar 2019 09:54:10 +0100 Subject: [PATCH 13/16] update with html5 compliant code --- .../product/inventory/tpl/inventory.tpl.php | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/htdocs/product/inventory/tpl/inventory.tpl.php b/htdocs/product/inventory/tpl/inventory.tpl.php index 44c9980c01d..8d85b20dc43 100644 --- a/htdocs/product/inventory/tpl/inventory.tpl.php +++ b/htdocs/product/inventory/tpl/inventory.tpl.php @@ -124,44 +124,44 @@ if (empty($conf) || ! is_object($conf)) ?>
   '.price($row['current_pa_stock']).''.price($row['current_pa_stock']).'   +    '.$row['pmp_new'].''.$row['pmp_new'].' '.price($row['current_pa_actual']).''.price($row['current_pa_actual']).'
'; +print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print ''.price($totalarray['val'][$totalarray['pos'][$i]]).''.price($totalarray['val'][$totalarray['pos'][$i]]).''.$langs->trans("Supplier").''.$langs->trans("SupplierRef").'
'.($showunitprice?price($productFourn->fourn_unitprice * (1 -$productFourn->fourn_remise_percent/100) - $productFourn->fourn_remise):'').''.($showunitprice?$productFourn->fourn_qty:'').'
'.($showunitprice?price($productFourn->fourn_unitprice * (1 -$productFourn->fourn_remise_percent/100) - $productFourn->fourn_remise):'').''.($showunitprice?$productFourn->fourn_qty:'').''.$productFourn->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).''.$productFourn->fourn_ref.'
'; print ''; print ''; print ''; -print ''; +print ''; print ''; include_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php';
'.$langs->trans("AvailableFormats").''.$langs->trans("LibraryShort").''.$langs->trans("LibraryVersion").''.$langs->trans("LibraryVersion").'