From 13ddcb95527d68df15acc195d33bfe88f29f38fd Mon Sep 17 00:00:00 2001 From: HENRY Florian Date: Fri, 12 Jan 2024 18:04:00 +0100 Subject: [PATCH 1/9] fix: filter on date lost on sort (#27467) --- htdocs/comm/action/list.php | 48 ++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php index 3305b44af46..0b0c8cb496f 100644 --- a/htdocs/comm/action/list.php +++ b/htdocs/comm/action/list.php @@ -345,41 +345,41 @@ if ($search_title != '') { if ($search_note != '') { $param .= '&search_note='.urlencode($search_note); } -if (GETPOST('datestartday_dtstart', 'int')) { - $param .= '&datestartday_dtstart='.GETPOST('datestartday_dtstart', 'int'); +if (GETPOST('datestart_dtstartday', 'int')) { + $param .= '&datestart_dtstartday='.GETPOST('datestart_dtstartday', 'int'); } -if (GETPOST('datestartmonth_dtstart', 'int')) { - $param .= '&datestartmonth_dtstart='.GETPOST('datestartmonth_dtstart', 'int'); +if (GETPOST('datestart_dtstartmonth', 'int')) { + $param .= '&datestart_dtstartmonth='.GETPOST('datestart_dtstartmonth', 'int'); } -if (GETPOST('datestartyear_dtstart', 'int')) { - $param .= '&datestartyear_dtstart='.GETPOST('datestartyear_dtstart', 'int'); +if (GETPOST('datestart_dtstartyear', 'int')) { + $param .= '&datestart_dtstartyear='.GETPOST('datestart_dtstartyear', 'int'); } -if (GETPOST('datestartday_dtend', 'int')) { - $param .= '&datestartday_dtend='.GETPOST('datestartday_dtend', 'int'); +if (GETPOST('datestart_dtendday', 'int')) { + $param .= '&datestart_dtendday='.GETPOST('datestart_dtendday', 'int'); } -if (GETPOST('datestartmonth_dtend', 'int')) { - $param .= '&datestartmonth_dtend='.GETPOST('datestartmonth_dtend', 'int'); +if (GETPOST('datestart_dtendmonth', 'int')) { + $param .= '&datestart_dtendmonth='.GETPOST('datestart_dtendmonth', 'int'); } -if (GETPOST('datestartyear_dtend', 'int')) { - $param .= '&datestartyear_dtend='.GETPOST('datestartyear_dtend', 'int'); +if (GETPOST('datestart_dtendyear', 'int')) { + $param .= '&datestart_dtendyear='.GETPOST('datestart_dtendyear', 'int'); } -if (GETPOST('dateendday_dtstart', 'int')) { - $param .= '&dateendday_dtstart='.GETPOST('dateendday_dtstart', 'int'); +if (GETPOST('dateend_dtstartday', 'int')) { + $param .= '&dateend_dtstartday='.GETPOST('dateend_dtstartday', 'int'); } -if (GETPOST('dateendmonth_dtstart', 'int')) { - $param .= '&dateendmonth_dtstart='.GETPOST('dateendmonth_dtstart', 'int'); +if (GETPOST('dateend_dtstartmonth', 'int')) { + $param .= '&dateend_dtstartmonth='.GETPOST('dateend_dtstartmonth', 'int'); } -if (GETPOST('dateendyear_dtstart', 'int')) { - $param .= '&dateendyear_dtstart='.GETPOST('dateendyear_dtstart', 'int'); +if (GETPOST('dateend_dtstartyear', 'int')) { + $param .= '&dateend_dtstartyear='.GETPOST('dateend_dtstartyear', 'int'); } -if (GETPOST('dateendday_dtend', 'int')) { - $param .= '&dateendday_dtend='.GETPOST('dateendday_dtend', 'int'); +if (GETPOST('dateend_dtendday', 'int')) { + $param .= '&dateend_dtendday='.GETPOST('dateend_dtendday', 'int'); } -if (GETPOST('dateendmonth_dtend', 'int')) { - $param .= '&dateendmonth_dtend='.GETPOST('dateendmonth_dtend', 'int'); +if (GETPOST('dateend_dtendmonth', 'int')) { + $param .= '&dateend_dtendmonth='.GETPOST('dateend_dtendmonth', 'int'); } -if (GETPOST('dateendyear_dtend', 'int')) { - $param .= '&dateendyear_dtend='.GETPOST('dateendyear_dtend', 'int'); +if (GETPOST('dateend_dtendyear', 'int')) { + $param .= '&dateend_dtendyear='.GETPOST('dateend_dtendyear', 'int'); } if ($optioncss != '') { $param .= '&optioncss='.urlencode($optioncss); From 2de0c09e8ea60d370052f292855ab579cfcaf3ab Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 13 Jan 2024 15:44:37 +0100 Subject: [PATCH 2/9] Try a better fix for #27477 --- htdocs/core/class/html.form.class.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index c9c3e09f634..783f3afef74 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -2247,7 +2247,7 @@ class Form * @param int|string $filtertype Filter on product type (''=nofilter, 0=product, 1=service) * @param int $limit Limit on number of returned lines * @param int $price_level Level of price to show - * @param int $status Sell status -1=Return all products, 0=Products not on sell, 1=Products on sell + * @param int $status Sell status: -1=No filter on sell status, 0=Products not on sell, 1=Products on sell * @param int $finished 2=all, 1=finished, 0=raw material * @param string $selected_input_value Value of preselected input text (for use with ajax) * @param int $hidelabel Hide label (0=no, 1=yes, 2=show search icon (before) and placeholder, 3 search icon after) @@ -2263,7 +2263,7 @@ class Form * 'warehouseinternal' = count products from warehouses for internal correct/transfer only * @param array $selected_combinations Selected combinations. Format: array([attrid] => attrval, [...]) * @param string $nooutput No print, return the output into a string - * @param int $status_purchase Purchase status -1=Return all products, 0=Products not on purchase, 1=Products on purchase + * @param int $status_purchase Purchase status: -1=No filter on purchase status, 0=Products not on purchase, 1=Products on purchase * @return void|string */ public function select_produits($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 0, $price_level = 0, $status = 1, $finished = 2, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '', $selected_combinations = null, $nooutput = 0, $status_purchase = -1) @@ -2638,10 +2638,8 @@ class Form $sql .= " AND p.finished = ".((int) $finished); } elseif ($finished == 1) { $sql .= " AND p.finished = ".((int) $finished); - if ($status >= 0) { - $sql .= " AND p.tosell = ".((int) $status); - } - } elseif ($status >= 0) { + } + if ($status >= 0) { $sql .= " AND p.tosell = ".((int) $status); } if ($status_purchase >= 0) { From 6ac9b959d75045be41c687e0aa65f2b4e3c29657 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sat, 13 Jan 2024 15:48:54 +0100 Subject: [PATCH 3/9] Accountancy - Add help url everywhere (#27480) Co-authored-by: Laurent Destailleur --- htdocs/accountancy/admin/account.php | 10 +++++---- htdocs/accountancy/admin/accountmodel.php | 6 +++-- htdocs/accountancy/admin/card.php | 4 ++-- htdocs/accountancy/admin/categories.php | 6 +++-- htdocs/accountancy/admin/categories_list.php | 8 ++++--- htdocs/accountancy/admin/closure.php | 8 +++++-- htdocs/accountancy/admin/defaultaccounts.php | 6 +++-- htdocs/accountancy/admin/export.php | 6 ++--- htdocs/accountancy/admin/fiscalyear.php | 4 ++-- htdocs/accountancy/admin/fiscalyear_card.php | 4 ++-- htdocs/accountancy/admin/fiscalyear_info.php | 4 ++-- htdocs/accountancy/admin/index.php | 22 +++++++++---------- htdocs/accountancy/admin/journals_list.php | 7 +++--- htdocs/accountancy/admin/productaccount.php | 16 +++++++------- htdocs/accountancy/admin/subaccount.php | 8 +++---- htdocs/accountancy/bookkeeping/balance.php | 6 +++-- htdocs/accountancy/bookkeeping/card.php | 6 ++--- htdocs/accountancy/bookkeeping/export.php | 5 +++-- htdocs/accountancy/bookkeeping/list.php | 6 ++--- .../accountancy/bookkeeping/listbyaccount.php | 6 ++--- htdocs/accountancy/closure/index.php | 2 +- htdocs/accountancy/customer/card.php | 9 ++++---- htdocs/accountancy/customer/index.php | 3 ++- htdocs/accountancy/customer/lines.php | 4 +++- htdocs/accountancy/customer/list.php | 6 +++-- htdocs/accountancy/expensereport/card.php | 18 ++++++++------- htdocs/accountancy/expensereport/index.php | 5 +++-- htdocs/accountancy/expensereport/lines.php | 6 +++-- htdocs/accountancy/expensereport/list.php | 8 ++++--- htdocs/accountancy/index.php | 2 +- htdocs/accountancy/supplier/card.php | 6 +++-- htdocs/accountancy/supplier/index.php | 11 +++++----- htdocs/accountancy/supplier/lines.php | 6 +++-- htdocs/accountancy/supplier/list.php | 8 ++++--- 34 files changed, 140 insertions(+), 102 deletions(-) diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php index 6f36d04d7b9..8c878e1b162 100644 --- a/htdocs/accountancy/admin/account.php +++ b/htdocs/accountancy/admin/account.php @@ -1,7 +1,7 @@ - * Copyright (C) 2013-2023 Alexandre Spangaro - * Copyright (C) 2016-2018 Laurent Destailleur +/* Copyright (C) 2013-2016 Olivier Geffroy + * Copyright (C) 2013-2024 Alexandre Spangaro + * Copyright (C) 2016-2018 Laurent Destailleur * * 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 @@ -226,7 +226,9 @@ if (empty($reshook)) { $form = new Form($db); $formaccounting = new FormAccounting($db); -llxHeader('', $langs->trans("ListAccounts")); +$help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilité_en_Partie_Double#Configuration'; + +llxHeader('', $langs->trans("ListAccounts"), $help_url); if ($action == 'delete') { $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$id, $langs->trans('DeleteAccount'), $langs->trans('ConfirmDeleteAccount'), 'confirm_delete', '', 0, 1); diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php index 456b1503ca7..2a0b1f5fca2 100644 --- a/htdocs/accountancy/admin/accountmodel.php +++ b/htdocs/accountancy/admin/accountmodel.php @@ -8,7 +8,7 @@ * Copyright (C) 2011 Remy Younes * Copyright (C) 2012-2015 Marcos García * Copyright (C) 2012 Christophe Battarel - * Copyright (C) 2011-2016 Alexandre Spangaro + * Copyright (C) 2011-2024 Alexandre Spangaro * Copyright (C) 2015 Ferran Marcet * Copyright (C) 2016 Raphaël Doursenaud * @@ -401,7 +401,9 @@ if ($action == 'disable_favorite') { $form = new Form($db); $formadmin = new FormAdmin($db); -llxHeader(); +$help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilité_en_Partie_Double#Configuration'; + +llxHeader('', $langs->trans("Pcg_version"), $help_url); $titre = $langs->trans($tablib[$id]); $linkback = ''; diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php index 48d7d86e89f..2f7f90e84d0 100644 --- a/htdocs/accountancy/admin/card.php +++ b/htdocs/accountancy/admin/card.php @@ -1,6 +1,6 @@ - * Copyright (C) 2013-2020 Alexandre Spangaro + * Copyright (C) 2013-2024 Alexandre Spangaro * Copyright (C) 2014 Florian Henry * * This program is free software; you can redistribute it and/or modify @@ -215,7 +215,7 @@ $accountsystem->fetch(getDolGlobalInt('CHARTOFACCOUNTS')); $title = $langs->trans('AccountAccounting')." - ".$langs->trans('Card'); -$help_url = 'EN:Category:Accounting'; +$help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilité_en_Partie_Double#Configuration'; llxheader('', $title, $help_url); diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php index 014de28bcf3..abc45763361 100644 --- a/htdocs/accountancy/admin/categories.php +++ b/htdocs/accountancy/admin/categories.php @@ -1,6 +1,6 @@ - * Copyright (C) 2017-2022 Alexandre Spangaro + * Copyright (C) 2017-2024 Alexandre Spangaro * Copyright (C) 2022 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify @@ -113,7 +113,9 @@ if ($action == 'delete') { $form = new Form($db); $formaccounting = new FormAccounting($db); -llxheader('', $langs->trans('AccountingCategory')); +$help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilité_en_Partie_Double#Configuration'; + +llxheader('', $langs->trans('AccountingCategory'), $help_url); $linkback = ''.$langs->trans("BackToList").''; $titlepicto = 'setup'; diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php index 66f411c8cca..3fa664f5421 100644 --- a/htdocs/accountancy/admin/categories_list.php +++ b/htdocs/accountancy/admin/categories_list.php @@ -1,6 +1,6 @@ - * Copyright (C) 2011-2021 Alexandre Spangaro +/* Copyright (C) 2004-2023 Laurent Destailleur + * Copyright (C) 2011-2024 Alexandre Spangaro * * 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 @@ -414,7 +414,9 @@ if ($action == 'disable_favorite') { $form = new Form($db); $formadmin = new FormAdmin($db); -llxHeader('', $langs->trans('DictionaryAccountancyCategory')); +$help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilité_en_Partie_Double#Configuration'; + +llxHeader('', $langs->trans('DictionaryAccountancyCategory'), $help_url); $titre = $langs->trans($tablib[$id]); $linkback = ''; diff --git a/htdocs/accountancy/admin/closure.php b/htdocs/accountancy/admin/closure.php index faf5360c984..1979b666051 100644 --- a/htdocs/accountancy/admin/closure.php +++ b/htdocs/accountancy/admin/closure.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2019-2024 Alexandre Spangaro * * 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 @@ -101,7 +101,11 @@ if ($action == 'update') { $form = new Form($db); $formaccounting = new FormAccounting($db); -llxHeader(); +$title = $langs->trans('Closure'); + +$help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilité_en_Partie_Double#Configuration'; + +llxHeader('', $title, $help_url); $linkback = ''; print load_fiche_titre($langs->trans('MenuClosureAccounts'), $linkback, 'title_accountancy'); diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php index 48e4181b8e5..3eace908373 100644 --- a/htdocs/accountancy/admin/defaultaccounts.php +++ b/htdocs/accountancy/admin/defaultaccounts.php @@ -1,7 +1,7 @@ * Copyright (C) 2013-2014 Florian Henry - * Copyright (C) 2013-2023 Alexandre Spangaro + * Copyright (C) 2013-2024 Alexandre Spangaro * Copyright (C) 2014-2015 Ari Elbaz (elarifr) * Copyright (C) 2014 Marcos García * Copyright (C) 2014 Juanjo Menent @@ -198,7 +198,9 @@ if ($action == 'setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT') { $form = new Form($db); $formaccounting = new FormAccounting($db); -llxHeader(); +$help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilité_en_Partie_Double#Configuration'; + +llxHeader('', $langs->trans('MenuDefaultAccounts'), $help_url); $linkback = ''; print load_fiche_titre($langs->trans('MenuDefaultAccounts'), $linkback, 'title_accountancy'); diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php index 70dd216b7c9..902b184a48c 100644 --- a/htdocs/accountancy/admin/export.php +++ b/htdocs/accountancy/admin/export.php @@ -1,6 +1,6 @@ - * Copyright (C) 2013-2022 Alexandre Spangaro + * Copyright (C) 2013-2024 Alexandre Spangaro * Copyright (C) 2014 Florian Henry * Copyright (C) 2014 Marcos García * Copyright (C) 2014 Juanjo Menent @@ -134,9 +134,9 @@ if ($action == 'update') { $form = new Form($db); +$help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilité_en_Partie_Double#Configuration'; $title = $langs->trans('ExportOptions'); -llxHeader('', $title); - +llxHeader('', $title, $help_url); $linkback = ''; // $linkback = '' . $langs->trans("BackToModuleList") . ''; diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php index 4cbb6045d74..cb142948096 100644 --- a/htdocs/accountancy/admin/fiscalyear.php +++ b/htdocs/accountancy/admin/fiscalyear.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2013-2024 Alexandre Spangaro * * 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 @@ -87,7 +87,7 @@ $fiscalyearstatic = new Fiscalyear($db); $title = $langs->trans('AccountingPeriods'); -$help_url = "EN:Module_Double_Entry_Accounting"; +$help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilité_en_Partie_Double#Configuration'; llxHeader('', $title, $help_url); diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php index 914bc34ccb6..ee587a31f96 100644 --- a/htdocs/accountancy/admin/fiscalyear_card.php +++ b/htdocs/accountancy/admin/fiscalyear_card.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2014-2024 Alexandre Spangaro * Copyright (C) 2018 Frédéric France * * This program is free software; you can redistribute it and/or modify @@ -181,7 +181,7 @@ if ($action == 'create') { $title = $langs->trans("NewFiscalYear"); } -$help_url = "EN:Module_Double_Entry_Accounting"; +$help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilité_en_Partie_Double#Configuration'; llxHeader('', $title, $help_url); diff --git a/htdocs/accountancy/admin/fiscalyear_info.php b/htdocs/accountancy/admin/fiscalyear_info.php index 918a5b22db1..39754c0345d 100644 --- a/htdocs/accountancy/admin/fiscalyear_info.php +++ b/htdocs/accountancy/admin/fiscalyear_info.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2014-2024 Alexandre Spangaro * * 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 @@ -45,7 +45,7 @@ $id = GETPOST('id', 'int'); $title = $langs->trans("Fiscalyear")." - ".$langs->trans("Info"); -$help_url = "EN:Module_Double_Entry_Accounting"; +$help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilité_en_Partie_Double#Configuration'; llxHeader('', $title, $help_url); diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php index acff0845286..636026e526c 100644 --- a/htdocs/accountancy/admin/index.php +++ b/htdocs/accountancy/admin/index.php @@ -1,13 +1,13 @@ - * Copyright (C) 2013-2014 Florian Henry - * Copyright (C) 2013-2023 Alexandre Spangaro - * Copyright (C) 2014-2015 Ari Elbaz (elarifr) - * Copyright (C) 2014 Marcos García - * Copyright (C) 2014 Juanjo Menent - * Copyright (C) 2015 Jean-François Ferry - * Copyright (C) 2017 Laurent Destailleur - * Copyright (C) 2021 Ferran Marcet +/* Copyright (C) 2013-2014 Olivier Geffroy + * Copyright (C) 2013-2014 Florian Henry + * Copyright (C) 2013-2024 Alexandre Spangaro + * Copyright (C) 2014-2015 Ari Elbaz (elarifr) + * Copyright (C) 2014 Marcos García + * Copyright (C) 2014 Juanjo Menent + * Copyright (C) 2015 Jean-François Ferry + * Copyright (C) 2017 Laurent Destailleur + * Copyright (C) 2021 Ferran Marcet * * 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 @@ -275,8 +275,8 @@ if ($action == 'setenablevatreversecharge') { $form = new Form($db); $title = $langs->trans('ConfigAccountingExpert'); - -llxHeader('', $title); +$help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilité_en_Partie_Double#Configuration'; +llxHeader('', $title, $help_url); $linkback = ''; diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php index c1ad8bdb0c5..5c739dbc2dd 100644 --- a/htdocs/accountancy/admin/journals_list.php +++ b/htdocs/accountancy/admin/journals_list.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2017-2024 Alexandre Spangaro * * 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 @@ -351,7 +351,9 @@ if ($action == $acts[1]) { $form = new Form($db); $formadmin = new FormAdmin($db); -llxHeader(); +$title = $langs->trans('AccountingJournals'); +$help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilité_en_Partie_Double#Configuration'; +llxHeader('', $title, $help_url); $titre = $langs->trans("DictionarySetup"); $linkback = ''; @@ -367,7 +369,6 @@ print load_fiche_titre($titre, $linkback, $titlepicto); if ($action == 'delete') { print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1); } -//var_dump($elementList); /* * Show a dictionary diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index ca5516547ec..903375f5920 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -1,10 +1,10 @@ - * Copyright (C) 2013-2022 Alexandre Spangaro - * Copyright (C) 2014 Florian Henry - * Copyright (C) 2014 Juanjo Menent - * Copyright (C) 2015 Ari Elbaz (elarifr) - * Copyright (C) 2021 Gauthier VERDOL +/* Copyright (C) 2013-2014 Olivier Geffroy + * Copyright (C) 2013-2024 Alexandre Spangaro + * Copyright (C) 2014 Florian Henry + * Copyright (C) 2014 Juanjo Menent + * Copyright (C) 2015 Ari Elbaz (elarifr) + * Copyright (C) 2021 Gauthier VERDOL * * 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 @@ -296,14 +296,14 @@ $aacompta_prodsell_export = getDolGlobalString('ACCOUNTING_PRODUCT_SOLD_EXPORT $title = $langs->trans("ProductsBinding"); -$helpurl = ''; +$help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilité_en_Partie_Double#Configuration'; $paramsCat = ''; foreach ($searchCategoryProductList as $searchCategoryProduct) { $paramsCat .= "&search_category_product_list[]=".urlencode($searchCategoryProduct); } -llxHeader('', $title, $helpurl, '', 0, 0, array(), array(), $paramsCat, ''); +llxHeader('', $title, $help_url, '', 0, 0, array(), array(), $paramsCat, ''); $pcgverid = getDolGlobalString('CHARTOFACCOUNTS'); $pcgvercode = dol_getIdFromCode($db, $pcgverid, 'accounting_system', 'rowid', 'pcg_version'); diff --git a/htdocs/accountancy/admin/subaccount.php b/htdocs/accountancy/admin/subaccount.php index 69c2f458786..fb9a61e36d0 100644 --- a/htdocs/accountancy/admin/subaccount.php +++ b/htdocs/accountancy/admin/subaccount.php @@ -1,7 +1,7 @@ - * Copyright (C) 2013-2020 Alexandre Spangaro - * Copyright (C) 2016-2018 Laurent Destailleur +/* Copyright (C) 2013-2016 Olivier Geffroy + * Copyright (C) 2013-2024 Alexandre Spangaro + * Copyright (C) 2016-2018 Laurent Destailleur * * 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 @@ -126,7 +126,7 @@ $form = new Form($db); // Page Header -$help_url = 'EN:Module_Double_Entry_Accounting#Setup'; +$help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilité_en_Partie_Double#Configuration'; $title = $langs->trans('ChartOfIndividualAccountsOfSubsidiaryLedger'); llxHeader('', $title, $help_url); diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php index aaba332d2ef..0a097d5a036 100644 --- a/htdocs/accountancy/bookkeeping/balance.php +++ b/htdocs/accountancy/bookkeeping/balance.php @@ -1,7 +1,7 @@ * Copyright (C) 2016 Florian Henry - * Copyright (C) 2016-2023 Alexandre Spangaro + * Copyright (C) 2016-2024 Alexandre Spangaro * Copyright (C) 2018 Frédéric France * * This program is free software; you can redistribute it and/or modify @@ -248,7 +248,9 @@ if ($type == 'sub') { $title_page = $langs->trans("AccountBalance"); } -llxHeader('', $title_page); +$help_url = 'EN:Module_Double_Entry_Accounting|FR:Module_Comptabilité_en_Partie_Double'; + +llxHeader('', $title_page, $help_url); if ($action != 'export_csv') { diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php index 842059eadb0..7d42cb64a00 100644 --- a/htdocs/accountancy/bookkeeping/card.php +++ b/htdocs/accountancy/bookkeeping/card.php @@ -1,7 +1,7 @@ * Copyright (C) 2013-2017 Florian Henry - * Copyright (C) 2013-2022 Alexandre Spangaro + * Copyright (C) 2013-2024 Alexandre Spangaro * Copyright (C) 2017 Laurent Destailleur * Copyright (C) 2018-2020 Frédéric France * @@ -334,8 +334,8 @@ $form = new Form($db); $formaccounting = new FormAccounting($db); $title = $langs->trans("CreateMvts"); - -llxHeader('', $title); +$help_url = 'EN:Module_Double_Entry_Accounting|FR:Module_Comptabilité_en_Partie_Double'; +llxHeader('', $title, $help_url); // Confirmation to delete the command if ($action == 'delete') { diff --git a/htdocs/accountancy/bookkeeping/export.php b/htdocs/accountancy/bookkeeping/export.php index 0d4b02386e1..498a8ee2ed3 100644 --- a/htdocs/accountancy/bookkeeping/export.php +++ b/htdocs/accountancy/bookkeeping/export.php @@ -1,7 +1,7 @@ * Copyright (C) 2013-2016 Florian Henry - * Copyright (C) 2013-2023 Alexandre Spangaro + * Copyright (C) 2013-2024 Alexandre Spangaro * Copyright (C) 2022 Lionel Vessiller * Copyright (C) 2016-2017 Laurent Destailleur * Copyright (C) 2018-2021 Frédéric France @@ -708,8 +708,9 @@ $arrayofselected = is_array($toselect) ? $toselect : array(); // Output page // -------------------------------------------------------------------- +$help_url ='EN:Module_Double_Entry_Accounting#Exports|FR:Module_Comptabilité_en_Partie_Double#Exports'; -llxHeader('', $title_page); +llxHeader('', $title_page, $help_url); $formconfirm = ''; diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index 7a10c5d96d6..ed00a185230 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -1,7 +1,7 @@ * Copyright (C) 2013-2016 Florian Henry - * Copyright (C) 2013-2023 Alexandre Spangaro + * Copyright (C) 2013-2024 Alexandre Spangaro * Copyright (C) 2022 Lionel Vessiller * Copyright (C) 2016-2017 Laurent Destailleur * Copyright (C) 2018-2021 Frédéric France @@ -711,8 +711,8 @@ $arrayofselected = is_array($toselect) ? $toselect : array(); // Output page // -------------------------------------------------------------------- - -llxHeader('', $title_page); +$help_url = 'EN:Module_Double_Entry_Accounting|FR:Module_Comptabilité_en_Partie_Double'; +llxHeader('', $title_page, $help_url); $formconfirm = ''; diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php index 51b37ce6651..e49424b71db 100644 --- a/htdocs/accountancy/bookkeeping/listbyaccount.php +++ b/htdocs/accountancy/bookkeeping/listbyaccount.php @@ -2,7 +2,7 @@ /* Copyright (C) 2016 Neil Orley * Copyright (C) 2013-2016 Olivier Geffroy * Copyright (C) 2013-2020 Florian Henry - * Copyright (C) 2013-2023 Alexandre Spangaro + * Copyright (C) 2013-2024 Alexandre Spangaro * Copyright (C) 2018 Frédéric France * * This program is free software; you can redistribute it and/or modify @@ -559,8 +559,8 @@ if ($type == 'sub') { $title_page .= $langs->trans("Bookkeeping"); } $title_page .= ')'; - -llxHeader('', $title_page); +$help_url = 'EN:Module_Double_Entry_Accounting|FR:Module_Comptabilité_en_Partie_Double'; +llxHeader('', $title_page, $help_url); // List $nbtotalofrecords = ''; diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php index 085c8a65e80..772d1672542 100644 --- a/htdocs/accountancy/closure/index.php +++ b/htdocs/accountancy/closure/index.php @@ -161,7 +161,7 @@ $formaccounting = new FormAccounting($db); $title = $langs->trans('Closure'); -$help_url ='EN:Module_Double_Entry_Accounting'; +$help_url ='EN:Module_Double_Entry_Accounting|FR:Module_Comptabilité_en_Partie_Double#Cl.C3.B4ture_annuelle'; llxHeader('', $title, $help_url); diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php index 4d29a60f1d9..3102b023015 100644 --- a/htdocs/accountancy/customer/card.php +++ b/htdocs/accountancy/customer/card.php @@ -1,7 +1,7 @@ - * Copyright (C) 2013-2014 Florian Henry - * Copyright (C) 2013-2021 Alexandre Spangaro +/* Copyright (C) 2013-2014 Olivier Geffroy + * Copyright (C) 2013-2014 Florian Henry + * Copyright (C) 2013-2024 Alexandre Spangaro * * 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 @@ -84,8 +84,9 @@ if ($action == 'ventil' && $user->hasRight('accounting', 'bind', 'write')) { /* * View */ +$help_url ='EN:Module_Double_Entry_Accounting|FR:Module_Comptabilité_en_Partie_Double#Liaisons_comptables'; -llxHeader("", $langs->trans('FicheVentilation')); +llxHeader("", $langs->trans('FicheVentilation'), $help_url); if ($cancel == $langs->trans("Cancel")) { $action = ''; diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php index 3a9eced377c..018f222daf8 100644 --- a/htdocs/accountancy/customer/index.php +++ b/htdocs/accountancy/customer/index.php @@ -299,8 +299,9 @@ if ($action == 'validatehistory') { /* * View */ +$help_url ='EN:Module_Double_Entry_Accounting|FR:Module_Comptabilité_en_Partie_Double#Liaisons_comptables'; -llxHeader('', $langs->trans("CustomersVentilation")); +llxHeader('', $langs->trans("CustomersVentilation"), $help_url); $textprevyear = ''.img_previous().''; $textnextyear = ' '.img_next().''; diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php index 4929b45ac67..2a08eb3986c 100644 --- a/htdocs/accountancy/customer/lines.php +++ b/htdocs/accountancy/customer/lines.php @@ -175,7 +175,9 @@ if (GETPOST('sortfield') == 'f.datef, f.ref, fd.rowid') { $form = new Form($db); $formother = new FormOther($db); -llxHeader('', $langs->trans("CustomersVentilation").' - '.$langs->trans("Dispatched")); +$help_url ='EN:Module_Double_Entry_Accounting|FR:Module_Comptabilité_en_Partie_Double#Liaisons_comptables'; + +llxHeader('', $langs->trans("CustomersVentilation").' - '.$langs->trans("Dispatched"), $help_url); print '