From ef7ec5555cffa9908b6ff79ebf6383b79da0e24e Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 19 Jan 2019 12:23:58 +0100 Subject: [PATCH 01/10] update with html5 compliant code --- htdocs/adherents/subscription/list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php index 85c92196a73..336122c605e 100644 --- a/htdocs/adherents/subscription/list.php +++ b/htdocs/adherents/subscription/list.php @@ -596,8 +596,8 @@ if (isset($totalarray['pos'])) { if ($i == 1) { - if ($num < $limit) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; } else print ''; } From 66e4bc450249cb8e8959ec964455b21eb4933d37 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 19 Jan 2019 12:27:26 +0100 Subject: [PATCH 02/10] update with html5 compliant code --- htdocs/comm/propal/stats/index.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index 7f808135ca1..5c54baf7360 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -251,20 +251,20 @@ print '
'; print ''; print ''; // Company - print ''; // User - print ''; // Status - print ''; // Year - print ''; - print ''; + print ''; print '
'.$langs->trans("Filter").'
'.$langs->trans("ThirdParty").''; + print '
'.$langs->trans("ThirdParty").''; $filter='s.client in (1,2,3)'; print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"'); print '
'.$langs->trans("CreatedBy").''; + print '
'.$langs->trans("CreatedBy").''; print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print '
'.$langs->trans("Status").''; + print '
'.$langs->trans("Status").''; $formpropal->selectProposalStatus(($object_status!=''?$object_status:-1),0,0,1,$mode,'object_status'); print '
'.$langs->trans("Year").''; + print '
'.$langs->trans("Year").''; if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year; if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear; arsort($arrayyears); From 336be085f6e9ff432924f01ea5bac2aeb45aafe9 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 19 Jan 2019 12:28:18 +0100 Subject: [PATCH 03/10] update with html5 compliant code --- htdocs/commande/stats/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index 578f08b7af3..6fc778fb064 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -263,16 +263,16 @@ print ''; print ''; print ''; // Company -print ''; // User -print ''; // Unit - if($conf->global->PRODUCT_USE_UNITS) print ''; + if($conf->global->PRODUCT_USE_UNITS) print ''; // Remise if ($objp->remise_percent > 0) { @@ -1752,7 +1752,7 @@ else print ''; if ($conf->global->PRODUCT_USE_UNITS) { - print ''; } diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 69e2b0d0ca8..098a1737955 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -353,7 +353,7 @@ if ($result) print $staticcompany->getNomUrl(1,'',20); print ''; print ''; - //print ''; + //print ''; print ''; print ''; print ''; diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php index 806bff48605..2e4fa4ce3da 100644 --- a/htdocs/contrat/services_list.php +++ b/htdocs/contrat/services_list.php @@ -732,8 +732,8 @@ if (isset($totalarray['displaytotalline'])) { while ($i < $totalarray['nbfield']) { $i++; if ($i == 1) { - if ($num < $limit && empty($offset)) print ''; - else print ''; + if ($num < $limit && empty($offset)) print ''; + else print ''; } elseif ($totalarray['totalhtfield'] == $i) print ''; elseif ($totalarray['totalvatfield'] == $i) print ''; From 29fdad144dec696ab850ddff5f52511bfe39b7fd Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 19 Jan 2019 12:40:17 +0100 Subject: [PATCH 05/10] update with html5 compliant code --- htdocs/core/ajax/ajaxdirtree.php | 6 ++--- htdocs/core/class/commonobject.class.php | 4 ++-- htdocs/core/class/html.form.class.php | 24 +++++++++---------- htdocs/core/class/html.formbarcode.class.php | 2 +- htdocs/core/lib/sendings.lib.php | 6 ++--- .../core/tpl/admin_extrafields_view.tpl.php | 2 +- htdocs/core/tpl/objectline_edit.tpl.php | 2 +- htdocs/core/tpl/originproductline.tpl.php | 2 +- htdocs/don/stats/index.php | 6 ++--- htdocs/expedition/card.php | 22 ++++++++--------- htdocs/expedition/stats/index.php | 6 ++--- 11 files changed, 41 insertions(+), 41 deletions(-) diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php index b44b8fd835f..d90a3f5f316 100644 --- a/htdocs/core/ajax/ajaxdirtree.php +++ b/htdocs/core/ajax/ajaxdirtree.php @@ -274,7 +274,7 @@ if (empty($conf->use_javascript_ajax) || ! empty($conf->global->MAIN_ECM_DISABLE print '
'.$langs->trans("Filter").'
'.$langs->trans("ThirdParty").''; +print '
'.$langs->trans("ThirdParty").''; if ($mode == 'customer') $filter='s.client in (1,2,3)'; if ($mode == 'supplier') $filter='s.fournisseur = 1'; print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"'); print '
'.$langs->trans("CreatedBy").''; +print '
'.$langs->trans("CreatedBy").''; print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); // Status -print '
'.$langs->trans("Status").''; +print '
'.$langs->trans("Status").''; if ($mode == 'customer') { $liststatus=array( From 43a2b5b1e2f2f92dbd7d9e1049fc03cb7b03a89a Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 19 Jan 2019 12:29:41 +0100 Subject: [PATCH 04/10] update with html5 compliant code --- htdocs/contrat/card.php | 4 ++-- htdocs/contrat/index.php | 2 +- htdocs/contrat/services_list.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 1a911ca4355..491ead83b6e 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -1625,7 +1625,7 @@ else // Quantite print ''.$objp->qty.''.$langs->trans($object->lines[$cursorline-1]->getLabelOfUnit()).''.$langs->trans($object->lines[$cursorline-1]->getLabelOfUnit()).''; + print ''; print $form->selectUnits($objp->fk_unit, "unit"); print ''.dol_print_date($db->jdate($obj->tms),'dayhour').''.$staticcontrat->LibStatut($obj->statut,2).''.$staticcontrat->LibStatut($obj->statut,2).''.($obj->nb_initial>0 ? $obj->nb_initial.$staticcontratligne->LibStatut(0,3):'').''.($obj->nb_running>0 ? $obj->nb_running.$staticcontratligne->LibStatut(4,3,0):'').''.($obj->nb_expired>0 ? $obj->nb_expired.$staticcontratligne->LibStatut(4,3,1):'').''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.price($totalarray['totalht']).''.price($totalarray['totalvat']).'
'; - print ''; @@ -420,7 +420,7 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir, print '
'; print $val['cachenbofdoc']; print ''; + print ''; if ($nbofsubdir && $nboffilesinsubdir) print '+'.$nboffilesinsubdir.' '; print '
'; - /*print '';*/ @@ -428,7 +428,7 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir, print ''; - print ''; diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index fd5deb31c36..627e67a38b7 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3,7 +3,7 @@ * Copyright (C) 2005-2013 Regis Houssin * Copyright (C) 2010-2015 Juanjo Menent * Copyright (C) 2012-2013 Christophe Battarel - * Copyright (C) 2011-2018 Philippe Grand + * Copyright (C) 2011-2019 Philippe Grand * Copyright (C) 2012-2015 Marcos García * Copyright (C) 2012-2015 Raphaël Doursenaud * Copyright (C) 2012 Cedric Salvador @@ -4126,7 +4126,7 @@ abstract class CommonObject print ''; if($conf->global->PRODUCT_USE_UNITS) { - print ''; + print ''; } print ''; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 035d922e0c1..5cafb86cdc6 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -10,7 +10,7 @@ * Copyright (C) 2007 Franky Van Liedekerke * Copyright (C) 2007 Patrick Raguin * Copyright (C) 2010 Juanjo Menent - * Copyright (C) 2010-2014 Philippe Grand + * Copyright (C) 2010-2019 Philippe Grand * Copyright (C) 2011 Herve Prot * Copyright (C) 2012-2016 Marcos García * Copyright (C) 2012 Cedric Salvador @@ -244,7 +244,7 @@ class Form } if (empty($notabletag)) $ret.=''; - if (empty($notabletag)) $ret.=''.$input['label'].''."\n"; + $more.=''.$input['label'].''."\n"; } elseif ($input['type'] == 'password') { - $more.=''.$input['label'].''."\n"; + $more.=''.$input['label'].''."\n"; } elseif ($input['type'] == 'select') { @@ -3877,7 +3877,7 @@ class Form elseif ($input['type'] == 'checkbox') { $more.=''; - $more.=''.$input['label'].' '; - $more.=''."\n"; $formquestion[] = array('name'=>$input['name'].'day'); @@ -3916,14 +3916,14 @@ class Form elseif ($input['type'] == 'other') { $more.=''; - if (! empty($input['label'])) $more.=$input['label'].''."\n"; } elseif ($input['type'] == 'onecolumn') { - $more.=''."\n"; } @@ -4286,7 +4286,7 @@ class Form $ret.=''; - $ret.=''; + $ret.=''; $ret.='
'; + /*print ''; print dol_escape_htmltag($file); print ''; print (isset($val['cachenbofdoc']) && $val['cachenbofdoc'] >= 0)?$val['cachenbofdoc']:' '; print ''; + print ''; if ($nbofsubdir > 0 && $nboffilesinsubdir > 0) print '+'.$nboffilesinsubdir.' '; print ''.$langs->trans('Qty').''.$langs->trans('Unit').''.$langs->trans('Unit').''.$langs->trans('ReductionShort').'
'; + if (empty($notabletag)) $ret.=''; //else $ret.='
'; $ret.=''; if (preg_match('/ckeditor|textarea/',$typeofdata) && empty($notabletag)) $ret.='
'."\n"; @@ -3861,11 +3861,11 @@ class Form if ($input['type'] == 'text') { - $more.='
'; + $more.=''.$input['label'].' '; $more.=''.$input['label'].''; + $more.=''; $more.=$this->selectDate($input['value'],$input['name'],0,0,0,'',1,0); $more.='
'; + if (! empty($input['label'])) $more.=$input['label'].''; $more.=$input['value']; $more.='
'; + $more.='
'; $more.=$input['value']; $more.='
'; $ret.=$this->selectDate($selected,$htmlname,$displayhour,$displaymin,1,'form'.$htmlname,1,0); $ret.='
'; } else @@ -4575,7 +4575,7 @@ class Form print ''.$addcontact.''; } print '
'; } else @@ -6543,9 +6543,9 @@ class Form print ''; print ''; print '' . $langs->trans("Ref") . ''; - print '' . $langs->trans("RefCustomer") . ''; + print '' . $langs->trans("RefCustomer") . ''; print '' . $langs->trans("AmountHTShort") . ''; - print '' . $langs->trans("Company") . ''; + print '' . $langs->trans("Company") . ''; print ''; while ($i < $num) { diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php index 5a005e7de04..65a3213bad8 100644 --- a/htdocs/core/class/html.formbarcode.class.php +++ b/htdocs/core/class/html.formbarcode.class.php @@ -219,7 +219,7 @@ class FormBarCode $out .= ''; $out .= $this->selectBarcodeType($selected, $htmlname, 1); $out .= ''; - $out .= ''; + $out .= ''; $out .= ''; } return $out; diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php index 1cafb6dc3d4..be8aeb890fc 100644 --- a/htdocs/core/lib/sendings.lib.php +++ b/htdocs/core/lib/sendings.lib.php @@ -217,9 +217,9 @@ function show_list_sending_receive($origin,$origin_id,$filter='') print ''; print ''; - //print ''; - print ''; - print ''; + //print ''; + print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php index 42f62d03ff7..79f5a0bad5c 100644 --- a/htdocs/core/tpl/admin_extrafields_view.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php @@ -49,7 +49,7 @@ print '
'; print '
'.$langs->trans("QtyOrdered").''.$langs->trans("SendingSheet").''.$langs->trans("Description").''.$langs->trans("QtyOrdered").''.$langs->trans("SendingSheet").''.$langs->trans("Description").''.$langs->trans("DateCreation").''.$langs->trans("DateDeliveryPlanned").''.$langs->trans("QtyPreparedOrShipped").'
'; print ''; -print ''; } diff --git a/htdocs/core/tpl/originproductline.tpl.php b/htdocs/core/tpl/originproductline.tpl.php index 9274359eada..ed16cec17f1 100644 --- a/htdocs/core/tpl/originproductline.tpl.php +++ b/htdocs/core/tpl/originproductline.tpl.php @@ -37,7 +37,7 @@ if (!empty($conf->multicurrency->enabled)) print ''; if($conf->global->PRODUCT_USE_UNITS) - print ''; + print ''; print ''; print ''."\n"; diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php index 5e7e08c0ee2..56657694f80 100644 --- a/htdocs/don/stats/index.php +++ b/htdocs/don/stats/index.php @@ -237,17 +237,17 @@ print '
'; print '
'.$langs->trans("Position"); +print ''.$langs->trans("Position"); print ''; print img_picto('A-Z', '1downarrow.png'); print ''; diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index ebb2863dbfa..c26298d65e5 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -178,7 +178,7 @@ $coldisplay=-1; // We remove first td global->PRODUCT_USE_UNITS) { - print ''; + print ''; print $form->selectUnits($line->fk_unit, "units"); print ''.$this->tpl['qty'].''.$langs->trans($this->tpl['unit']).''.$langs->trans($this->tpl['unit']).''.$this->tpl['remise_percent'].'
'; print ''; // Company - print ''; // User - print ''; // Year - print ''; + print ''; } else { - print ''; + print ''; } } print "\n"; @@ -1248,7 +1248,7 @@ if ($action == 'create') // Stock if (! empty($conf->stock->enabled)) { - print ''; print ''; - print ''; - print ''; } @@ -1412,7 +1412,7 @@ if ($action == 'create') // Stock if (! empty($conf->stock->enabled)) { - print ''; - print ''; - print ''; + print ''; } if (! empty($conf->productbatch->enabled)) { - print ''; + print ''; } } print ''; @@ -2313,7 +2313,7 @@ else if ($id || $ref) // Warehouse source if (! empty($conf->stock->enabled)) { - print ''; - else print ''; + if ($num < $limit && empty($offset)) print ''; + else print ''; } elseif ($totalarray['totaldurationfield'] == $i) print ''; else print ''; diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php index 7ebf701d3d5..cbc7c3424bc 100644 --- a/htdocs/fichinter/stats/index.php +++ b/htdocs/fichinter/stats/index.php @@ -233,22 +233,22 @@ print '
'; print '
'.$langs->trans("Filter").'
'.$langs->trans("ThirdParty").''; + print '
'.$langs->trans("ThirdParty").''; if ($mode == 'customer') $filter='s.client in (1,2,3)'; if ($mode == 'supplier') $filter='s.fournisseur = 1'; print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"'); print '
'.$langs->trans("CreatedBy").''; + print '
'.$langs->trans("CreatedBy").''; print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print '
'.$langs->trans("Year").''; + print '
'.$langs->trans("Year").''; if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year; if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear; arsort($arrayyears); diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index ed2eb5239b3..e99f04415b3 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -1122,11 +1122,11 @@ if ($action == 'create') { if (empty($conf->productbatch->enabled)) { - print ''.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')'.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' ('.$langs->trans("Stock").')'.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' ('.$langs->trans("Stock").')
'; + print ''; if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) // Type of product need stock change ? { // Show warehouse combo list @@ -1334,7 +1334,7 @@ if ($action == 'create') print ''; + print ''; print $staticwarehouse->getNomUrl(0).' / '; @@ -1364,7 +1364,7 @@ if ($action == 'create') print ' '; print ''; + print ''; print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $staticwarehouse->libelle); print '
'; + print ''; if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) { print $tmpwarehouseObject->getNomUrl(0).' '; @@ -1495,7 +1495,7 @@ if ($action == 'create') print ''; print ''; + print ''; print $tmpwarehouseObject->getNomUrl(0).' / '; @@ -1539,7 +1539,7 @@ if ($action == 'create') } print ''; + print ''; if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) { $warehouse_selected_id = GETPOST('entrepot_id','int'); @@ -2052,12 +2052,12 @@ else if ($id || $ref) } if (! empty($conf->stock->enabled)) { - print ''.$langs->trans("WarehouseSource").''.$langs->trans("WarehouseSource").''.$langs->trans("Batch").''.$langs->trans("Batch").''.$langs->trans("CalculatedWeight").''; + print ''; if ($lines[$i]->entrepot_id > 0) { $entrepot = new Entrepot($db); diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php index e0b750e9797..95f93904c5f 100644 --- a/htdocs/expedition/stats/index.php +++ b/htdocs/expedition/stats/index.php @@ -237,17 +237,17 @@ print '
'; print ''; print ''; // Company - print ''; // User - print ''; // Year - print ''; - else print ''; + if ($num < $limit && empty($offset)) print ''; + else print ''; } elseif ($totalarray['totalhtfield'] == $i) print ''; elseif ($totalarray['totalvatfield'] == $i) print ''; diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php index c192fb83447..08af170f5e7 100644 --- a/htdocs/expensereport/stats/index.php +++ b/htdocs/expensereport/stats/index.php @@ -2,7 +2,7 @@ /* Copyright (C) 2003-2006 Rodolphe Quiedeville * Copyright (c) 2004-2012 Laurent Destailleur * Copyright (C) 2012 Marcos García - * Copyright (C) 2018 Frédéric France + * Copyright (C) 2018 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -232,7 +232,7 @@ if (empty($user->rights->expensereport->readall) && empty($user->rights->expense print $form->select_dolusers($userid, 'userid', 1, '', 0, $include, '', 0, 0, 0, '', 0, '', 'maxwidth300'); print ''; // Status -print ''; From 3d695362ece9768d79b0685e7cd44eb19d7eaf0e Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 19 Jan 2019 12:44:26 +0100 Subject: [PATCH 07/10] update with html5 compliant code --- htdocs/fichinter/card-rec.php | 4 ++-- htdocs/fichinter/list.php | 4 ++-- htdocs/fichinter/stats/index.php | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php index 187b6fbc3da..e896c9682e4 100644 --- a/htdocs/fichinter/card-rec.php +++ b/htdocs/fichinter/card-rec.php @@ -8,7 +8,7 @@ * Copyright (C) 2012 Cedric Salvador * Copyright (C) 2015 Alexandre Spangaro * Copyright (C) 2016-2018 Charlie Benke - * Copyright (C) 2018 Frédéric France + * Copyright (C) 2018 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -613,7 +613,7 @@ if ($action == 'create') { ($object->unit_frequency?$object->unit_frequency:'m') ); print ''; - print ''; + print ''; print '
'.$langs->trans("Filter").'
'.$langs->trans("ThirdParty").''; + print '
'.$langs->trans("ThirdParty").''; if ($mode == 'customer') $filter='s.client in (1,2,3)'; if ($mode == 'supplier') $filter='s.fournisseur = 1'; print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"'); print '
'.$langs->trans("CreatedBy").''; + print '
'.$langs->trans("CreatedBy").''; print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print '
'.$langs->trans("Year").''; + print '
'.$langs->trans("Year").''; if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year; if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear; arsort($arrayyears); From f613121c2d678b51e62cf092cf3de56d8b28bd2f Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 19 Jan 2019 12:42:17 +0100 Subject: [PATCH 06/10] update with html5 compliant code --- htdocs/expensereport/list.php | 12 ++++++------ htdocs/expensereport/stats/index.php | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index 34a28442e45..7e94a10418a 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -3,9 +3,9 @@ * Copyright (C) 2004-2017 Laurent Destailleur * Copyright (C) 2004 Eric Seigne * Copyright (C) 2005-2009 Regis Houssin - * Copyright (C) 2015 Alexandre Spangaro - * Copyright (C) 2018 Ferran Marcet - * Copyright (C) 2018 Charlene Benke + * Copyright (C) 2015 Alexandre Spangaro + * Copyright (C) 2018 Ferran Marcet + * Copyright (C) 2018 Charlene Benke * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -682,7 +682,7 @@ if ($resql) } // User if (! empty($arrayfields['user']['checked'])) { - print ''; + print ''; $usertmp->id=$obj->id_user; $usertmp->lastname=$obj->lastname; $usertmp->firstname=$obj->firstname; @@ -805,8 +805,8 @@ if ($resql) $i++; if ($i == 1) { - if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.price($totalarray['totalht']).''.price($totalarray['totalvat']).'
'.$langs->trans("Status").''; +print '
'.$langs->trans("Status").''; $liststatus=$tmpexpensereport->statuts; print $form->selectarray('object_status', $liststatus, GETPOST('object_status'), -4, 0, 0, '', 1); print '
'; } else { if ($object->frequency > 0) diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 85f92f55f85..14622e39397 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -557,8 +557,8 @@ if ($resql) $i++; if ($i == 1) { - if ($num < $limit && empty($offset)) print '
'.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.convertSecondToTime($totalarray['totalduration'], 'allhourmin').'
'; print ''; // Company - print ''; // User - print ''; // Year - print ''; - else print ''; + if ($num < $limit) print ''; + else print ''; } elseif ($totalarray['totalhtfield'] == $i) print ''; elseif ($totalarray['totalvatfield'] == $i) print ''; diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 9286c038507..4fab329142c 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -1,8 +1,8 @@ +/* Copyright (C) 2002-2006 Rodolphe Quiedeville * Copyright (C) 2004-2016 Laurent Destailleur * Copyright (C) 2005-2013 Regis Houssin - * Copyright (C) 2013-2018 Philippe Grand + * Copyright (C) 2013-2019 Philippe Grand * Copyright (C) 2013 Florian Henry * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2015 Marcos García @@ -1108,8 +1108,8 @@ if ($resql) $i++; if ($i == 1) { - if ($num < $limit && empty($offset)) print ''; - else print ''; + if ($num < $limit && empty($offset)) print ''; + else print ''; } elseif ($totalarray['totalhtfield'] == $i) print ''; elseif ($totalarray['totalvatfield'] == $i) print ''; diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index 5812553db5c..d60519dda04 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/index.php @@ -203,7 +203,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- $i++; } - print ''; + print ''; print ''; print ''; @@ -258,7 +258,7 @@ if ($resql) print ''; print '\n"; - print ''; + print ''; print ''; print "\n"; } From e6d5925b7a457e066de1185727c2690201ba7bc7 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 19 Jan 2019 12:52:34 +0100 Subject: [PATCH 09/10] update with html5 compliant code --- htdocs/hrm/admin/admin_establishment.php | 6 +++--- htdocs/loan/payment/payment.php | 2 +- htdocs/margin/admin/margin.php | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php index 5b15c1fb8bc..98221ce6594 100644 --- a/htdocs/hrm/admin/admin_establishment.php +++ b/htdocs/hrm/admin/admin_establishment.php @@ -113,9 +113,9 @@ if ($result) print ''; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print '
'.$langs->trans("Filter").'
'.$langs->trans("ThirdParty").''; + print '
'.$langs->trans("ThirdParty").''; $filter = 's.client in (1,2,3)'; print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, '', 'style="width: 95%"'); print '
'.$langs->trans("CreatedBy").''; + print '
'.$langs->trans("CreatedBy").''; print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); // Status - print '
'.$langs->trans("Status").''; + print '
'.$langs->trans("Status").''; $tmp = $objectstatic->LibStatut(0); // To load $this->statuts_short $liststatus=$objectstatic->statuts_short; if (empty($conf->global->FICHINTER_CLASSIFY_BILLED)) unset($liststatus[2]); // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1 print $form->selectarray('object_status', $liststatus, $object_status, 1, 0, 0, '', 1); print '
'.$langs->trans("Year").''; + print '
'.$langs->trans("Year").''; if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year; if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear; arsort($arrayyears); From 549bbb06fc20c4f702aca23f1a22dbb6b1c147c1 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 19 Jan 2019 12:50:06 +0100 Subject: [PATCH 08/10] update with html5 compliant code --- htdocs/fourn/commande/list.php | 6 +++--- htdocs/fourn/facture/list.php | 8 ++++---- htdocs/fourn/index.php | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index b4892d3d89f..4aa18b6d40e 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2001-2006 Rodolphe Quiedeville * Copyright (C) 2004-2016 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2013 Cédric Salvador @@ -1147,8 +1147,8 @@ if ($resql) $i++; if ($i == 1) { - if ($num < $limit) print ''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.price($totalarray['totalht']).''.price($totalarray['totalvat']).''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.price($totalarray['totalht']).''.price($totalarray['totalvat']).'
'.$langs->trans("Total").'
'.$langs->trans("Total").''.price($tot_ttc).'
'.img_object($langs->trans("ShowSupplier"),"company").''; print " socid."\">".$obj->name."'.$obj->code_fournisseur.' '.$obj->code_fournisseur.' '.dol_print_date($db->jdate($obj->tms),'day').'
'.$establishmentstatic->getNomUrl(1).''.$obj->address.''.$obj->zip.''.$obj->town.''.$obj->address.''.$obj->zip.''.$obj->town.''; print $establishmentstatic->getLibStatut(5); diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php index 07425ea1942..2ca310a1689 100644 --- a/htdocs/loan/payment/payment.php +++ b/htdocs/loan/payment/payment.php @@ -278,7 +278,7 @@ if ($action == 'create') print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php index b2c74506990..3d8d5ec2ab9 100644 --- a/htdocs/margin/admin/margin.php +++ b/htdocs/margin/admin/margin.php @@ -123,7 +123,7 @@ print '
'.$langs->trans("DateDue").''.$langs->trans("DateDue").''.$langs->trans("LoanCapital").''.$langs->trans("AlreadyPaid").''.$langs->trans("RemainderToPay").'
'; print ''; print ''; print ''."\n"; -print ''."\n"; +print ''."\n"; print ''; $form = new Form($db); @@ -241,7 +241,7 @@ print ''; print ""; print ''; print ''; -print ''; print ''; print ''; -print ''; - else print ''; + if ($num < $limit) print ''; + else print ''; } else print ''; } diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php index cf52d83c680..93086de389f 100644 --- a/htdocs/opensurvey/list.php +++ b/htdocs/opensurvey/list.php @@ -442,8 +442,8 @@ if (isset($totalarray['pos'])) { if ($i == 1) { - if ($num < $limit) print ''; - else print ''; + if ($num < $limit) print ''; + else print ''; } else print ''; }
'.$langs->trans("Description").''.$langs->trans("Value").''.$langs->trans("Description").''.$langs->trans("Description").'
'.$langs->trans("MARGIN_METHODE_FOR_DISCOUNT").''; +print ''; print Form::selectarray('MARGIN_METHODE_FOR_DISCOUNT', $methods, $conf->global->MARGIN_METHODE_FOR_DISCOUNT); print ''; @@ -257,7 +257,7 @@ print ''; print ""; print '
'.$langs->trans("AgentContactType").''; +print ''; $formcompany = new FormCompany($db); $facture = new Facture($db); print $formcompany->selectTypeContact($facture, $conf->global->AGENT_CONTACT_TYPE, "AGENT_CONTACT_TYPE","internal","code",1); From 6fc28af92b71f7e8444f64f2bdcc842b469bd1d2 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 19 Jan 2019 12:53:47 +0100 Subject: [PATCH 10/10] update with html5 compliant code --- htdocs/modulebuilder/template/myobject_list.php | 4 ++-- htdocs/opensurvey/list.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php index a1738474459..eeabbb11b1e 100644 --- a/htdocs/modulebuilder/template/myobject_list.php +++ b/htdocs/modulebuilder/template/myobject_list.php @@ -542,8 +542,8 @@ if (isset($totalarray['pos'])) { if ($i == 1) { - if ($num < $limit) print ''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.$langs->trans("Total").''.$langs->trans("Totalforthispage").'