From 7c8d84aa0318f088506bd8e9d873ff7bb3c542d0 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Mon, 4 Feb 2019 10:27:26 +0100 Subject: [PATCH 01/10] update with html5 compliant code --- htdocs/comm/mailing/list.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php index 9fe818d72ad..4e49b7bbbbd 100644 --- a/htdocs/comm/mailing/list.php +++ b/htdocs/comm/mailing/list.php @@ -193,7 +193,7 @@ if ($result) if (! $filteremail) print ' '; print ' '; print ' '; - print ''; + print ''; $searchpicto=$form->showFilterAndCheckAddButtons(0); print $searchpicto; print ''; @@ -206,8 +206,8 @@ if ($result) if (! $filteremail) print_liste_field_titre("NbOfEMails", $_SERVER["PHP_SELF"], "m.nbemail", $param, "", 'align="center"', $sortfield, $sortorder); if (! $filteremail) print_liste_field_titre("DateLastSend", $_SERVER["PHP_SELF"], "m.date_envoi", $param, "", 'align="center"', $sortfield, $sortorder); else print_liste_field_titre("DateSending", $_SERVER["PHP_SELF"], "mc.date_envoi", $param, "", 'align="center"', $sortfield, $sortorder); - print_liste_field_titre("Status", $_SERVER["PHP_SELF"], ($filteremail?"mc.statut":"m.statut"), $param, "", 'align="right"', $sortfield, $sortorder); - print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', 'align="right"', $sortfield, $sortorder, 'maxwidthsearch '); + print_liste_field_titre("Status", $_SERVER["PHP_SELF"], ($filteremail?"mc.statut":"m.statut"), $param, "", 'class="right"', $sortfield, $sortorder); + print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', 'class="right"', $sortfield, $sortorder, 'maxwidthsearch '); print "\n"; @@ -256,7 +256,7 @@ if ($result) print ''; // Status - print ''; + print ''; if ($filteremail) { print $email::libStatutDest($obj->sendstatut, 2); From eb25d12a1b0f38ed6568e0c131112d3b2a9fa18b Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Mon, 4 Feb 2019 10:32:33 +0100 Subject: [PATCH 02/10] update with html5 compliant code --- htdocs/comm/propal/index.php | 6 +++--- htdocs/comm/propal/list.php | 18 +++++++++--------- .../comm/propal/tpl/linkedobjectblock.tpl.php | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index fcea4ee05a6..2bc710394bb 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -430,7 +430,7 @@ if (! empty($conf->propal->enabled)) print ' '; print ''; - print ''; + print ''; $filename=dol_sanitizeFileName($obj->ref); $filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; @@ -503,7 +503,7 @@ if (! empty($conf->propal->enabled)) print ' '; print ''; - print ''; + print ''; $filename=dol_sanitizeFileName($obj->ref); $filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; @@ -514,7 +514,7 @@ if (! empty($conf->propal->enabled)) print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.''; - 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 64c126d7e8f..67c347a97d5 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -619,21 +619,21 @@ if ($resql) if (! empty($arrayfields['p.total_ht']['checked'])) { // Amount - print ''; + print ''; print ''; print ''; } if (! empty($arrayfields['p.total_vat']['checked'])) { // Amount - print ''; + print ''; print ''; print ''; } if (! empty($arrayfields['p.total_ttc']['checked'])) { // Amount - print ''; + print ''; print ''; print ''; } @@ -670,7 +670,7 @@ if ($resql) // Status if (! empty($arrayfields['p.fk_statut']['checked'])) { - print ''; + print ''; $formpropal->selectProposalStatus($viewstatut, 1, 0, 1, 'customer', 'search_statut'); print ''; } @@ -698,9 +698,9 @@ if ($resql) if (! empty($arrayfields['p.fin_validite']['checked'])) print_liste_field_titre($arrayfields['p.fin_validite']['label'], $_SERVER["PHP_SELF"], 'dfv', '', $param, 'align="center"', $sortfield, $sortorder); if (! empty($arrayfields['p.date_livraison']['checked'])) print_liste_field_titre($arrayfields['p.date_livraison']['label'], $_SERVER["PHP_SELF"], 'ddelivery', '', $param, 'align="center"', $sortfield, $sortorder); if (! empty($arrayfields['ava.rowid']['checked'])) print_liste_field_titre($arrayfields['ava.rowid']['label'], $_SERVER["PHP_SELF"], 'availability', '', $param, '', $sortfield, $sortorder); - if (! empty($arrayfields['p.total_ht']['checked'])) print_liste_field_titre($arrayfields['p.total_ht']['label'], $_SERVER["PHP_SELF"], 'p.total_ht', '', $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['p.total_vat']['checked'])) print_liste_field_titre($arrayfields['p.total_vat']['label'], $_SERVER["PHP_SELF"], 'p.tva', '', $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['p.total_ttc']['checked'])) print_liste_field_titre($arrayfields['p.total_ttc']['label'], $_SERVER["PHP_SELF"], 'p.total', '', $param, 'align="right"', $sortfield, $sortorder); + if (! empty($arrayfields['p.total_ht']['checked'])) print_liste_field_titre($arrayfields['p.total_ht']['label'], $_SERVER["PHP_SELF"], 'p.total_ht', '', $param, 'class="right"', $sortfield, $sortorder); + if (! empty($arrayfields['p.total_vat']['checked'])) print_liste_field_titre($arrayfields['p.total_vat']['label'], $_SERVER["PHP_SELF"], 'p.tva', '', $param, 'class="right"', $sortfield, $sortorder); + if (! empty($arrayfields['p.total_ttc']['checked'])) print_liste_field_titre($arrayfields['p.total_ttc']['label'], $_SERVER["PHP_SELF"], 'p.total', '', $param, 'class="right"', $sortfield, $sortorder); if (! empty($arrayfields['u.login']['checked'])) print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder); if (! empty($arrayfields['sale_representative']['checked'])) print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "", "", "$param", '', $sortfield, $sortorder); // Extra fields @@ -711,7 +711,7 @@ if ($resql) print $hookmanager->resPrint; if (! empty($arrayfields['p.datec']['checked'])) print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); if (! empty($arrayfields['p.tms']['checked'])) print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); - if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, 'align="right"', $sortfield, $sortorder); + if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, 'class="right"', $sortfield, $sortorder); print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch '); print ''."\n"; @@ -753,7 +753,7 @@ if ($resql) print ''; } // Other picto tool - 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; diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php index fc06819786a..494bb239c87 100644 --- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php +++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php @@ -64,13 +64,13 @@ foreach($linkedObjectBlock as $key => $objectlink) getNomUrl(1); ?> ref_client; ?> date, 'day'); ?> - rights->propale->lire) { $total = $total + $objectlink->total_ht; echo price($objectlink->total_ht); } ?> - getLibStatut(3); ?> - ">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?> + getLibStatut(3); ?> + ">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?> Date: Mon, 4 Feb 2019 10:35:53 +0100 Subject: [PATCH 03/10] update with html5 compliant code --- htdocs/comm/card.php | 10 +++++----- htdocs/comm/prospect/index.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index fd65422cdcc..79f53316e2e 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -876,7 +876,7 @@ if ($object->id > 0) print '!!!'; } - print '' . $sendingstatic->LibStatut($objp->statut, 5) . ''; + print '' . $sendingstatic->LibStatut($objp->statut, 5) . ''; print "\n"; $i++; } @@ -942,7 +942,7 @@ if ($object->id > 0) print ''.dol_print_date($db->jdate($objp->dc), 'day')."\n"; print ''.dol_print_date($db->jdate($objp->dcon), 'day')."\n"; print ' '; - print ''; + print ''; print $contrat->getLibStatut(4); print "\n"; print ''; @@ -1004,7 +1004,7 @@ if ($object->id > 0) print ''.img_object($langs->trans("ShowPropal"), "propal").' '.$objp->ref.''."\n"; //print ''.dol_print_date($db->jdate($objp->startdate)).''."\n"; print ''.convertSecondToTime($objp->duration).''."\n"; - print ''.$fichinter_static->getLibStatut(5).''."\n"; + print ''.$fichinter_static->getLibStatut(5).''."\n"; print ''; $i++; @@ -1110,7 +1110,7 @@ if ($object->id > 0) print ''; } - print ''; + print ''; print $langs->trans('FrequencyPer_'.$invoicetemplate->unit_frequency, $invoicetemplate->frequency).' - '; print ($invoicetemplate->LibStatut($invoicetemplate->frequency, $invoicetemplate->suspended, 5, 0)); print ''; @@ -1205,7 +1205,7 @@ if ($object->id > 0) print ''; } - print ''.($facturestatic->LibStatut($objp->paye, $objp->statut, 5, $objp->am)).''; + print ''.($facturestatic->LibStatut($objp->paye, $objp->statut, 5, $objp->am)).''; print "\n"; $i++; } diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index 7c8c0fa0934..e110dc05b1d 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -220,7 +220,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire) } if ($total>0) { - print ''.$langs->trans("Total")."".price($total).""; + print ''.$langs->trans("Total")."".price($total).""; } print "
"; } From 577aef54e13b5da10fb7e6e09c5e2882e804c8f5 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Mon, 4 Feb 2019 10:37:51 +0100 Subject: [PATCH 04/10] update with html5 compliant code --- htdocs/comm/contact.php | 2 +- htdocs/comm/index.php | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index e9f0a135819..68730bccef1 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -142,7 +142,7 @@ if ($resql) print ''; print ''; print ' '; - print ''; + print ''; print "\n"; $i = 0; diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index f64e1328e5c..e6fc5e95010 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -186,7 +186,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) $companystatic->canvas=$obj->canvas; print $companystatic->getNomUrl(1, 'customer', 16); print ''; - print ''.price($obj->total_ht).''; + print ''.price($obj->total_ht).''; $i++; $total += $obj->total_ht; } @@ -266,7 +266,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos $companystatic->canvas=$obj->canvas; print $companystatic->getNomUrl(1, 'supplier', 16); print ''; - print ''.price($obj->total_ht).''; + print ''.price($obj->total_ht).''; $i++; $total += $obj->total_ht; } @@ -345,10 +345,10 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire) print $companystatic->getNomUrl(1, 'customer', 16); print ''; if(! empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) { - print ''.price($obj->total_ht).''; + print ''.price($obj->total_ht).''; } else { - print ''.price($obj->total_ttc).''; + print ''.price($obj->total_ttc).''; } $i++; $total += $obj->total_ttc; @@ -432,10 +432,10 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande print $companystatic->getNomUrl(1, 'supplier', 16); print ''; if(! empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) { - print ''.price($obj->total_ht).''; + print ''.price($obj->total_ht).''; } else { - print ''.price($obj->total_ttc).''; + print ''.price($obj->total_ttc).''; } $i++; $total += $obj->total_ttc; From 71e99e0972afd8be7ca392a6fe6dea16e50d3450 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Mon, 4 Feb 2019 10:42:40 +0100 Subject: [PATCH 05/10] update with html5 compliant code --- htdocs/commande/customer.php | 4 ++-- htdocs/commande/list.php | 18 +++++++++--------- htdocs/commande/orderstoinvoice.php | 10 +++++----- htdocs/commande/tpl/linkedobjectblock.tpl.php | 6 +++--- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php index 6e9604332f7..8b7fef878ed 100644 --- a/htdocs/commande/customer.php +++ b/htdocs/commande/customer.php @@ -130,7 +130,7 @@ if ($resql) print_liste_field_titre("Town", $_SERVER["PHP_SELF"], "s.town", "", "", 'valign="center"', $sortfield, $sortorder); print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", "", "", 'align="left"', $sortfield, $sortorder); print_liste_field_titre("AccountancyCode", $_SERVER["PHP_SELF"], "s.code_compta", "", "", 'align="left"', $sortfield, $sortorder); - print_liste_field_titre("DateCreation", $_SERVER["PHP_SELF"], "datec", $addu, "", 'align="right"', $sortfield, $sortorder); + print_liste_field_titre("DateCreation", $_SERVER["PHP_SELF"], "datec", $addu, "", 'class="right"', $sortfield, $sortorder); print "\n"; // Lignes des champs de filtre @@ -149,7 +149,7 @@ if ($resql) print ''; print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 99e082d46ec..ff8940854e7 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -652,21 +652,21 @@ if ($resql) if (! empty($arrayfields['c.total_ht']['checked'])) { // Amount - print ''; + print ''; print ''; print ''; } if (! empty($arrayfields['c.total_vat']['checked'])) { // Amount - print ''; + print ''; print ''; print ''; } if (! empty($arrayfields['c.total_ttc']['checked'])) { // Amount - print ''; + print ''; print ''; print ''; } @@ -691,7 +691,7 @@ if ($resql) // Status if (! empty($arrayfields['c.fk_statut']['checked'])) { - print ''; + print ''; $liststatus=array( Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"), Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"), @@ -731,9 +731,9 @@ if ($resql) if (! empty($arrayfields['typent.code']['checked'])) print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'align="center"', $sortfield, $sortorder); if (! empty($arrayfields['c.date_commande']['checked'])) print_liste_field_titre($arrayfields['c.date_commande']['label'], $_SERVER["PHP_SELF"], 'c.date_commande', '', $param, 'align="center"', $sortfield, $sortorder); if (! empty($arrayfields['c.date_delivery']['checked'])) print_liste_field_titre($arrayfields['c.date_delivery']['label'], $_SERVER["PHP_SELF"], 'c.date_livraison', '', $param, 'align="center"', $sortfield, $sortorder); - if (! empty($arrayfields['c.total_ht']['checked'])) print_liste_field_titre($arrayfields['c.total_ht']['label'], $_SERVER["PHP_SELF"], 'c.total_ht', '', $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['c.total_vat']['checked'])) print_liste_field_titre($arrayfields['c.total_vat']['label'], $_SERVER["PHP_SELF"], 'c.tva', '', $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['c.total_ttc']['checked'])) print_liste_field_titre($arrayfields['c.total_ttc']['label'], $_SERVER["PHP_SELF"], 'c.total_ttc', '', $param, 'align="right"', $sortfield, $sortorder); + if (! empty($arrayfields['c.total_ht']['checked'])) print_liste_field_titre($arrayfields['c.total_ht']['label'], $_SERVER["PHP_SELF"], 'c.total_ht', '', $param, 'class="right"', $sortfield, $sortorder); + if (! empty($arrayfields['c.total_vat']['checked'])) print_liste_field_titre($arrayfields['c.total_vat']['label'], $_SERVER["PHP_SELF"], 'c.tva', '', $param, 'class="right"', $sortfield, $sortorder); + if (! empty($arrayfields['c.total_ttc']['checked'])) print_liste_field_titre($arrayfields['c.total_ttc']['label'], $_SERVER["PHP_SELF"], 'c.total_ttc', '', $param, 'class="right"', $sortfield, $sortorder); // Extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; // Hook fields @@ -742,7 +742,7 @@ if ($resql) print $hookmanager->resPrint; if (! empty($arrayfields['c.datec']['checked'])) print_liste_field_titre($arrayfields['c.datec']['label'], $_SERVER["PHP_SELF"], "c.date_creation", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); if (! empty($arrayfields['c.tms']['checked'])) print_liste_field_titre($arrayfields['c.tms']['label'], $_SERVER["PHP_SELF"], "c.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); - if (! empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, 'align="right"', $sortfield, $sortorder); + if (! empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, 'class="right"', $sortfield, $sortorder); if (! empty($arrayfields['c.facture']['checked'])) print_liste_field_titre($arrayfields['c.facture']['label'], $_SERVER["PHP_SELF"], 'c.facture', '', $param, 'align="center"', $sortfield, $sortorder, ''); print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, 'align="center"', $sortfield, $sortorder, 'maxwidthsearch '); print ''."\n"; @@ -914,7 +914,7 @@ if ($resql) } print ''; - print ''; + print ''; $filename=dol_sanitizeFileName($obj->ref); $filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index 4e986304828..9c6d83e3dfe 100644 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -610,7 +610,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error) print_liste_field_titre('RefCustomerOrder', $_SERVER["PHP_SELF"], 'c.ref_client', '', '&socid='.$socid, '', $sortfield, $sortorder); print_liste_field_titre('OrderDate', $_SERVER["PHP_SELF"], 'c.date_commande', '', '&socid='.$socid, 'align="center"', $sortfield, $sortorder); print_liste_field_titre('DeliveryDate', $_SERVER["PHP_SELF"], 'c.date_livraison', '', '&socid='.$socid, 'align="center"', $sortfield, $sortorder); - print_liste_field_titre('Status', '', '', '', '', 'align="right"'); + print_liste_field_titre('Status', '', '', '', '', 'class="right"'); print_liste_field_titre('GenerateBill', '', '', '', '', 'align="center"'); print ''; @@ -638,7 +638,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error) print ''; //SEARCH BUTTON - print ''; + print ''; print ''; print ''; @@ -678,7 +678,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error) } print ''; - print ''; + print ''; $filename=dol_sanitizeFileName($objp->ref); $filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($objp->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$objp->rowid; @@ -699,7 +699,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error) print ''; // Statut - print ''.$generic_commande->LibStatut($objp->fk_statut, $objp->billed, 5).''; + print ''.$generic_commande->LibStatut($objp->fk_statut, $objp->billed, 5).''; // Checkbox print ''; @@ -718,7 +718,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error) * Boutons actions */ print '
global->INVOICE_CLOSE_ORDERS_OFF_BY_DEFAULT_FORMASSINVOICE)?' checked="checked"':'').' name="autocloseorders"> '.$langs->trans("CloseProcessedOrdersAutomatically"); - print '
'; + print '
'; print ''; print ''; print '
'; diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php index 5b2dbc890ca..cce17b32695 100644 --- a/htdocs/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php @@ -54,13 +54,13 @@ foreach($linkedObjectBlock as $key => $objectlink) getNomUrl(1); ?> ref_client; ?> date, 'day'); ?> - rights->commande->lire) { $total = $total + $objectlink->total_ht; echo price($objectlink->total_ht); } ?> - getLibStatut(3); ?> - + getLibStatut(3); ?> + element != 'shipping') { From b7605e233ee9c16aa66345b3149187cd3f4175b5 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Mon, 4 Feb 2019 13:40:00 +0100 Subject: [PATCH 06/10] update with html5 compliant code --- htdocs/compta/bank/annuel.php | 6 +++--- htdocs/compta/bank/various_payment/list.php | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index 197bbbc0c35..98085b34778 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -209,7 +209,7 @@ for ($mois = 1 ; $mois < 13 ; $mois++) { $case = sprintf("%04s-%02s", $annee, $mois); - print ' '; + print ' '; if ($decaiss[$case]>0) { print price($decaiss[$case]); @@ -217,7 +217,7 @@ for ($mois = 1 ; $mois < 13 ; $mois++) } print ""; - print ' '; + print ' '; if ($encaiss[$case]>0) { print price($encaiss[$case]); @@ -266,7 +266,7 @@ else { print ''; print '"; -print ''; +print ''; print "\n"; print "
'.$langs->trans("CurrentBalance")."'.price($balance).''.price($balance).'
"; diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php index 4437a9cfd2d..2d81facbad2 100644 --- a/htdocs/compta/bank/various_payment/list.php +++ b/htdocs/compta/bank/various_payment/list.php @@ -218,12 +218,12 @@ if ($result) } // Debit - print ''; + print ''; // Credit - print ''; + print ''; - print ''; + print ''; $searchpicto=$form->showFilterAndCheckAddButtons(0); print $searchpicto; print ''; @@ -238,8 +238,8 @@ if ($result) print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "type", "", $param, 'align="left"', $sortfield, $sortorder); if (! empty($conf->banque->enabled)) print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder); if (! empty($conf->accounting->enabled)) print_liste_field_titre("AccountAccounting", $_SERVER["PHP_SELF"], "v.accountancy_code", "", $param, 'align="left"', $sortfield, $sortorder); - print_liste_field_titre("Debit", $_SERVER["PHP_SELF"], "v.amount", "", $param, 'align="right"', $sortfield, $sortorder); - print_liste_field_titre("Credit", $_SERVER["PHP_SELF"], "v.amount", "", $param, 'align="right"', $sortfield, $sortorder); + print_liste_field_titre("Debit", $_SERVER["PHP_SELF"], "v.amount", "", $param, 'class="right"', $sortfield, $sortorder); + print_liste_field_titre("Credit", $_SERVER["PHP_SELF"], "v.amount", "", $param, 'class="right"', $sortfield, $sortorder); print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch '); print "\n"; @@ -328,8 +328,8 @@ if ($result) print ''; print ''.$langs->trans("Total").''; - print ''.price($totalarray['totaldeb']).""; - print ''.price($totalarray['totalcred']).""; + print ''.price($totalarray['totaldeb']).""; + print ''.price($totalarray['totalcred']).""; print ''; print ''; From 386a4102b71a7316902bca6dfed36b0c03b69cf6 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Mon, 4 Feb 2019 13:44:02 +0100 Subject: [PATCH 07/10] update with html5 compliant code --- htdocs/compta/bank/bankentries_list.php | 28 ++++++++++++------------- htdocs/compta/bank/list.php | 4 ++-- htdocs/compta/bank/releve.php | 8 +++---- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index 2b599b1e60d..edd0f35c442 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -666,10 +666,10 @@ if ($resql) print ''.$langs->trans("Numero").''; //if (! $search_account > 0) //{ - print ''.$langs->trans("BankAccount").''; + print ''.$langs->trans("BankAccount").''; //} - print ''.$langs->trans("Debit").''; - print ''.$langs->trans("Credit").''; + print ''.$langs->trans("Debit").''; + print ''.$langs->trans("Credit").''; /*if (! empty($conf->accounting->enabled)) { print ''; @@ -700,7 +700,7 @@ if ($resql) print ''; //if (! $search_account > 0) //{ - print ''; + print ''; $form->select_comptes(GETPOST('add_account', 'int')?GETPOST('add_account', 'int'):$search_account, 'add_account', 0, '', 1, ($id > 0 || ! empty($ref)?' disabled="disabled"':'')); print ''; //} @@ -955,11 +955,11 @@ if ($resql) if (! empty($arrayfields['type']['checked'])) print_liste_field_titre($arrayfields['type']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="center"', $sortfield, $sortorder); if (! empty($arrayfields['b.num_chq']['checked'])) print_liste_field_titre($arrayfields['b.num_chq']['label'], $_SERVER['PHP_SELF'], 'b.num_chq', '', $param, 'align="center"', $sortfield, $sortorder); if (! empty($arrayfields['bu.label']['checked'])) print_liste_field_titre($arrayfields['bu.label']['label'], $_SERVER['PHP_SELF'], 'bu.label', '', $param, '', $sortfield, $sortorder); - if (! empty($arrayfields['ba.ref']['checked'])) print_liste_field_titre($arrayfields['ba.ref']['label'], $_SERVER['PHP_SELF'], 'ba.ref', '', $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['b.debit']['checked'])) print_liste_field_titre($arrayfields['b.debit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['b.credit']['checked'])) print_liste_field_titre($arrayfields['b.credit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['balancebefore']['checked'])) print_liste_field_titre($arrayfields['balancebefore']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['balance']['checked'])) print_liste_field_titre($arrayfields['balance']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder); + if (! empty($arrayfields['ba.ref']['checked'])) print_liste_field_titre($arrayfields['ba.ref']['label'], $_SERVER['PHP_SELF'], 'ba.ref', '', $param, 'class="right"', $sortfield, $sortorder); + if (! empty($arrayfields['b.debit']['checked'])) print_liste_field_titre($arrayfields['b.debit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, 'class="right"', $sortfield, $sortorder); + if (! empty($arrayfields['b.credit']['checked'])) print_liste_field_titre($arrayfields['b.credit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, 'class="right"', $sortfield, $sortorder); + if (! empty($arrayfields['balancebefore']['checked'])) print_liste_field_titre($arrayfields['balancebefore']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder); + if (! empty($arrayfields['balance']['checked'])) print_liste_field_titre($arrayfields['balance']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder); if (! empty($arrayfields['b.num_releve']['checked'])) print_liste_field_titre($arrayfields['b.num_releve']['label'], $_SERVER['PHP_SELF'], 'b.num_releve', '', $param, 'align="center"', $sortfield, $sortorder); if (! empty($arrayfields['b.conciliated']['checked'])) print_liste_field_titre($arrayfields['b.conciliated']['label'], $_SERVER['PHP_SELF'], 'b.rappro', '', $param, 'align="center"', $sortfield, $sortorder); // Extra fields @@ -968,7 +968,7 @@ if ($resql) $parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder); $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; - print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', 'align="right"', $sortfield, $sortorder, 'maxwidthsearch '); + print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', 'class="right"', $sortfield, $sortorder, 'maxwidthsearch '); print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch '); print "\n"; @@ -1355,7 +1355,7 @@ if ($resql) // Debit if (! empty($arrayfields['b.debit']['checked'])) { - print ''; + print ''; if ($objp->amount < 0) { print price($objp->amount * -1); @@ -1396,7 +1396,7 @@ if ($resql) } else { - print '-'; + print '-'; } if (! $i) $totalarray['nbfield']++; } @@ -1411,12 +1411,12 @@ if ($resql) } else { - print ' '.price($balance).''; + print ' '.price($balance).''; } } else { - print '-'; + print '-'; } if (! $i) $totalarray['nbfield']++; } diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php index 0333bfa52ed..6aac94532df 100644 --- a/htdocs/compta/bank/list.php +++ b/htdocs/compta/bank/list.php @@ -394,7 +394,7 @@ print $hookmanager->resPrint; if (! empty($arrayfields['b.datec']['checked'])) print_liste_field_titre($arrayfields['b.datec']['label'], $_SERVER["PHP_SELF"], "b.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); if (! empty($arrayfields['b.tms']['checked'])) print_liste_field_titre($arrayfields['b.tms']['label'], $_SERVER["PHP_SELF"], "b.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); if (! empty($arrayfields['b.clos']['checked'])) print_liste_field_titre($arrayfields['b.clos']['label'], $_SERVER["PHP_SELF"], 'b.clos', '', $param, 'align="center"', $sortfield, $sortorder); -if (! empty($arrayfields['balance']['checked'])) print_liste_field_titre($arrayfields['balance']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'align="right"', $sortfield, $sortorder); +if (! empty($arrayfields['balance']['checked'])) print_liste_field_titre($arrayfields['balance']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder); print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch '); print "\n"; @@ -550,7 +550,7 @@ foreach ($accounts as $key=>$type) // Balance if (! empty($arrayfields['balance']['checked'])) { - print ''; + print ''; print ''.price($solde, 0, $langs, 0, -1, -1, $obj->currency_code).''; print ''; if (! $i) $totalarray['nbfield']++; diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 140df3be2fd..6c6a8447c5a 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -766,15 +766,15 @@ else if ($objp->amount < 0) { $totald = $totald + abs($objp->amount); - print ''.price($objp->amount * -1)." \n"; + print ''.price($objp->amount * -1)." \n"; } else { $totalc = $totalc + abs($objp->amount); - print ' '.price($objp->amount)."\n"; + print ' '.price($objp->amount)."\n"; } - print ''.price(price2num($total, 'MT'))."\n"; + print ''.price(price2num($total, 'MT'))."\n"; if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { @@ -793,7 +793,7 @@ else } // Line Total - print "\n".''.$langs->trans("Total")." :".price($totald)."".price($totalc)."  "; + print "\n".''.$langs->trans("Total")." :".price($totald)."".price($totalc)."  "; // Line Balance print "\n"; From 28a2135409c800a83c76bf5e67fd52b3503e98fc Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Mon, 4 Feb 2019 13:45:50 +0100 Subject: [PATCH 08/10] update with html5 compliant code --- htdocs/compta/cashcontrol/cashcontrol_list.php | 2 +- htdocs/compta/cashcontrol/report.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php index 2db889e505d..89b66531eec 100644 --- a/htdocs/compta/cashcontrol/cashcontrol_list.php +++ b/htdocs/compta/cashcontrol/cashcontrol_list.php @@ -401,7 +401,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 ''; diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php index 348c9bab450..736090bd07b 100644 --- a/htdocs/compta/cashcontrol/report.php +++ b/htdocs/compta/cashcontrol/report.php @@ -139,10 +139,10 @@ if ($resql) // Fields title print ''; print_liste_field_titre($arrayfields['b.rowid']['label'], $_SERVER['PHP_SELF'], 'b.rowid', '', $param, '', $sortfield, $sortorder); - print_liste_field_titre($arrayfields['b.dateo']['label'], $_SERVER['PHP_SELF'], 'b.dateo', '', $param, 'align="left"', $sortfield, $sortorder); - print_liste_field_titre($arrayfields['ba.ref']['label'], $_SERVER['PHP_SELF'], 'ba.ref', '', $param, 'align="right"', $sortfield, $sortorder); - print_liste_field_titre($arrayfields['b.debit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, 'align="right"', $sortfield, $sortorder); - print_liste_field_titre($arrayfields['b.credit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, 'align="right"', $sortfield, $sortorder); + print_liste_field_titre($arrayfields['b.dateo']['label'], $_SERVER['PHP_SELF'], 'b.dateo', '', $param, 'class="left"', $sortfield, $sortorder); + print_liste_field_titre($arrayfields['ba.ref']['label'], $_SERVER['PHP_SELF'], 'ba.ref', '', $param, 'class="right"', $sortfield, $sortorder); + print_liste_field_titre($arrayfields['b.debit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, 'class="right"', $sortfield, $sortorder); + print_liste_field_titre($arrayfields['b.credit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, 'class="right"', $sortfield, $sortorder); print "\n"; $posconciliatecol = 0; From a14332b2b0d767523517eec37894b037e9622a56 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Mon, 4 Feb 2019 13:51:39 +0100 Subject: [PATCH 09/10] update with html5 compliant code --- htdocs/compta/charges/index.php | 10 +++--- htdocs/compta/deplacement/card.php | 2 +- htdocs/compta/deplacement/list.php | 6 ++-- htdocs/compta/facture/stats/index.php | 36 +++++++++---------- .../facture/tpl/linkedobjectblock.tpl.php | 12 +++---- .../tpl/linkedobjectblockForRec.tpl.php | 12 +++---- 6 files changed, 39 insertions(+), 39 deletions(-) diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index e2381605306..8ff14a88f79 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -123,12 +123,12 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "cs.date_ech", "", $param, 'width="140px"', $sortfield, $sortorder); print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "c.libelle", "", $param, '', $sortfield, $sortorder); print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "cs.fk_type", "", $param, '', $sortfield, $sortorder); - print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "cs.amount", "", $param, 'align="right"', $sortfield, $sortorder); + print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "cs.amount", "", $param, 'class="right"', $sortfield, $sortorder); print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pc.rowid", "", $param, '', $sortfield, $sortorder); print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pc.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"], "pc.amount", "", $param, 'align="right"', $sortfield, $sortorder); + print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pc.amount", "", $param, 'class="right"', $sortfield, $sortorder); print "\n"; $sql = "SELECT c.id, c.libelle as lib,"; @@ -226,12 +226,12 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) $i++; } print ''.$langs->trans("Total").''; - print ''; // A total here has no sense + print ''; // A total here has no sense print ' '; print ' '; print ' '; if (! empty($conf->banque->enabled)) print ''; - print ''.price($totalpaye).""; + print ''.price($totalpaye).""; print ""; } else @@ -283,7 +283,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) 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); 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"], "pv.amount", "", $param, 'align="right"', $sortfield, $sortorder); + print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder); print "\n"; $var=1; while ($i < $num) diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php index 60eb007e26a..9602216b955 100644 --- a/htdocs/compta/deplacement/card.php +++ b/htdocs/compta/deplacement/card.php @@ -483,7 +483,7 @@ elseif ($id) print ''; if ($action != 'classify' && $user->rights->deplacement->creer) { - print 'id.'">'; + print 'id.'">'; print img_edit($langs->trans('SetProject'), 1); print ''; } diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php index 4fba1b25aee..9ad85788ca0 100644 --- a/htdocs/compta/deplacement/list.php +++ b/htdocs/compta/deplacement/list.php @@ -127,7 +127,7 @@ if ($resql) print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "d.dated", "", "&socid=$socid", 'align="center"', $sortfield, $sortorder); print_liste_field_titre("Person", $_SERVER["PHP_SELF"], "u.lastname", "", "&socid=$socid", '', $sortfield, $sortorder); print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", "&socid=$socid", '', $sortfield, $sortorder); - print_liste_field_titre("FeesKilometersOrAmout", $_SERVER["PHP_SELF"], "d.km", "", "&socid=$socid", 'align="right"', $sortfield, $sortorder); + print_liste_field_titre("FeesKilometersOrAmout", $_SERVER["PHP_SELF"], "d.km", "", "&socid=$socid", 'class="right"', $sortfield, $sortorder); print_liste_field_titre(''); print "\n"; @@ -150,10 +150,10 @@ if ($resql) print ''; print ''; print ''; - print ''; + print ''; // print ''; print ''; - print ''; + print ''; $searchpicto=$form->showFilterAndCheckAddButtons(0); print $searchpicto; print ''; diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php index 31dcac4f340..5d8fee98676 100644 --- a/htdocs/compta/facture/stats/index.php +++ b/htdocs/compta/facture/stats/index.php @@ -284,12 +284,12 @@ print '
'; print ''; print ''; print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; print ''; $oldyear=0; @@ -302,23 +302,23 @@ 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/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php index bc23384fe92..d184fb58966 100644 --- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php @@ -51,7 +51,7 @@ foreach($linkedObjectBlock as $key => $objectlink) - - - + + 1) - - - + + + $objectlink) - - - + + 1) - - - + + + Date: Mon, 4 Feb 2019 13:57:38 +0100 Subject: [PATCH 10/10] update with html5 compliant code --- htdocs/compta/facture/card.php | 146 ++++++++++++++++----------------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 45c557f68c9..47ad635977e 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -3735,7 +3735,7 @@ elseif ($id > 0 || ! empty($ref)) print $langs->trans('DateInvoice'); print ''; if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editinvoicedate' && ! empty($object->brouillon) && $usercancreate && empty($conf->global->FAC_FORCE_DATE_VALIDATION)) - print ''; + print ''; print '
'.$langs->trans("Year").''.$langs->trans("NumberOfBills").'%'.$langs->trans("AmountTotal").'%'.$langs->trans("AmountAverage").'%'.$langs->trans("NumberOfBills").'%'.$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']).'
getNomUrl(1); ?> ref_client; ?> date, 'day'); ?>rights->facture->lire) { $sign = 1; if ($object->type == Facture::TYPE_CREDIT_NOTE) $sign = -1; @@ -65,8 +65,8 @@ foreach($linkedObjectBlock as $key => $objectlink) echo ''.price($objectlink->total_ht).''; } } ?>getLibStatut(3); ?>">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?>getLibStatut(3); ?>">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?>
getNomUrl(1); ?> date_when, 'day'); ?>rights->facture->lire) { $total = $total + $objectlink->total_ht; echo price($objectlink->total_ht); } ?>getLibStatut(3); ?>">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?>getLibStatut(3); ?>">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?>
id . '">' . img_edit($langs->trans('SetDate'), 1) . 'id . '">' . img_edit($langs->trans('SetDate'), 1) . '
'; print ''; @@ -3759,7 +3759,7 @@ elseif ($id > 0 || ! empty($ref)) print ''; - print ''; + print ''; print '
'; print $langs->trans('DatePointOfTax'); print 'id . '">' . img_edit($langs->trans('SetDate'), 1) . 'id . '">' . img_edit($langs->trans('SetDate'), 1) . '
'; print ''; if ($action == 'editdate_pointoftax') { @@ -3776,7 +3776,7 @@ elseif ($id > 0 || ! empty($ref)) print $langs->trans('PaymentConditionsShort'); print ''; if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && $usercancreate) - print 'id . '">' . img_edit($langs->trans('SetConditions'), 1) . ''; + print 'id . '">' . img_edit($langs->trans('SetConditions'), 1) . ''; print ''; print ''; if ($object->type != Facture::TYPE_CREDIT_NOTE) @@ -3797,7 +3797,7 @@ elseif ($id > 0 || ! empty($ref)) print $langs->trans('DateMaxPayment'); print ''; if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && $usercancreate) - print 'id . '">' . img_edit($langs->trans('SetDate'), 1) . ''; + print 'id . '">' . img_edit($langs->trans('SetDate'), 1) . ''; print ''; print ''; if ($object->type != Facture::TYPE_CREDIT_NOTE) @@ -3821,7 +3821,7 @@ elseif ($id > 0 || ! empty($ref)) print $langs->trans('PaymentMode'); print ''; if ($action != 'editmode' && $usercancreate) - print 'id . '">' . img_edit($langs->trans('SetMode'), 1) . ''; + print 'id . '">' . img_edit($langs->trans('SetMode'), 1) . ''; print ''; print ''; if ($action == 'editmode') @@ -3844,7 +3844,7 @@ elseif ($id > 0 || ! empty($ref)) print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0); print ''; if ($usercancreate && $action != 'editmulticurrencycode' && ! empty($object->brouillon)) - print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ''; + print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ''; print ''; print ''; $htmlname = (($usercancreate && $action == 'editmulticurrencycode')?'multicurrency_code':'none'); @@ -3857,7 +3857,7 @@ elseif ($id > 0 || ! empty($ref)) print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0); print ''; if ($usercancreate && $action != 'editmulticurrencyrate' && ! empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) - print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ''; + print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ''; print ''; print ''; if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') { @@ -3882,7 +3882,7 @@ elseif ($id > 0 || ! empty($ref)) 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') @@ -3902,7 +3902,7 @@ elseif ($id > 0 || ! empty($ref)) print ''; print '
'; print $langs->trans('IncotermLabel'); - print ''; + print ''; if ($usercancreate) print ''.img_edit().''; else print ' '; print '
'; @@ -3979,7 +3979,7 @@ elseif ($id > 0 || ! empty($ref)) print ''; if ($action != 'editrevenuestamp' && ! empty($object->brouillon) && $usercancreate) { - print 'id . '">' . img_edit($langs->trans('SetRevenuStamp'), 1) . ''; + print 'id . '">' . img_edit($langs->trans('SetRevenuStamp'), 1) . ''; } print ''; print ''; @@ -4062,9 +4062,9 @@ elseif ($id > 0 || ! empty($ref)) print '' . $langs->trans('ListOfSituationInvoices') . ''; print ''; print '' . $langs->trans('Situation') . ''; - if (! empty($conf->banque->enabled)) print ''; - print '' . $langs->trans('AmountHT') . ''; - print '' . $langs->trans('AmountTTC') . ''; + if (! empty($conf->banque->enabled)) print ''; + print '' . $langs->trans('AmountHT') . ''; + print '' . $langs->trans('AmountTTC') . ''; print ' '; print ''; @@ -4085,10 +4085,10 @@ elseif ($id > 0 || ! empty($ref)) print '' . $prev_invoice->getNomUrl(1) . ''; print ''; print ''.(($prev_invoice->type == Facture::TYPE_CREDIT_NOTE)?$langs->trans('situationInvoiceShortcode_AS'):$langs->trans('situationInvoiceShortcode_S')) . $prev_invoice->situation_counter.''; - if (! empty($conf->banque->enabled)) print ''; - print '' . price($prev_invoice->total_ht) . ''; - print '' . price($prev_invoice->total_ttc) . ''; - print '' . $prev_invoice->getLibStatut(3, $totalpaye) . ''; + if (! empty($conf->banque->enabled)) print ''; + print '' . price($prev_invoice->total_ht) . ''; + print '' . price($prev_invoice->total_ttc) . ''; + print '' . $prev_invoice->getLibStatut(3, $totalpaye) . ''; print ''; } } @@ -4103,15 +4103,15 @@ elseif ($id > 0 || ! empty($ref)) print '' . $object->getNomUrl(1) . ''; print ''; print ''.(($object->type == Facture::TYPE_CREDIT_NOTE)?$langs->trans('situationInvoiceShortcode_AS'):$langs->trans('situationInvoiceShortcode_S')) . $object->situation_counter.''; - if (! empty($conf->banque->enabled)) print ''; - print '' . price($object->total_ht) . ''; - print '' . price($object->total_ttc) . ''; - print '' . $object->getLibStatut(3, $object->getSommePaiement()) . ''; + if (! empty($conf->banque->enabled)) print ''; + print '' . price($object->total_ht) . ''; + print '' . price($object->total_ttc) . ''; + print '' . $object->getLibStatut(3, $object->getSommePaiement()) . ''; print ''; print ''; - print '' . $langs->trans('CurrentSituationTotal') . ''; + print '' . $langs->trans('CurrentSituationTotal') . ''; print ''; $i =0; foreach ($current_situation_counter as $sit) @@ -4124,8 +4124,8 @@ elseif ($id > 0 || ! empty($ref)) } print ''; if (! empty($conf->banque->enabled)) print ''; - print '' . price($total_global_ht) . ''; - print '' . price($total_global_ttc) . ''; + print '' . price($total_global_ht) . ''; + print '' . price($total_global_ttc) . ''; print ' '; print ''; @@ -4136,9 +4136,9 @@ elseif ($id > 0 || ! empty($ref)) print '' . $langs->trans('ListOfNextSituationInvoices') . ''; print ''; print ''; - if (! empty($conf->banque->enabled)) print ''; - print '' . $langs->trans('AmountHT') . ''; - print '' . $langs->trans('AmountTTC') . ''; + if (! empty($conf->banque->enabled)) print ''; + print '' . $langs->trans('AmountHT') . ''; + print '' . $langs->trans('AmountTTC') . ''; print ' '; print '';*/ @@ -4153,10 +4153,10 @@ elseif ($id > 0 || ! empty($ref)) print '' . $next_invoice->getNomUrl(1) . ''; print ''; print ''.(($next_invoice->type == Facture::TYPE_CREDIT_NOTE)?$langs->trans('situationInvoiceShortcode_AS'):$langs->trans('situationInvoiceShortcode_S')) . $next_invoice->situation_counter.''; - if (! empty($conf->banque->enabled)) print ''; - print '' . price($next_invoice->total_ht) . ''; - print '' . price($next_invoice->total_ttc) . ''; - print '' . $next_invoice->getLibStatut(3, $totalpaye) . ''; + if (! empty($conf->banque->enabled)) print ''; + print '' . price($next_invoice->total_ht) . ''; + print '' . price($next_invoice->total_ttc) . ''; + print '' . $next_invoice->getLibStatut(3, $totalpaye) . ''; print ''; } @@ -4164,10 +4164,10 @@ elseif ($id > 0 || ! empty($ref)) $total_global_ttc += $total_next_ttc; print ''; - print ''; - if (! empty($conf->banque->enabled)) print ''; - print '' . price($total_global_ht) . ''; - print '' . price($total_global_ttc) . ''; + print ''; + if (! empty($conf->banque->enabled)) print ''; + print '' . price($total_global_ht) . ''; + print '' . price($total_global_ttc) . ''; print ' '; print ''; } @@ -4186,9 +4186,9 @@ elseif ($id > 0 || ! empty($ref)) print '' . $langs->trans('Date') . ''; print '' . $langs->trans('Type') . ''; if (! empty($conf->banque->enabled)) { - print '' . $langs->trans('BankAccount') . ''; + print '' . $langs->trans('BankAccount') . ''; } - print '' . $langs->trans('Amount') . ''; + print '' . $langs->trans('Amount') . ''; print ' '; print ''; @@ -4243,12 +4243,12 @@ elseif ($id > 0 || ! empty($ref)) $bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1); } - print ''; + print ''; if ($bankaccountstatic->id) print $bankaccountstatic->getNomUrl(1, 'transactions'); print ''; } - print '' . price($sign * $objp->amount) . ''; + print '' . price($sign * $objp->amount) . ''; print ''; if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $user->societe_id == 0) { @@ -4272,12 +4272,12 @@ elseif ($id > 0 || ! empty($ref)) if ($object->type != Facture::TYPE_CREDIT_NOTE) { // Total already paid - print ''; + print ''; if ($object->type != Facture::TYPE_DEPOSIT) print $langs->trans('AlreadyPaidNoCreditNotesNoDeposits'); else print $langs->trans('AlreadyPaid'); - print ' : 0)?' class="amountalreadypaid"':'').'>' . price($totalpaye) . ' '; + print ' : 0)?' class="amountalreadypaid"':'').'>' . price($totalpaye) . ' '; $resteapayeraffiche = $resteapayer; $cssforamountpaymentcomplete = 'amountpaymentcomplete'; @@ -4297,15 +4297,15 @@ elseif ($id > 0 || ! empty($ref)) while ($i < $num) { $obj = $db->fetch_object($resql); $invoice->fetch($obj->fk_facture_source); - print ''; + print ''; if ($invoice->type == Facture::TYPE_CREDIT_NOTE) print $langs->trans("CreditNote") . ' '; if ($invoice->type == Facture::TYPE_DEPOSIT) print $langs->trans("Deposit") . ' '; print $invoice->getNomUrl(0); print ' :'; - print '' . price($obj->amount_ttc) . ''; - print ''; + print '' . price($obj->amount_ttc) . ''; + print ''; print 'rowid . '">' . img_delete() . ''; print ''; $i ++; @@ -4320,51 +4320,51 @@ elseif ($id > 0 || ! empty($ref)) // Paye partiellement 'escompte' if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'discount_vat') { - print ''; + print ''; print $form->textwithpicto($langs->trans("Discount") . ':', $langs->trans("HelpEscompte"), - 1); - print '' . price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')) . ' '; + print '' . price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')) . ' '; $resteapayeraffiche = 0; $cssforamountpaymentcomplete = 'amountpaymentneutral'; } // Paye partiellement ou Abandon 'badcustomer' if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'badcustomer') { - print ''; + print ''; print $form->textwithpicto($langs->trans("Abandoned") . ':', $langs->trans("HelpAbandonBadCustomer"), - 1); - print '' . price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')) . ' '; + print '' . price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')) . ' '; // $resteapayeraffiche=0; $cssforamountpaymentcomplete = 'amountpaymentneutral'; } // Paye partiellement ou Abandon 'product_returned' if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'product_returned') { - print ''; + print ''; print $form->textwithpicto($langs->trans("ProductReturned") . ':', $langs->trans("HelpAbandonProductReturned"), - 1); - print '' . price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')) . ' '; + print '' . price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')) . ' '; $resteapayeraffiche = 0; $cssforamountpaymentcomplete = 'amountpaymentneutral'; } // Paye partiellement ou Abandon 'abandon' if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'abandon') { - print ''; + print ''; $text = $langs->trans("HelpAbandonOther"); if ($object->close_note) $text .= '

