From 80163a9569228aff7e71f0ab4582996a51919f04 Mon Sep 17 00:00:00 2001 From: atm-florian Date: Sun, 11 Dec 2022 22:37:06 +0100 Subject: [PATCH 01/21] FIX: HTTP Response 401 is for unauthorized requests but when the user provides wrong values for features or ID it should be 400 (or maybe 404 not found if they are valid integers but not valid IDs) --- htdocs/product/class/api_products.class.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php index da19c78b565..364cad1ad95 100644 --- a/htdocs/product/class/api_products.class.php +++ b/htdocs/product/class/api_products.class.php @@ -1727,8 +1727,12 @@ class Products extends DolibarrApi throw new RestException(401); } - if (empty($id) || empty($features) || !is_array($features)) { - throw new RestException(401); + if (empty($id)) { + throw new RestException(400, 'Product ID is mandatory'); + } + + if (empty($features) || !is_array($features)) { + throw new RestException(400, 'Features is mandatory and should be IDs of attribute values indexed by IDs of attributes'); } $weight_impact = price2num($weight_impact); @@ -1738,10 +1742,10 @@ class Products extends DolibarrApi $prodattr_val = new ProductAttributeValue($this->db); foreach ($features as $id_attr => $id_value) { if ($prodattr->fetch((int) $id_attr) < 0) { - throw new RestException(401); + throw new RestException(400, 'Invalid attribute ID: '.$id_attr); } if ($prodattr_val->fetch((int) $id_value) < 0) { - throw new RestException(401); + throw new RestException(400, 'Invalid attribute value ID: '.$id_value); } } From d3cbafc57bbd8c0637908044c851551e88e1e1d9 Mon Sep 17 00:00:00 2001 From: Christian Foellmann Date: Thu, 14 Dec 2023 12:44:09 +0100 Subject: [PATCH 02/21] NEW add const PROJECT_HIDE_OPEN_PROJECTS_LIST_ON_PROJECT_AREA to have the ability to hide the potentially very long list of open projects in any case --- htdocs/projet/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index ce25b803c37..24e0f59cfdf 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -412,7 +412,7 @@ if ($resql) { dol_print_error($db); } -if (!getDolGlobalInt('PROJECT_USE_OPPORTUNITIES') || getDolGlobalInt('PROJECT_SHOW_OPEN_PROJECTS_LIST_ON_PROJECT_AREA')) { +if ((!getDolGlobalInt('PROJECT_USE_OPPORTUNITIES') || getDolGlobalInt('PROJECT_SHOW_OPEN_PROJECTS_LIST_ON_PROJECT_AREA')) && !getDolGlobalInt('PROJECT_HIDE_OPEN_PROJECTS_LIST_ON_PROJECT_AREA')) { // This list is surely very long and useless when we are using opportunities, so we hide it for this use case, but we allow to show it if // we really want it and to allow interface backward compatibility. print '
'; From 816d29d177d0c84b3f62ef003cae5cd55ec3d4fa Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Thu, 14 Dec 2023 14:49:52 +0100 Subject: [PATCH 03/21] add noprint parameter to select_conditions_paiements --- htdocs/core/class/html.form.class.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index a81f40ebc2f..0b862caba1b 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -4304,13 +4304,19 @@ class Form * @param string $deposit_percent < 0 : deposit_percent input makes no sense (for example, in list filters) * 0 : use default deposit percentage from entry * > 0 : force deposit percentage (for example, from company object) + * @param int $noprint if set to one we return the html to print, if 0 (default) we print it * @return void * @deprecated */ - public function select_conditions_paiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '', $deposit_percent = -1) + public function select_conditions_paiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '', $deposit_percent = -1, $noprint = 0) { // phpcs:enable - print $this->getSelectConditionsPaiements($selected, $htmlname, $filtertype, $addempty, $noinfoadmin, $morecss, $deposit_percent); + $out = $this->getSelectConditionsPaiements($selected, $htmlname, $filtertype, $addempty, $noinfoadmin, $morecss, $deposit_percent, $noprint); + if (empty($noprint)) { + print $out; + } else { + return $out; + } } From 273fbbc65c984b95a8ec64314cf2cca8924745b5 Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Thu, 14 Dec 2023 15:54:09 +0100 Subject: [PATCH 04/21] dont reopen billed orders --- htdocs/commande/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 791f67fcd56..556b23e7027 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -2908,7 +2908,7 @@ if ($action == 'create' && $usercancreate) { $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); if (empty($reshook)) { // Reopen a closed order - if (($object->statut == Commande::STATUS_CLOSED || $object->statut == Commande::STATUS_CANCELED) && $usercancreate) { + if (($object->statut == Commande::STATUS_CLOSED || $object->statut == Commande::STATUS_CANCELED) && $usercancreate && !$object->billed) { print dolGetButtonAction('', $langs->trans('ReOpen'), 'default', $_SERVER["PHP_SELF"].'?action=reopen&token='.newToken().'&id='.$object->id, ''); } From 2caf7e6c0baced89bdf9936dbf54cc20a4761311 Mon Sep 17 00:00:00 2001 From: ATM john Date: Sat, 16 Dec 2023 13:46:47 +0100 Subject: [PATCH 05/21] Add llxHeader body css for command --- htdocs/commande/agenda.php | 2 +- htdocs/commande/card.php | 2 +- htdocs/commande/contact.php | 2 +- htdocs/commande/document.php | 2 +- htdocs/commande/list.php | 2 +- htdocs/commande/note.php | 2 +- htdocs/commande/stats/index.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/commande/agenda.php b/htdocs/commande/agenda.php index 00dffc78012..5cf1dd6c184 100644 --- a/htdocs/commande/agenda.php +++ b/htdocs/commande/agenda.php @@ -128,7 +128,7 @@ if ($object->id > 0) { $title = $langs->trans("Agenda"); //if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title; $help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung'; - llxHeader('', $title, $help_url); + llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-order page-card_agenda'); if (isModEnabled('notification')) { $langs->load("mails"); diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 791f67fcd56..63d8d4c1462 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1638,7 +1638,7 @@ if ($action == 'create') { } $help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge'; -llxHeader('', $title, $help_url); +llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-order page-card'); $form = new Form($db); $formfile = new FormFile($db); diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php index a5fc715eb38..f02212c7c3f 100644 --- a/htdocs/commande/contact.php +++ b/htdocs/commande/contact.php @@ -119,7 +119,7 @@ if ($id > 0 || !empty($ref)) { $title = $object->ref." - ".$langs->trans('ContactsAddresses'); $help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge'; - llxHeader('', $title, $help_url); + llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-order page-card_contact'); $head = commande_prepare_head($object); print dol_get_fiche_head($head, 'contact', $langs->trans("CustomerOrder"), -1, 'order'); diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php index 66964b2636a..96f97f4a6d6 100644 --- a/htdocs/commande/document.php +++ b/htdocs/commande/document.php @@ -100,7 +100,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php'; */ $title = $object->ref." - ".$langs->trans('Documents'); $help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge'; -llxHeader('', $title, $help_url); +llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-order page-card_documents'); $form = new Form($db); diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 8c8f661fac8..9d7a70bf305 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -1148,7 +1148,7 @@ if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $s // Output page // -------------------------------------------------------------------- -llxHeader('', $title, $help_url); +llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-order page-list'); $arrayofselected = is_array($toselect) ? $toselect : array(); diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php index edcd2a14f16..368a8333317 100644 --- a/htdocs/commande/note.php +++ b/htdocs/commande/note.php @@ -83,7 +83,7 @@ if (empty($reshook)) { */ $title = $object->ref." - ".$langs->trans('Notes'); $help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge'; -llxHeader('', $title, $help_url); +llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-order page-card_notes'); $form = new Form($db); diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index 702ee59d5e9..b1c4a814fc0 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -101,7 +101,7 @@ if ($mode == 'supplier') { $dir = $conf->fournisseur->commande->dir_temp; } -llxHeader('', $title); +llxHeader('', $title, '', '', 0, 0, '', '', '', 'mod-order page-stats'); print load_fiche_titre($title, '', $picto); From b17d2d60040393be1e548aa4dab3931cca5bd1fb Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 17 Dec 2023 22:32:25 +0100 Subject: [PATCH 06/21] NEW : llxHeader body css for asset --- htdocs/asset/accountancy_codes.php | 2 +- htdocs/asset/agenda.php | 2 +- htdocs/asset/card.php | 2 +- htdocs/asset/depreciation.php | 2 +- htdocs/asset/depreciation_options.php | 2 +- htdocs/asset/disposal.php | 2 +- htdocs/asset/document.php | 2 +- htdocs/asset/list.php | 2 +- htdocs/asset/model/accountancy_codes.php | 2 +- htdocs/asset/model/agenda.php | 2 +- htdocs/asset/model/card.php | 2 +- htdocs/asset/model/depreciation_options.php | 2 +- htdocs/asset/model/list.php | 2 +- htdocs/asset/model/note.php | 2 +- htdocs/asset/note.php | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/htdocs/asset/accountancy_codes.php b/htdocs/asset/accountancy_codes.php index a82b3ebe28d..b0518902a34 100644 --- a/htdocs/asset/accountancy_codes.php +++ b/htdocs/asset/accountancy_codes.php @@ -127,7 +127,7 @@ if (empty($reshook)) { $form = new Form($db); $help_url = ''; -llxHeader('', $langs->trans('Asset'), $help_url); +llxHeader('', $langs->trans('Asset'), $help_url, '', 0, 0, '', '', '', 'mod-asset page-card_accountancy'); if ($id > 0 || !empty($ref)) { $head = assetPrepareHead($object); diff --git a/htdocs/asset/agenda.php b/htdocs/asset/agenda.php index 221c54f84ff..9d2fd0a3a53 100644 --- a/htdocs/asset/agenda.php +++ b/htdocs/asset/agenda.php @@ -131,7 +131,7 @@ if ($object->id > 0) { $title = $langs->trans("Agenda"); //if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title; $help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung'; - llxHeader('', $title, $help_url); + llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-asset page-card_agenda'); if (isModEnabled('notification')) { $langs->load("mails"); diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php index fad962338a9..d67e3f7043b 100644 --- a/htdocs/asset/card.php +++ b/htdocs/asset/card.php @@ -172,7 +172,7 @@ $formfile = new FormFile($db); $title = $langs->trans("Asset").' - '.$langs->trans("Card"); $help_url = ''; -llxHeader('', $title, $help_url); +llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-asset page-card'); // Part to create if ($action == 'create') { diff --git a/htdocs/asset/depreciation.php b/htdocs/asset/depreciation.php index 7f24d1853ee..6c8659aad9c 100644 --- a/htdocs/asset/depreciation.php +++ b/htdocs/asset/depreciation.php @@ -97,7 +97,7 @@ if (empty($reshook)) { $form = new Form($db); $help_url = ''; -llxHeader('', $langs->trans('Asset'), $help_url); +llxHeader('', $langs->trans('Asset'), $help_url, '', 0, 0, '', '', '', 'mod-asset page-card_depreciation'); if ($id > 0 || !empty($ref)) { $head = assetPrepareHead($object); diff --git a/htdocs/asset/depreciation_options.php b/htdocs/asset/depreciation_options.php index 0796ff6010f..bc11e2196ed 100644 --- a/htdocs/asset/depreciation_options.php +++ b/htdocs/asset/depreciation_options.php @@ -133,7 +133,7 @@ if (empty($reshook)) { $form = new Form($db); $help_url = ''; -llxHeader('', $langs->trans('Asset'), $help_url); +llxHeader('', $langs->trans('Asset'), $help_url, '', 0, 0, '', '', '', 'mod-asset page-card_depreciation_options'); if ($id > 0 || !empty($ref)) { $head = assetPrepareHead($object); diff --git a/htdocs/asset/disposal.php b/htdocs/asset/disposal.php index a7f89f15a9a..98f07003db1 100644 --- a/htdocs/asset/disposal.php +++ b/htdocs/asset/disposal.php @@ -88,7 +88,7 @@ if (empty($reshook)) { $form = new Form($db); $help_url = ''; -llxHeader('', $langs->trans('Asset'), $help_url); +llxHeader('', $langs->trans('Asset'), $help_url, '', 0, 0, '', '', '', 'mod-asset page-card_disposal'); if ($id > 0 || !empty($ref)) { $object->fetch_thirdparty(); diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php index 5a79de0d4e0..e6359b3a190 100644 --- a/htdocs/asset/document.php +++ b/htdocs/asset/document.php @@ -101,7 +101,7 @@ $form = new Form($db); $title = $langs->trans("Asset").' - '.$langs->trans("Files"); $help_url = ''; -llxHeader('', $title, $help_url); +llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-asset page-card_documents'); if ($object->id) { /* diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php index e1f7272dd22..13e11efbefa 100644 --- a/htdocs/asset/list.php +++ b/htdocs/asset/list.php @@ -354,7 +354,7 @@ if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $s // Output page // -------------------------------------------------------------------- -llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', ''); +llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'mod-asset page-list'); $arrayofselected = is_array($toselect) ? $toselect : array(); diff --git a/htdocs/asset/model/accountancy_codes.php b/htdocs/asset/model/accountancy_codes.php index db631f4785c..7e41aaf4288 100644 --- a/htdocs/asset/model/accountancy_codes.php +++ b/htdocs/asset/model/accountancy_codes.php @@ -131,7 +131,7 @@ if (empty($reshook)) { $form = new Form($db); $help_url = ''; -llxHeader('', $langs->trans('AssetModel'), $help_url); +llxHeader('', $langs->trans('AssetModel'), $help_url, '', 0, 0, '', '', '', 'mod-asset page-model-card_accountancy'); if ($id > 0 || !empty($ref)) { $head = assetModelPrepareHead($object); diff --git a/htdocs/asset/model/agenda.php b/htdocs/asset/model/agenda.php index c66ec0ae68e..19d3b7ef58d 100644 --- a/htdocs/asset/model/agenda.php +++ b/htdocs/asset/model/agenda.php @@ -137,7 +137,7 @@ if ($object->id > 0) { $title = $langs->trans("Agenda"); //if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title; $help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung'; - llxHeader('', $title, $help_url); + llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-asset page-model-card_agenda'); if (isModEnabled('notification')) { $langs->load("mails"); diff --git a/htdocs/asset/model/card.php b/htdocs/asset/model/card.php index cfa78d07640..5aecdb93f54 100644 --- a/htdocs/asset/model/card.php +++ b/htdocs/asset/model/card.php @@ -144,7 +144,7 @@ $formfile = new FormFile($db); $title = $langs->trans("AssetModel") . ' - ' . $langs->trans("Card"); $help_url = ''; -llxHeader('', $title, $help_url); +llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-asset page-model-card'); // Part to create if ($action == 'create') { diff --git a/htdocs/asset/model/depreciation_options.php b/htdocs/asset/model/depreciation_options.php index 5388dc206ed..89b85be1f04 100644 --- a/htdocs/asset/model/depreciation_options.php +++ b/htdocs/asset/model/depreciation_options.php @@ -133,7 +133,7 @@ if (empty($reshook)) { $form = new Form($db); $help_url = ''; -llxHeader('', $langs->trans('AssetModel'), $help_url); +llxHeader('', $langs->trans('AssetModel'), $help_url, '', 0, 0, '', '', '', 'mod-asset page-model-card_depreciation_options'); if ($id > 0 || !empty($ref)) { $head = assetModelPrepareHead($object); diff --git a/htdocs/asset/model/list.php b/htdocs/asset/model/list.php index fd2ad44f133..9b85eded84e 100644 --- a/htdocs/asset/model/list.php +++ b/htdocs/asset/model/list.php @@ -357,7 +357,7 @@ if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $s // Output page // -------------------------------------------------------------------- -llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', ''); +llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'mod-asset page-model-list'); $arrayofselected = is_array($toselect) ? $toselect : array(); diff --git a/htdocs/asset/model/note.php b/htdocs/asset/model/note.php index e6d284e7fc8..984b3fb867b 100644 --- a/htdocs/asset/model/note.php +++ b/htdocs/asset/model/note.php @@ -93,7 +93,7 @@ if (empty($reshook)) { $form = new Form($db); $help_url = ''; -llxHeader('', $langs->trans('AssetModel'), $help_url); +llxHeader('', $langs->trans('AssetModel'), $help_url, '', 0, 0, '', '', '', 'mod-asset page-model-card_notes'); if ($id > 0 || !empty($ref)) { $object->fetch_thirdparty(); diff --git a/htdocs/asset/note.php b/htdocs/asset/note.php index 2fc3d091dc6..d2a89f96f0f 100644 --- a/htdocs/asset/note.php +++ b/htdocs/asset/note.php @@ -86,7 +86,7 @@ if (empty($reshook)) { $form = new Form($db); $help_url = ''; -llxHeader('', $langs->trans('Asset'), $help_url); +llxHeader('', $langs->trans('Asset'), $help_url, '', 0, 0, '', '', '', 'mod-asset page-card_notes'); if ($id > 0 || !empty($ref)) { $object->fetch_thirdparty(); From 644bf76c1880985cdbbb9fdfa4e1bb3e37664b43 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 17 Dec 2023 23:08:08 +0100 Subject: [PATCH 07/21] NEW : llxHeader body css for donation --- htdocs/don/admin/donation.php | 4 +++- htdocs/don/admin/donation_extrafields.php | 3 ++- htdocs/don/card.php | 2 +- htdocs/don/document.php | 2 +- htdocs/don/index.php | 2 +- htdocs/don/info.php | 2 +- htdocs/don/list.php | 2 +- htdocs/don/note.php | 2 +- htdocs/don/payment/card.php | 4 ++-- htdocs/don/payment/payment.php | 4 ++-- htdocs/don/stats/index.php | 6 +++--- htdocs/langs/en_US/donations.lang | 1 + 12 files changed, 19 insertions(+), 15 deletions(-) diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php index 89f03fde211..5a09ccd8f6b 100644 --- a/htdocs/don/admin/donation.php +++ b/htdocs/don/admin/donation.php @@ -173,7 +173,9 @@ if (isModEnabled('accounting')) { $formaccounting = new FormAccounting($db); } -llxHeader('', $langs->trans("DonationsSetup"), 'DonConfiguration'); +$help_url = ''; +llxHeader('', $langs->trans("DonationsSetup"), $help_url, '', 0, 0, '', '', '', 'mod-donation page-admin'); + $linkback = ''.$langs->trans("BackToModuleList").''; print load_fiche_titre($langs->trans("DonationsSetup"), $linkback, 'title_setup'); diff --git a/htdocs/don/admin/donation_extrafields.php b/htdocs/don/admin/donation_extrafields.php index a0454ea08d7..ef2c011d9cf 100644 --- a/htdocs/don/admin/donation_extrafields.php +++ b/htdocs/don/admin/donation_extrafields.php @@ -63,7 +63,8 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php'; $textobject = $langs->transnoentitiesnoconv("Donations"); -llxHeader('', $langs->trans("DonationsSetup")); +$help_url = ''; +llxHeader('', $langs->trans("DonationsSetup"), $help_url, '', 0, 0, '', '', '', 'mod-donation page-admin_extrafields'); $linkback = ''.$langs->trans("BackToModuleList").''; print load_fiche_titre($langs->trans("DonationsSetup"), $linkback, 'title_setup'); diff --git a/htdocs/don/card.php b/htdocs/don/card.php index 1499e29b7fa..fbd2117c7b5 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -391,7 +391,7 @@ $title = $langs->trans("Donation"); $help_url = 'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones|DE:Modul_Spenden'; -llxHeader('', $title, $help_url); +llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-donation page-card'); $form = new Form($db); $formfile = new FormFile($db); diff --git a/htdocs/don/document.php b/htdocs/don/document.php index fd40fea0594..6931f12d744 100644 --- a/htdocs/don/document.php +++ b/htdocs/don/document.php @@ -111,7 +111,7 @@ $title = $langs->trans('Donation')." - ".$langs->trans('Documents'); $help_url = 'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones|DE:Modul_Spenden'; -llxHeader('', $title, $help_url); +llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-donation page-card_documents'); if ($object->id) { diff --git a/htdocs/don/index.php b/htdocs/don/index.php index f09d6437dae..d817dd98428 100644 --- a/htdocs/don/index.php +++ b/htdocs/don/index.php @@ -56,7 +56,7 @@ $donstatic = new Don($db); $help_url = 'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones|DE:Modul_Spenden'; -llxHeader('', $langs->trans("Donations"), $help_url); +llxHeader('', $langs->trans("Donations"), $help_url, '', 0, 0, '', '', '', 'mod-donation page-index'); $nb = array(); $somme = array(); diff --git a/htdocs/don/info.php b/htdocs/don/info.php index bf7d9e3d350..a2f9438eb33 100644 --- a/htdocs/don/info.php +++ b/htdocs/don/info.php @@ -69,7 +69,7 @@ $title = $langs->trans('Donation')." - ".$langs->trans('Info'); $help_url = 'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones|DE:Modul_Spenden'; -llxHeader('', $title, $help_url); +llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-donation page-card_info'); $form = new Form($db); if (isModEnabled('project')) { diff --git a/htdocs/don/list.php b/htdocs/don/list.php index 876df4ee74f..f7d85c3ed0c 100644 --- a/htdocs/don/list.php +++ b/htdocs/don/list.php @@ -202,7 +202,7 @@ if ($num == 1 && !getDolGlobalInt('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $sea // Output page // -------------------------------------------------------------------- -llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll +llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-donation page-list'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll // Example : Adding jquery code // print '