From 1b25d284a2ecb895778b6ae558bd8725122981b6 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sun, 10 Feb 2019 11:01:23 +0100 Subject: [PATCH] update with html5 compliant code --- htdocs/compta/paiement/card.php | 16 ++++++++-------- htdocs/compta/paiement/cheque/card.php | 14 +++++++------- htdocs/compta/paiement/cheque/index.php | 14 +++++++------- htdocs/compta/paiement/cheque/list.php | 16 ++++++++-------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php index e8fda32f820..4c0effee111 100644 --- a/htdocs/compta/paiement/card.php +++ b/htdocs/compta/paiement/card.php @@ -343,10 +343,10 @@ if ($resql) print ''.$langs->trans('Bill').''; print ''.$langs->trans('Company').''; if($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED )print ''.$langs->trans('Entity').''; - print ''.$langs->trans('ExpectedToPay').''; - print ''.$langs->trans('PayedByThisPayment').''; - print ''.$langs->trans('RemainderToPay').''; - print ''.$langs->trans('Status').''; + print ''.$langs->trans('ExpectedToPay').''; + print ''.$langs->trans('PayedByThisPayment').''; + print ''.$langs->trans('RemainderToPay').''; + print ''.$langs->trans('Status').''; print "\n"; if ($num > 0) @@ -386,16 +386,16 @@ if ($resql) print ''; } // Expected to pay - print ''.price($objp->total_ttc).''; + print ''.price($objp->total_ttc).''; // Amount payed - print ''.price($objp->amount).''; + print ''.price($objp->amount).''; // Remain to pay - print ''.price($remaintopay).''; + print ''.price($remaintopay).''; // Status - print ''.$invoice->getLibStatut(5, $alreadypayed).''; + print ''.$invoice->getLibStatut(5, $alreadypayed).''; print "\n"; if ($objp->paye == 1) // If at least one invoice is paid, disable delete diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php index e52a1135ba0..ee69d8d89f3 100644 --- a/htdocs/compta/paiement/cheque/card.php +++ b/htdocs/compta/paiement/cheque/card.php @@ -476,7 +476,7 @@ if ($action == 'new') print ''.$langs->trans("ChequeNumber")."\n"; print ''.$langs->trans("CheckTransmitter")."\n"; print ''.$langs->trans("Bank")."\n"; - print ''.$langs->trans("Amount")."\n"; + print ''.$langs->trans("Amount")."\n"; print ''.$langs->trans("Payment")."\n"; print ''.$langs->trans("LineRecord")."\n"; print ''.$langs->trans("Select")."
"; @@ -500,7 +500,7 @@ if ($action == 'new') print ''.$value["numero"]."\n"; print ''.$value["emetteur"]."\n"; print ''.$value["banque"]."\n"; - print ''.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).''; + print ''.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).''; // Link to payment print ''; @@ -576,7 +576,7 @@ else print ''; - if ($action != 'editdate') print ''; + if ($action != 'editdate') print ''; print '
'; print $langs->trans('Date'); print 'id.'">'.img_edit($langs->trans('SetDate'), 1).'id.'">'.img_edit($langs->trans('SetDate'), 1).'
'; print ''; if ($action == 'editdate') @@ -603,7 +603,7 @@ else print ''; - if ($action != 'editrefext') print ''; + if ($action != 'editrefext') print ''; print '
'; print $langs->trans('RefExt'); print 'id.'">'.img_edit($langs->trans('SetRefExt'),1).'id.'">'.img_edit($langs->trans('SetRefExt'),1).'
'; print ''; if ($action == 'editrefext') @@ -674,7 +674,7 @@ else print_liste_field_titre("Numero", $_SERVER["PHP_SELF"], "b.num_chq", "", $param, 'align="center"', $sortfield, $sortorder); print_liste_field_titre("CheckTransmitter", $_SERVER["PHP_SELF"], "b.emetteur", "", $param, "", $sortfield, $sortorder); print_liste_field_titre("Bank", $_SERVER["PHP_SELF"], "b.banque", "", $param, "", $sortfield, $sortorder); - print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "b.amount", "", $param, 'align="right"', $sortfield, $sortorder); + print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "b.amount", "", $param, 'class="right"', $sortfield, $sortorder); print_liste_field_titre("Payment", $_SERVER["PHP_SELF"], "p.rowid", "", $param, 'align="center"', $sortfield, $sortorder); print_liste_field_titre("LineRecord", $_SERVER["PHP_SELF"], "b.rowid", "", $param, 'align="center"', $sortfield, $sortorder); print_liste_field_titre(''); @@ -698,7 +698,7 @@ else print ''.($objp->num_chq?$objp->num_chq:' ').''; print ''.dol_trunc($objp->emetteur, 24).''; print ''.dol_trunc($objp->banque, 24).''; - print ''.price($objp->amount).''; + print ''.price($objp->amount).''; // Link to payment print ''; $paymentstatic->id=$objp->pid; @@ -725,7 +725,7 @@ else } print ''; // Action button - print ''; + print ''; if ($object->statut == 0) { print 'rowid.'">'.img_delete().''; diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index a9131c986bb..fb3606880ab 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -72,7 +72,7 @@ if ($resql) { } print ''; print ''.$langs->trans("BankChecksToReceipt").''; - print ''; + print ''; print ''.$num.''; print ''; print "\n"; @@ -106,9 +106,9 @@ if ($resql) print ''.$langs->trans("LastCheckReceiptShort", $max).''; print ''.$langs->trans("Date").""; print ''.$langs->trans("Account").''; - print ''.$langs->trans("NbOfCheques").''; - print ''.$langs->trans("Amount").''; - print ''.$langs->trans("Status").''; + print ''.$langs->trans("NbOfCheques").''; + print ''.$langs->trans("Amount").''; + print ''.$langs->trans("Status").''; print "\n"; while ( $objp = $db->fetch_object($resql) ) @@ -131,9 +131,9 @@ if ($resql) print ''.$checkdepositstatic->getNomUrl(1).''; print ''.dol_print_date($db->jdate($objp->db), 'day').''; print ''.$accountstatic->getNomUrl(1).''; - print ''.$objp->nbcheque.''; - print ''.price($objp->amount).''; - print ''.$checkdepositstatic->LibStatut($objp->statut, 3).''; + print ''.$objp->nbcheque.''; + print ''.price($objp->amount).''; + print ''.$checkdepositstatic->LibStatut($objp->statut, 3).''; print ''; } diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php index 1c0736e5cc9..6e86ecf14b6 100644 --- a/htdocs/compta/paiement/cheque/list.php +++ b/htdocs/compta/paiement/cheque/list.php @@ -173,11 +173,11 @@ if ($resql) $form->select_comptes($search_account, 'search_account', 0, '', 1); print ''; print ' '; - print ''; + print ''; print ''; print ''; print ''; - print ''; + print ''; $searchpicto=$form->showFilterAndCheckAddButtons(0); print $searchpicto; print ''; @@ -187,9 +187,9 @@ if ($resql) print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "bc.ref", "", $param, "", $sortfield, $sortorder); print_liste_field_titre("DateCreation", $_SERVER["PHP_SELF"], "dp", "", $param, 'align="center"', $sortfield, $sortorder); print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder); - print_liste_field_titre("NbOfCheques", $_SERVER["PHP_SELF"], "bc.nbcheque", "", $param, 'align="right"', $sortfield, $sortorder); - print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "bc.amount", "", $param, 'align="right"', $sortfield, $sortorder); - print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "bc.statut", "", $param, 'align="right"', $sortfield, $sortorder); + print_liste_field_titre("NbOfCheques", $_SERVER["PHP_SELF"], "bc.nbcheque", "", $param, 'class="right"', $sortfield, $sortorder); + print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "bc.amount", "", $param, 'class="right"', $sortfield, $sortorder); + print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "bc.statut", "", $param, 'class="right"', $sortfield, $sortorder); print_liste_field_titre(''); print "\n"; @@ -219,13 +219,13 @@ if ($resql) print ''; // Number of cheques - print ''.$objp->nbcheque.''; + print ''.$objp->nbcheque.''; // Amount - print ''.price($objp->amount).''; + print ''.price($objp->amount).''; // Statut - print ''; + print ''; print $checkdepositstatic->LibStatut($objp->statut, 5); print '';