' . $langs->trans("Reason") . ':' . $object->close_note; print $form->textwithpicto($langs->trans("Abandoned") . ':', $text, - 1); - print '' . price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')) . ' '; + print '' . price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')) . ' '; $resteapayeraffiche = 0; $cssforamountpaymentcomplete = 'amountpaymentneutral'; } // Billed - print '' . $langs->trans("Billed") . ' :' . price($object->total_ttc) . ' '; + print '' . $langs->trans("Billed") . ' :' . price($object->total_ttc) . ' '; // Remainder to pay - print ''; + print ''; if ($resteapayeraffiche >= 0) print $langs->trans('RemainderToPay'); else print $langs->trans('ExcessReceived'); print ' :'; - print '' . price($resteapayeraffiche) . ''; + print '' . price($resteapayeraffiche) . ''; print ' '; } else // Credit note @@ -4372,26 +4372,26 @@ elseif ($id > 0 || ! empty($ref)) $cssforamountpaymentcomplete='amountpaymentneutral'; // Total already paid back - print ''; + print ''; print $langs->trans('AlreadyPaidBack'); - print ' :' . price($sign * $totalpaye) . ' '; + print ' :' . price($sign * $totalpaye) . ' '; // Billed - print '' . $langs->trans("Billed") . ' :' . price($sign * $object->total_ttc) . ' '; + print '' . $langs->trans("Billed") . ' :' . price($sign * $object->total_ttc) . ' '; // Remainder to pay back - print ''; + print ''; if ($resteapayeraffiche <= 0) print $langs->trans('RemainderToPayBack'); else print $langs->trans('ExcessPaid'); print ' :'; - print '' . price($sign * $resteapayeraffiche) . ''; + print '' . price($sign * $resteapayeraffiche) . ''; print ' '; // Sold credit note - // print ''.$langs->trans('TotalTTC').' :'; - // print ''.price($sign * + // print ''.$langs->trans('TotalTTC').' :'; + // print ''.price($sign * // $object->total_ttc).' '; } @@ -4444,20 +4444,20 @@ elseif ($id > 0 || ! empty($ref)) print ' '; } print '' . $langs->trans('ModifyAllLines') . ''; - print ' '; - print ' '; - if ($inputalsopricewithtax) print ' '; - print ' '; - print ' '; - print '' . $langs->trans('Progress') . ''; + print ' '; + print ' '; + if ($inputalsopricewithtax) print ' '; + print ' '; + print ' '; + print '' . $langs->trans('Progress') . ''; if (! empty($conf->margin->enabled) && empty($user->societe_id)) { - print ' '; + print ' '; if ((! empty($conf->global->DISPLAY_MARGIN_RATES) || ! empty($conf->global->DISPLAY_MARK_RATES)) && $usercanreadallmargin) { - print ' '; + print ' '; } } - print ' '; + print ' '; print ' '; print ' '; print ' '; @@ -4473,8 +4473,8 @@ elseif ($id > 0 || ! empty($ref)) print ' '; print ' '; print ' '; - print '%'; - print ''; + print '%'; + print ''; print ''; print '';