From 1599f165eed034829dc2407fc8a400e3f926f4ab Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 24 Jan 2019 09:57:39 +0100 Subject: [PATCH 1/4] update with html5 compliant code --- htdocs/compta/bank/budget.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php index 1d20c4a0d00..96d029407e2 100644 --- a/htdocs/compta/bank/budget.php +++ b/htdocs/compta/bank/budget.php @@ -49,9 +49,9 @@ print load_fiche_titre($langs->trans("BankTransactionByCategories"), '', 'title_ print ''; print ""; print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; print "\n"; $sql = "SELECT sum(d.amount) as somme, count(*) as nombre, c.label, c.rowid "; @@ -76,9 +76,9 @@ if ($result) print ''; print ""; - print ''; - print '"; - print '"; + print ''; + print '"; + print '"; print ""; $i++; $total += abs($objp->somme); @@ -87,8 +87,8 @@ if ($result) $db->free($result); print ''; - print ''; - print ''; + print ''; + print ''; } else { From 7c086ba8ed6d924ceeb01bdc8386de48be0d3007 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 24 Jan 2019 10:02:06 +0100 Subject: [PATCH 2/4] update with html5 compliant code --- htdocs/compta/bank/graph.php | 6 +++--- htdocs/compta/bank/list.php | 2 +- htdocs/compta/bank/releve.php | 14 +++++++------- htdocs/compta/bank/treso.php | 24 ++++++++++++------------ 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index 958ff129a06..a94460b9f0d 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -804,7 +804,7 @@ dol_fiche_end(); print '
'.$langs->trans("Rubrique").''.$langs->trans("Nb").''.$langs->trans("Total").''.$langs->trans("Average").''.$langs->trans("Nb").''.$langs->trans("Total").''.$langs->trans("Average").'
rowid\">$objp->label'.$objp->nombre.''.price(abs($objp->somme))."'.price(abs(price2num($objp->somme / $objp->nombre,'MT')))."'.$objp->nombre.''.price(abs($objp->somme))."'.price(abs(price2num($objp->somme / $objp->nombre,'MT')))."
'.$langs->trans("Total").''.price($total).''.price($totalnb?price2num($total / $totalnb, 'MT'):0).'
'.price($total).''.price($totalnb?price2num($total / $totalnb, 'MT'):0).'
'; // Navigation links -print ''; + print ''; print ''; + print ''; print ''; else print ''; } - elseif ($totalarray['totalbalancefield'] == $i) print ''; + elseif ($totalarray['totalbalancefield'] == $i) print ''; else print ''; } print ''; diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index d355fcc4900..3d125248bb7 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -435,8 +435,8 @@ if (empty($numref)) print '
'.$morehtml.'     '; +print '
'.$morehtml.'     '; if ($mode == 'showalltime') { print ''; @@ -830,7 +830,7 @@ if ($mode == 'standard') // For month $link="".img_previous('', 'class="valignbottom"')." ".$langs->trans("Month")." ".img_next('', 'class="valignbottom"').""; - print '
'.$link.'
'.$link.'
'; $file = "movement".$account."-".$year.$month.".png"; @@ -844,7 +844,7 @@ if ($mode == 'standard') // For year $prevyear=$year-1;$nextyear=$year+1; $link="".img_previous('', 'class="valignbottom"')." ".$langs->trans("Year")." ".img_next('', 'class="valignbottom"').""; - print '
'.$link.'
'.$link.'
'; print $show5; diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php index cc93cfd61a1..4cb50e72431 100644 --- a/htdocs/compta/bank/list.php +++ b/htdocs/compta/bank/list.php @@ -591,7 +591,7 @@ if (isset($totalarray['totalbalancefield']) && $lastcurrencycode != 'various') / if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.price($totalarray['totalbalance'], 0, $langs, 0, 0, -1, $lastcurrencycode).''.price($totalarray['totalbalance'], 0, $langs, 0, 0, -1, $lastcurrencycode).'
'; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; print ''; @@ -480,7 +480,7 @@ if (empty($numref)) $balancestart[$objp->numr] = $obj->amount; $db->free($resql); } - print ''; + print ''; // Calculate end amount $sql = "SELECT sum(b.amount) as amount"; @@ -494,7 +494,7 @@ if (empty($numref)) $content[$objp->numr] = $obj->amount; $db->free($resql); } - print ''; + print ''; print ''; print ''; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; print "\n"; diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index bc9aa4e2c4c..7ad92a012b1 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -116,21 +116,21 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) print ''; if($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED )print ''; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; // Current balance print ''; - print ''; - print ''; + print ''; + print ''; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; @@ -293,9 +293,9 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) }else print ""; } print ""; - if ($obj->total_ttc < 0) { print ""; }; - if ($obj->total_ttc >= 0) { print ""; }; - print ''; + if ($obj->total_ttc < 0) { print ""; }; + if ($obj->total_ttc >= 0) { print ""; }; + print ''; print ""; } @@ -317,8 +317,8 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) // solde print ''; - print ''; - print ''; + print ''; + print ''; print ''; print "
'.$langs->trans("Ref").''.$langs->trans("InitialBankBalance").''.$langs->trans("EndBankBalance").''.$langs->trans("InitialBankBalance").''.$langs->trans("EndBankBalance").'
'.price($balancestart[$objp->numr],'',$langs,1,-1,-1,$conf->currency).''.price($balancestart[$objp->numr],'',$langs,1,-1,-1,$conf->currency).''.price(($balancestart[$objp->numr]+$content[$objp->numr]),'',$langs,1,-1,-1,$conf->currency).''.price(($balancestart[$objp->numr]+$content[$objp->numr]),'',$langs,1,-1,-1,$conf->currency).''; if ($user->rights->banque->consolidate && $action != 'editbankreceipt') { @@ -546,9 +546,9 @@ else print ''.$langs->trans("DateValueShort").''.$langs->trans("Type").''.$langs->trans("Description").''.$langs->trans("Debit").''.$langs->trans("Credit").''.$langs->trans("Balance").''.$langs->trans("Debit").''.$langs->trans("Credit").''.$langs->trans("Balance").' 
'.$langs->trans("Description").''.$langs->trans("Entity").''.$langs->trans("ThirdParty").''.$langs->trans("Debit").''.$langs->trans("Credit").''.$langs->trans("BankBalance").''.$langs->trans("Debit").''.$langs->trans("Credit").''.$langs->trans("BankBalance").'
'.$langs->trans("CurrentBalance").''.price($solde).''.$langs->trans("CurrentBalance").''.price($solde).'
'.$langs->trans("RemainderToPay").' '.$langs->trans("RemainderToPay").' 
".$refcomp."".price(abs($total_ttc))."  ".price($total_ttc)."'.price($solde).'".price(abs($total_ttc))."  ".price($total_ttc)."'.price($solde).'
'.$langs->trans("FutureBalance").' ('.$object->currency_code.')'.price($solde, 0, $langs, 0, 0, -1, $object->currency_code).''.$langs->trans("FutureBalance").' ('.$object->currency_code.')'.price($solde, 0, $langs, 0, 0, -1, $object->currency_code).'
"; From 0b353dc56033ece8d6b512005f5b1224849c7fd0 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 24 Jan 2019 16:43:28 +0100 Subject: [PATCH 3/4] update with html5 compliant code --- htdocs/compta/cashcontrol/cashcontrol_list.php | 2 +- htdocs/compta/cashcontrol/report.php | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php index e6358fcb5eb..5902d9ff8a7 100644 --- a/htdocs/compta/cashcontrol/cashcontrol_list.php +++ b/htdocs/compta/cashcontrol/cashcontrol_list.php @@ -516,7 +516,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/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php index 51f3c096f56..01c5aed49e7 100644 --- a/htdocs/compta/cashcontrol/report.php +++ b/htdocs/compta/cashcontrol/report.php @@ -172,7 +172,7 @@ if ($resql) { print ''; print ''.$langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").''; - print ''.price($cashcontrol->opening).''; + print ''.price($cashcontrol->opening).''; print ''; $first = "no"; }*/ @@ -180,7 +180,7 @@ if ($resql) print ''; // Ref - print ''; + print ''; $invoicetmp->fetch($objp->facid); print $invoicetmp->getNomUrl(1); print ''; @@ -188,13 +188,13 @@ if ($resql) // Date ope - print ''; + print ''; print ''.dol_print_date($db->jdate($objp->do),"day").""; print "\n"; if (! $i) $totalarray['nbfield']++; // Bank account - print ''; + print ''; print $bankaccount->getNomUrl(1); if ($conf->global->CASHDESK_ID_BANKACCOUNT_CASH==$bankaccount->id) $cash+=$objp->amount; elseif ($conf->global->CASHDESK_ID_BANKACCOUNT_CB==$bankaccount->id) $bank+=$objp->amount; @@ -204,7 +204,7 @@ if ($resql) if (! $i) $totalarray['nbfield']++; // Debit - print ''; + print ''; if ($objp->amount < 0) { print price($objp->amount * -1); @@ -215,7 +215,7 @@ if ($resql) if (! $i) $totalarray['totaldebfield']=$totalarray['nbfield']; // Credit - print ''; + print ''; if ($objp->amount > 0) { print price($objp->amount); @@ -243,8 +243,8 @@ if ($resql) if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; else print ''.$langs->trans("Totalforthispage").''; } - elseif ($totalarray['totaldebfield'] == $i) print ''.price(-1 * $totalarray['totaldeb']).''; - elseif ($totalarray['totalcredfield'] == $i) print ''.price($totalarray['totalcred']).''; + elseif ($totalarray['totaldebfield'] == $i) print ''.price(-1 * $totalarray['totaldeb']).''; + elseif ($totalarray['totalcredfield'] == $i) print ''.price($totalarray['totalcred']).''; else print ''; } print ''; From c1b0d3667a7b512fb76631e1d5901475c62e4657 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 24 Jan 2019 16:47:19 +0100 Subject: [PATCH 4/4] update with html5 compliant code --- htdocs/compta/charges/index.php | 28 +++++++++++------------ htdocs/compta/deplacement/index.php | 10 ++++---- htdocs/compta/deplacement/list.php | 4 ++-- htdocs/compta/deplacement/stats/index.php | 12 +++++----- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index c77805a4a73..66dc955aee7 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -185,7 +185,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) // Type print ''.$obj->lib.''; // Expected to pay - print ''.price($obj->total).''; + print ''.price($obj->total).''; // Ref payment $payment_sc_static->id=$obj->pid; $payment_sc_static->ref=$obj->pid; @@ -215,7 +215,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) print ''; } // Paid - print ''; + print ''; if ($obj->totalpaye) print price($obj->totalpaye); print ''; print ''; @@ -278,7 +278,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) print ''; print_liste_field_titre("PeriodEndDate",$_SERVER["PHP_SELF"],"pv.datev","",$param,'width="140px"',$sortfield,$sortorder); print_liste_field_titre("Label",$_SERVER["PHP_SELF"],"pv.label","",$param,'',$sortfield,$sortorder); - print_liste_field_titre("ExpectedToPay",$_SERVER["PHP_SELF"],"pv.amount","",$param,'align="right"',$sortfield,$sortorder); + print_liste_field_titre("ExpectedToPay",$_SERVER["PHP_SELF"],"pv.amount","",$param,'class="right"',$sortfield,$sortorder); print_liste_field_titre("RefPayment",$_SERVER["PHP_SELF"],"pv.rowid","",$param,'',$sortfield,$sortorder); print_liste_field_titre("DatePayment",$_SERVER["PHP_SELF"],"pv.datev","",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"pct.code","",$param,'',$sortfield,$sortorder); @@ -298,7 +298,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) print "".$obj->label."\n"; - print ''.price($obj->amount).""; + print ''.price($obj->amount).""; // Ref payment $tva_static->id=$obj->rowid; @@ -333,18 +333,18 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) } // Paid - print ''.price($obj->amount).""; + print ''.price($obj->amount).""; print "\n"; $i++; } print ''.$langs->trans("Total").''; - print ''.price($total).''; + print ''.price($total).''; print ' '; print ' '; print ' '; print ' '; - print ''.price($total).""; + print ''.price($total).""; print ""; print ""; @@ -413,7 +413,7 @@ while($j<$numlt) print_liste_field_titre("Label",$_SERVER["PHP_SELF"],"pv.label","",$param,'',$sortfield,$sortorder); print_liste_field_titre("RefPayment",$_SERVER["PHP_SELF"],"pv.rowid","",$param,'',$sortfield,$sortorder); print_liste_field_titre("DatePayment",$_SERVER["PHP_SELF"],"pv.datep","",$param,'align="center"',$sortfield,$sortorder); - print_liste_field_titre("PayedByThisPayment",$_SERVER["PHP_SELF"],"pv.amount","",$param,'align="right"',$sortfield,$sortorder); + print_liste_field_titre("PayedByThisPayment",$_SERVER["PHP_SELF"],"pv.amount","",$param,'class="right"',$sortfield,$sortorder); print "\n"; while ($i < $num) @@ -433,13 +433,13 @@ while($j<$numlt) print ''.$tva_static->getNomUrl(1)."\n"; print ''.dol_print_date($db->jdate($obj->dp),'day')."\n"; - print ''.price($obj->amount).""; + print ''.price($obj->amount).""; print "\n"; $i++; } - print ''.$langs->trans("Total").''; - print ''.price($total).""; + print ''.$langs->trans("Total").''; + print ''.price($total).""; print ""; print ""; @@ -496,7 +496,7 @@ if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read)) print_liste_field_titre("DatePayment",$_SERVER["PHP_SELF"],"s.datep","",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"pct.code","",$param,'',$sortfield,$sortorder); if (! empty($conf->banque->enabled)) print_liste_field_titre("Account",$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder); - print_liste_field_titre("PayedByThisPayment",$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder); + print_liste_field_titre("PayedByThisPayment",$_SERVER["PHP_SELF"],"s.amount","",$param,'class="right"',$sortfield,$sortorder); print "\n"; while ($i < $num) @@ -545,13 +545,13 @@ if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read)) } // Paid - print ''.price($obj->amount).""; + print ''.price($obj->amount).""; print "\n"; $i++; } print ''.$langs->trans("Total").''; - print ''.price($total).""; + print ''.price($total).""; print ""; print ""; diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index ef28a7909f9..26721ace101 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -127,7 +127,7 @@ if ($conf->use_javascript_ajax) print ''; print ''.$langs->trans("Total").''; -print ''.$totalnb.''; +print ''.$totalnb.''; print ''; print ''; @@ -163,8 +163,8 @@ if ($result) print ''; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; print ''; if ($num) @@ -184,8 +184,8 @@ if ($result) print ''; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; print ''; diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php index d6d599d7ece..ff3c256e33e 100644 --- a/htdocs/compta/deplacement/list.php +++ b/htdocs/compta/deplacement/list.php @@ -184,10 +184,10 @@ if ($resql) if ($obj->socid) print ''; else print ''; - print ''; + print ''; $tripandexpense_static->statut=$obj->fk_statut; - print ''; + print ''; print "\n"; $i++; diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php index 207e19fc265..e24dfdaac5f 100644 --- a/htdocs/compta/deplacement/stats/index.php +++ b/htdocs/compta/deplacement/stats/index.php @@ -274,16 +274,16 @@ foreach ($data as $val) $oldyear--; print ''; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; } print ''; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; $oldyear=$year; }
'.$langs->trans("BoxTitleLastModifiedExpenses",min($max,$num)).''.$langs->trans("FeesKilometersOrAmout").''.$langs->trans("DateModificationShort").''.$langs->trans("FeesKilometersOrAmout").''.$langs->trans("DateModificationShort").' 
'.$deplacementstatic->getNomUrl(1).''.$userstatic->getNomUrl(1).''.$obj->km.''.dol_print_date($db->jdate($obj->dm),'day').''.$obj->km.''.dol_print_date($db->jdate($obj->dm),'day').''.$deplacementstatic->LibStatut($obj->fk_statut,3).'
'.$soc->getNomUrl(1).' '.$obj->km.''.$obj->km.''.$tripandexpense_static->getLibStatut(5).''.$tripandexpense_static->getLibStatut(5).'
'.$oldyear.'000000
'.$year.''.$val['nb'].''.price(price2num($val['total'],'MT'),1).''.price(price2num($val['avg'],'MT'),1).''.$val['nb'].''.price(price2num($val['total'],'MT'),1).''.price(price2num($val['avg'],'MT'),1).'