From b69f63e7d7a6074c347e0ccd2bcabb97b9b95ca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 10 Mar 2019 09:32:19 +0100 Subject: [PATCH] replace html by html5 --- .../barcode/mod_barcode_product_standard.php | 4 +- htdocs/core/modules/bom/mod_bom_advanced.php | 4 +- .../cheque/mod_chequereceipt_thyme.php | 6 +- .../modules/commande/mod_commande_saphir.php | 4 +- .../modules/contract/mod_contract_magre.php | 4 +- .../expedition/mod_expedition_ribera.php | 4 +- .../expensereport/mod_expensereport_sand.php | 4 +- .../modules/facture/mod_facture_mercure.php | 10 ++-- .../modules/facture/mod_facture_terre.php | 59 +++++++++++-------- htdocs/holiday/card.php | 2 +- htdocs/holiday/define_holiday.php | 4 +- htdocs/holiday/list.php | 47 ++++++++------- htdocs/holiday/month_report.php | 30 +++++----- htdocs/holiday/view_log.php | 12 ++-- htdocs/hrm/admin/admin_establishment.php | 4 +- htdocs/hrm/index.php | 20 +++---- htdocs/ifttt/admin/index.php | 6 +- 17 files changed, 118 insertions(+), 106 deletions(-) diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php index f71a1c19b96..516df2ee6ef 100644 --- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php +++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php @@ -104,8 +104,8 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode // Mask parameter //$texte.= ''.$langs->trans("Mask").' ('.$langs->trans("BarCodeModel").'):'; $texte.= ''.$langs->trans("Mask").':'; - $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; - $texte.= '  '; + $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; + $texte.= '  '; $texte.= ''; $texte.= ''; diff --git a/htdocs/core/modules/bom/mod_bom_advanced.php b/htdocs/core/modules/bom/mod_bom_advanced.php index e37ce3d9840..f6492b3c78f 100644 --- a/htdocs/core/modules/bom/mod_bom_advanced.php +++ b/htdocs/core/modules/bom/mod_bom_advanced.php @@ -78,9 +78,9 @@ class mod_bom_advanced extends ModeleNumRefboms // Parametrage du prefix $texte.= ''.$langs->trans("Mask").':'; - $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; + $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; - $texte.= '  '; + $texte.= '  '; $texte.= ''; diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php index da1ec40620c..7ec2a775b96 100644 --- a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php +++ b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php @@ -72,9 +72,9 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts // Parametrage du prefix $texte.= ''.$langs->trans("Mask").':'; - $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; + $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; - $texte.= '  '; + $texte.= ' '; $texte.= ''; @@ -91,7 +91,7 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts */ public function getExample() { - global $conf,$langs,$mysoc; + global $conf,$langs,$mysoc; $old_code_client=$mysoc->code_client; $mysoc->code_client='CCCCCCCCCC'; diff --git a/htdocs/core/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php index 40ca0e2e222..fbe741ac2f8 100644 --- a/htdocs/core/modules/commande/mod_commande_saphir.php +++ b/htdocs/core/modules/commande/mod_commande_saphir.php @@ -78,9 +78,9 @@ class mod_commande_saphir extends ModeleNumRefCommandes // Parametrage du prefix $texte.= ''.$langs->trans("Mask").':'; - $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; + $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; - $texte.= '  '; + $texte.= '  '; $texte.= ''; diff --git a/htdocs/core/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php index 3dfa0533cbe..15062a3ddca 100644 --- a/htdocs/core/modules/contract/mod_contract_magre.php +++ b/htdocs/core/modules/contract/mod_contract_magre.php @@ -81,8 +81,8 @@ class mod_contract_magre extends ModelNumRefContracts $tooltip.=$langs->trans("GenericMaskCodes5"); $texte.= ''.$langs->trans("Mask").':'; - $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; - $texte.= '  '; + $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; + $texte.= '  '; $texte.= ''; $texte.= ''; $texte.= ''; diff --git a/htdocs/core/modules/expedition/mod_expedition_ribera.php b/htdocs/core/modules/expedition/mod_expedition_ribera.php index 7b20d1df4d8..539a5ad63b6 100644 --- a/htdocs/core/modules/expedition/mod_expedition_ribera.php +++ b/htdocs/core/modules/expedition/mod_expedition_ribera.php @@ -79,8 +79,8 @@ class mod_expedition_ribera extends ModelNumRefExpedition $tooltip.=$langs->trans("GenericMaskCodes5"); $texte.= ''.$langs->trans("Mask").':'; - $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; - $texte.= '  '; + $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; + $texte.= '  '; $texte.= ''; $texte.= ''; $texte.= ''; diff --git a/htdocs/core/modules/expensereport/mod_expensereport_sand.php b/htdocs/core/modules/expensereport/mod_expensereport_sand.php index 2311de4841a..e9d5a6e8e3a 100644 --- a/htdocs/core/modules/expensereport/mod_expensereport_sand.php +++ b/htdocs/core/modules/expensereport/mod_expensereport_sand.php @@ -82,9 +82,9 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport // Parametrage du prefix $texte.= ''.$langs->trans("Mask").':'; - $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; + $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; - $texte.= '  '; + $texte.= '  '; $texte.= ''; diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php index 2ef492660b2..b6f36f69e9d 100644 --- a/htdocs/core/modules/facture/mod_facture_mercure.php +++ b/htdocs/core/modules/facture/mod_facture_mercure.php @@ -76,25 +76,25 @@ class mod_facture_mercure extends ModeleNumRefFactures // Parametrage du prefix $texte.= ''.$langs->trans("Mask").' ('.$langs->trans("InvoiceStandard").'):'; - $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; + $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; - $texte.= '  '; + $texte.= '  '; $texte.= ''; // Parametrage du prefix des replacement $texte.= ''.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):'; - $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; + $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; $texte.= ''; // Parametrage du prefix des avoirs $texte.= ''.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):'; - $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; + $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; $texte.= ''; // Parametrage du prefix des acomptes $texte.= ''.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):'; - $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; + $texte.= ''.$form->textwithpicto('', $tooltip, 1, 1).''; $texte.= ''; $texte.= ''; diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php index 6e588aed098..c01fa9d2e09 100644 --- a/htdocs/core/modules/facture/mod_facture_terre.php +++ b/htdocs/core/modules/facture/mod_facture_terre.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2015 Regis Houssin +/* Copyright (C) 2005-2008 Laurent Destailleur + * Copyright (C) 2005-2015 Regis Houssin * * 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 @@ -18,33 +18,46 @@ */ /** - * \file htdocs/core/modules/facture/mod_facture_terre.php - * \ingroup facture - * \brief File containing class for numbering module Terre + * \file htdocs/core/modules/facture/mod_facture_terre.php + * \ingroup facture + * \brief File containing class for numbering module Terre */ require_once DOL_DOCUMENT_ROOT .'/core/modules/facture/modules_facture.php'; -/** \class mod_facture_terre - * \brief Classe du modele de numerotation de reference de facture Terre +/** + * \class mod_facture_terre + * \brief Classe du modele de numerotation de reference de facture Terre */ class mod_facture_terre extends ModeleNumRefFactures { - /** - * Dolibarr version of the loaded document - * @public string + /** + * Dolibarr version of the loaded document 'development', 'experimental', 'dolibarr' + * @var string */ - public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + public $version = 'dolibarr'; - public $prefixinvoice='FA'; + /** + * Prefix for invoices + * @var string + */ + public $prefixinvoice='FA'; - public $prefixcreditnote='AV'; + /** + * Prefix for credit note + * @var string + */ + public $prefixcreditnote='AV'; - public $prefixdeposit='AC'; + /** + * Prefix for deposit + * @var string + */ + public $prefixdeposit='AC'; - /** - * @var string Error code (or message) - */ - public $error=''; + /** + * @var string Error code (or message) + */ + public $error=''; /** @@ -162,7 +175,7 @@ class mod_facture_terre extends ModeleNumRefFactures /** * Return next value not used or last value used * - * @param Societe $objsoc Object third party + * @param Societe $objsoc Object third party * @param Facture $invoice Object invoice * @param string $mode 'next' for next value or 'last' for last value * @return string Value @@ -234,10 +247,10 @@ class mod_facture_terre extends ModeleNumRefFactures /** * Return next free value * - * @param Societe $objsoc Object third party - * @param string $objforref Object for number to search - * @param string $mode 'next' for next value or 'last' for last value - * @return string Next free value + * @param Societe $objsoc Object third party + * @param string $objforref Object for number to search + * @param string $mode 'next' for next value or 'last' for last value + * @return string Next free value */ public function getNumRef($objsoc, $objforref, $mode = 'next') { diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index e3b31ec7726..9bc181f66d9 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -1326,7 +1326,7 @@ else if ($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT) { - print '
'; + print '
'; if ($cancreate && $object->statut == Holiday::STATUS_DRAFT) { print ''; diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index 82b44dd9bca..1404391f521 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -271,7 +271,7 @@ else print ''; // Action column - print ''; + print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print ''; @@ -286,7 +286,7 @@ else foreach($typeleaves as $key => $val) { $labeltype = ($langs->trans($val['code'])!=$val['code']) ? $langs->trans($val['code']) : $langs->trans($val['label']); - print_liste_field_titre($labeltype, $_SERVER["PHP_SELF"], '', '', '', 'align="center"'); + print_liste_field_titre($labeltype, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'center '); } } else diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index 452762f6e65..2a77c9e1068 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -374,7 +374,7 @@ print ''; +print ''; print ''; $formother->select_year($search_year_create, 'search_year_create', 1, $min_year, 0); print ''; @@ -394,14 +394,14 @@ if ($id && ! GETPOSTISSET('search_employee')) if (! empty($user->rights->holiday->read_all)) // Can see all { if (GETPOSTISSET('search_employee')) $search_employee=GETPOST('search_employee', 'int'); - print ''; + print ''; print $form->select_dolusers($search_employee, "search_employee", 1, "", $disabled, '', '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200'); print ''; } else { if (GETPOSTISSET('search_employee')) $search_employee=GETPOST('search_employee', 'int'); - print ''; + print ''; print $form->select_dolusers($search_employee, "search_employee", 1, "", $disabled, 'hierarchyme', '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200'); print ''; } @@ -409,7 +409,7 @@ else // Approve if ($user->rights->holiday->read_all) { - print ''; + print ''; $validator = new UserGroup($db); $excludefilter=$user->admin?'':'u.rowid <> '.$user->id; @@ -445,24 +445,24 @@ print ''; print ' '; // Start date -print ''; +print ''; print ''; $formother->select_year($search_year_start, 'search_year_start', 1, $min_year, $max_year); print ''; // End date -print ''; +print ''; print ''; $formother->select_year($search_year_end, 'search_year_end', 1, $min_year, $max_year); print ''; // Status -print ''; +print ''; $holiday->selectStatutCP($search_statut, 'search_statut'); print ''; // Actions -print ''; +print ''; $searchpicto=$form->showFilterAndCheckAddButtons(0); print $searchpicto; print ''; @@ -471,32 +471,31 @@ print "\n"; print ''; print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "cp.ref", "", $param, '', $sortfield, $sortorder); -print_liste_field_titre("DateCreateCP", $_SERVER["PHP_SELF"], "cp.date_create", "", $param, 'align="center"', $sortfield, $sortorder); +print_liste_field_titre("DateCreateCP", $_SERVER["PHP_SELF"], "cp.date_create", "", $param, '', $sortfield, $sortorder, 'center '); print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "cp.fk_user", "", $param, '', $sortfield, $sortorder); print_liste_field_titre("ValidatorCP", $_SERVER["PHP_SELF"], "cp.fk_validator", "", $param, '', $sortfield, $sortorder); print_liste_field_titre("Type", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder); -print_liste_field_titre("NbUseDaysCPShort", $_SERVER["PHP_SELF"], '', '', $pram, 'align="right"', $sortfield, $sortorder); -print_liste_field_titre("DateDebCP", $_SERVER["PHP_SELF"], "cp.date_debut", "", $param, 'align="center"', $sortfield, $sortorder); -print_liste_field_titre("DateFinCP", $_SERVER["PHP_SELF"], "cp.date_fin", "", $param, 'align="center"', $sortfield, $sortorder); -print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "cp.statut", "", $param, 'align="right"', $sortfield, $sortorder); -print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], "", '', $param, 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n"; +print_liste_field_titre("NbUseDaysCPShort", $_SERVER["PHP_SELF"], '', '', $pram, '', $sortfield, $sortorder, 'right '); +print_liste_field_titre("DateDebCP", $_SERVER["PHP_SELF"], "cp.date_debut", "", $param, '', $sortfield, $sortorder, 'center '); +print_liste_field_titre("DateFinCP", $_SERVER["PHP_SELF"], "cp.date_fin", "", $param, '', $sortfield, $sortorder, 'center '); +print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "cp.statut", "", $param, '', $sortfield, $sortorder, 'right '); +print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n"; print "\n"; $listhalfday=array('morning'=>$langs->trans("Morning"),"afternoon"=>$langs->trans("Afternoon")); // If we ask a dedicated card and not allow to see it, we forc on user. -if ($id && empty($user->rights->holiday->read_all) && ! in_array($id, $childids)) -{ +if ($id && empty($user->rights->holiday->read_all) && ! in_array($id, $childids)) { $langs->load("errors"); print ''.$langs->trans("NotEnoughPermissions").''; $result = 0; } -// Lines elseif (! empty($holiday->holiday) && !empty($mysoc->country_id)) { - $userstatic = new User($db); - $approbatorstatic = new User($db); + // Lines + $userstatic = new User($db); + $approbatorstatic = new User($db); $typeleaves=$holiday->getTypes(1, -1); @@ -538,22 +537,22 @@ elseif (! empty($holiday->holiday) && !empty($mysoc->country_id)) $labeltypeleavetoshow = ($langs->trans($typeleaves[$infos_CP['fk_type']]['code'])!=$typeleaves[$infos_CP['fk_type']]['code'] ? $langs->trans($typeleaves[$infos_CP['fk_type']]['code']) : $typeleaves[$infos_CP['fk_type']]['label']); print empty($typeleaves[$infos_CP['fk_type']]['label']) ? $langs->trans("TypeWasDisabledOrRemoved", $infos_CP['fk_type']) : $labeltypeleavetoshow; print ''; - print ''; + print ''; $nbopenedday=num_open_day($infos_CP['date_debut_gmt'], $infos_CP['date_fin_gmt'], 0, 1, $infos_CP['halfday']); print $nbopenedday.' '.$langs->trans('DurationDays'); print ''; - print ''; + print ''; print dol_print_date($infos_CP['date_debut'], 'day'); print ' ('.$langs->trans($listhalfday[$starthalfday]).')'; print ''; - print ''; + print ''; print dol_print_date($infos_CP['date_fin'], 'day'); print ' ('.$langs->trans($listhalfday[$endhalfday]).')'; print ''; - print ''.$holidaystatic->LibStatut($infos_CP['statut'], 5).''; + print ''.$holidaystatic->LibStatut($infos_CP['statut'], 5).''; // Action column - print ''; + print ''; if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined { $selected=0; diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php index 4cfa375fe76..98db1318aa7 100644 --- a/htdocs/holiday/month_report.php +++ b/htdocs/holiday/month_report.php @@ -1,7 +1,7 @@ - * Copyright (C) 2011 François Legastelois - * Copyright (C) 2018 Frédéric France +/* Copyright (C) 2007-2010 Laurent Destailleur + * Copyright (C) 2011 François Legastelois + * Copyright (C) 2018-2019 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 @@ -110,12 +110,12 @@ print ''; print '' . $langs->trans('Ref') . ''; print '' . $langs->trans('Employee') . ''; print '' . $langs->trans('Type') . ''; -print '' . $langs->trans('DateDebCP') . ''; -print '' . $langs->trans('DateFinCP') . ''; -print '' . $langs->trans('NbUseDaysCPShort') . ''; -print '' . $langs->trans('DateStartInMonth') . ''; -print '' . $langs->trans('DateEndInMonth') . ''; -print '' . $langs->trans('NbUseDaysCPShortInMonth') . ''; +print '' . $langs->trans('DateDebCP') . ''; +print '' . $langs->trans('DateFinCP') . ''; +print '' . $langs->trans('NbUseDaysCPShort') . ''; +print '' . $langs->trans('DateStartInMonth') . ''; +print '' . $langs->trans('DateEndInMonth') . ''; +print '' . $langs->trans('NbUseDaysCPShortInMonth') . ''; print '' . $langs->trans('DescCP') . ''; print ''; @@ -173,20 +173,20 @@ else print ''; print '' . $user->getFullName($langs) . ''; print '' . $obj->label . ''; - print '' . dol_print_date($obj->date_debut, 'day'); + print '' . dol_print_date($obj->date_debut, 'day'); print ' ('.$langs->trans($listhalfday[$starthalfday]).')'; print ''; - print '' . dol_print_date($obj->date_fin, 'day'); + print '' . dol_print_date($obj->date_fin, 'day'); print ' ('.$langs->trans($listhalfday[$endhalfday]).')'; print ''; - print '' . num_open_day($date_start, $date_end, 0, 1, $obj->halfday) . ''; - print '' . dol_print_date($date_start_inmonth, 'day'); + print '' . num_open_day($date_start, $date_end, 0, 1, $obj->halfday) . ''; + print '' . dol_print_date($date_start_inmonth, 'day'); print ' ('.$langs->trans($listhalfday[$starthalfdayinmonth]).')'; print ''; - print '' . dol_print_date($date_end_inmonth, 'day'); + print '' . dol_print_date($date_end_inmonth, 'day'); print ' ('.$langs->trans($listhalfday[$endhalfdayinmonth]).')'; print ''; - print '' . num_open_day($date_start_inmonth, $date_end_inmonth, 0, 1, $halfdayinmonth) . ''; + print '' . num_open_day($date_start_inmonth, $date_end_inmonth, 0, 1, $halfdayinmonth) . ''; print '' . dol_escape_htmltag(dolGetFirstLineOfText($obj->description)) . ''; print ''; } diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php index d64d85813e6..f27f1a5f10b 100644 --- a/htdocs/holiday/view_log.php +++ b/htdocs/holiday/view_log.php @@ -193,7 +193,7 @@ print ''; print ''; print ''; // Action column -print ''; +print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print ''; @@ -201,15 +201,15 @@ print ''; print ''; print_liste_field_titre('ID'); -print_liste_field_titre('Date', $_SERVER["PHP_SELF"], '', '', '', 'align="center"'); +print_liste_field_titre('Date', $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'center '); print_liste_field_titre('ActionByCP'); print_liste_field_titre('UserUpdateCP'); print_liste_field_titre('Description'); print_liste_field_titre('Type'); -print_liste_field_titre('PrevSoldeCP', $_SERVER["PHP_SELF"], '', '', '', 'align="right"'); -print_liste_field_titre('Variation', $_SERVER["PHP_SELF"], '', '', '', 'align="right"'); -print_liste_field_titre('NewSoldeCP', $_SERVER["PHP_SELF"], '', '', '', 'align="right"'); -print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n"; +print_liste_field_titre('PrevSoldeCP', $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'right '); +print_liste_field_titre('Variation', $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'right '); +print_liste_field_titre('NewSoldeCP', $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'right '); +print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n"; print ''; diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php index 1985926563b..5e6413abb45 100644 --- a/htdocs/hrm/admin/admin_establishment.php +++ b/htdocs/hrm/admin/admin_establishment.php @@ -95,7 +95,7 @@ if ($result) print_liste_field_titre("Address", $_SERVER["PHP_SELF"], "e.address", "", "", "", $sortfield, $sortorder); print_liste_field_titre("Zipcode", $_SERVER["PHP_SELF"], "e.zip", "", "", "", $sortfield, $sortorder); print_liste_field_titre("Town", $_SERVER["PHP_SELF"], "e.town", "", "", "", $sortfield, $sortorder); - print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "e.status", "", "", 'align="right"', $sortfield, $sortorder); + print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "e.status", "", "", '', $sortfield, $sortorder, 'right '); print "\n"; if ($num > 0) @@ -117,7 +117,7 @@ if ($result) print ''.$obj->zip.''; print ''.$obj->town.''; - print ''; + print ''; print $establishmentstatic->getLibStatut(5); print ''; print "\n"; diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php index 6aa17362894..3751935b81c 100644 --- a/htdocs/hrm/index.php +++ b/htdocs/hrm/index.php @@ -198,7 +198,7 @@ if (! empty($conf->holiday->enabled) && $user->rights->holiday->read) print ''.$langs->trans("BoxTitleLastLeaveRequests", min($max, $num)).''; print ''.$langs->trans("from").''; print ''.$langs->trans("to").''; - print ''.$langs->trans("DateModificationShort").''; + print ''.$langs->trans("DateModificationShort").''; print ' '; print ''; if ($num) @@ -228,7 +228,7 @@ if (! empty($conf->holiday->enabled) && $user->rights->holiday->read) print ''.dol_print_date($obj->date_start, 'day').' '.$langs->trans($listhalfday[$starthalfday]); print ''.dol_print_date($obj->date_end, 'day').' '.$langs->trans($listhalfday[$endhalfday]); - print ''.dol_print_date($db->jdate($obj->dm), 'day').''; + print ''.dol_print_date($db->jdate($obj->dm), 'day').''; print ''.$holidaystatic->LibStatut($obj->status, 3).''; print ''; @@ -271,8 +271,8 @@ if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire) print ''; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; print ''; if ($num) @@ -299,8 +299,8 @@ if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire) print ''; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; print ''; @@ -343,8 +343,8 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire print '
'.$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).'
'; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; print ''; if ($num) @@ -371,8 +371,8 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire print ''; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; print ''; diff --git a/htdocs/ifttt/admin/index.php b/htdocs/ifttt/admin/index.php index d6eb777109b..de3abbe3c2a 100644 --- a/htdocs/ifttt/admin/index.php +++ b/htdocs/ifttt/admin/index.php @@ -72,7 +72,7 @@ print '
'.$langs->trans("BoxTitleLastModifiedExpenses", min($max, $num)).''.$langs->trans("TotalTTC").''.$langs->trans("DateModificationShort").''.$langs->trans("TotalTTC").''.$langs->trans("DateModificationShort").' 
'.$expensereportstatic->getNomUrl(1).''.$userstatic->getNomUrl(-1).''.price($obj->total_ttc).''.dol_print_date($db->jdate($obj->dm), 'day').''.price($obj->total_ttc).''.dol_print_date($db->jdate($obj->dm), 'day').''.$expensereportstatic->LibStatut($obj->status, 3).'
'; print ''; print ""; -print '"; +print '"; print ""; print ""; @@ -81,13 +81,13 @@ print ''; $production_mode=(empty($conf->global->IFTTT_PRODUCTION_MODE)?false:true); if ($production_mode) { - print ''; } else { - print ''; }
".$langs->trans("Parameter")."'.$langs->trans("Value")."'.$langs->trans("Value")." 
'.$langs->trans("ProductionMode").''; + print ''; print img_picto($langs->trans("Activated"), 'switch_on'); print ''; + print ''; print img_picto($langs->trans("Disabled"), 'switch_off'); print '