diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index b221f3115fe..ef974d9e763 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,13 +1,13 @@
How to contribute to Dolibarr
=============================
-Bug reports and feature requests
---------------------------------
+Send a Bug reports or a Feature request
+---------------------------------------
-*Note*: **GitHub Issues is not a support forum.** If you have questions about Dolibarr / need help using the software, please use [the forums](https://www.dolibarr.org/forum.php). Forums exist in different languages.
+*Note*: **GitHub Issues is not a support forum.** If you have questions about Dolibarr / need help on using the software, please use [the forums](https://www.dolibarr.org/forum.php). Forums exist in different languages.
-Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues).
-Default **language here is English**. So please prepare your contributions in English.
+Issues to inform about a bug or a development trouble, like requests for a new feature, are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues).
+Default **language here is English**. So please prepare your contributions in English (we recommand using an online translation service if you don't know English).
1. Please [use the search engine](https://help.github.com/articles/searching-issues) to check if nobody's already reported your problem.
2. [Create an issue](https://help.github.com/articles/creating-an-issue). Choose an appropriate title. Prepend appropriately with Bug or Feature Request.
@@ -18,11 +18,23 @@ Default **language here is English**. So please prepare your contributions in En
-Submit code
+
+
+Submit code
---------------------
+This process describes how a Developer can submit code to the project so it can be analysezd and validated by the Merger (we call this a Pull Request).
+
+Definition:
+- The Developer: is the human knowing the development language of the application that want to change some part of the code by making changement on the sources of the project.
+- The Merger: is the human knowing the development and check that the code submitted for approbation is correct to validate it, in other word, the Merger is the approbator of commits.
+- The Releaser: is the human that validates that there a freeze/beta version is ok to be released officialy as a stable version.
+
+
### Basic workflow
+As the Developer:
+
1. [Fork](https://help.github.com/articles/fork-a-repo) the [GitHub repository](https://github.com/Dolibarr/dolibarr).
2. Clone your fork.
3. Choose a branch(See the [Branches](#branches) section below).
@@ -30,8 +42,19 @@ Default **language here is English**. So please prepare your contributions in En
5. Commit and push your changes.
6. [Make a pull request](https://help.github.com/articles/creating-a-pull-request).
+As the Merger:
+
+7. The Merger will check and say if he approves or not the commits. During this step, the Merger can modify your own code to make it valid for appobation or ask you to make the change yourself. For this the Merger may add commits himself. Depending on the tools used (can be done from github directly orfrom an IDE), such commits may be done directly after having validating your PR (for example to complete it).
+
+Note: Of course, the Merger, does not need to ask to himself if he is ok to validate a commit he did himself. This is a reason why the Merger can validate commits he did directly without passing by the approbation process described for the Developer.
+
+As the Releaser:
+
+8. A tag will be added to take a photo of the code will all the changes approved by the Merger, when he decide to do a release.
+
+
### Branches
Unless you're fixing a bug, all pull requests should be made against the *develop* branch.
@@ -39,18 +62,24 @@ Unless you're fixing a bug, all pull requests should be made against the *develo
If you're fixing a bug, it is preferred that you cook your fix and pull request it against an oldest version affected.
We recommend to push it into N - 2 for N the latest version available, if not possible into version N - 1, and finally into develop.
-This is just a recommendation, currently, if you push a bug fix on a very old version, it is still merged and propagated into
-higher versions.
+This is just a recommendation, currently, if you push a bug fix on a very old version, it is still merged and propagated into higher versions.
-The rule N - 2 is just a tip if you don't know which version to choose to get the best the best compromise between ease of correction
-and number of potential beneficiaries of the correction.
+The rule N - 2 is just a tip if you don't know which version to choose to get the best compromise between ease of correction and number of potential beneficiaries of the correction.
### General rules
-Please don't edit the ChangeLog file. This file is generated from all commit messages during release process by the project manager.
+
+- As the Developer, please don't edit the ChangeLog file. This file is generated from all commit messages during the release process by the Project releaser.
+
+- As the Developer: Do not submit changes into files xx_XX/afile.lang. They are language files and are updated automatically by sync from Transifex. If you need to add a new language file, just add it for the en_US language.
+
+- As the Releaser: The releaser will decide to make a new release as soon as the planning of the release is reached and the code in the branch to release reach the status "No more known serious bug known".
-### Commits
+
+
+### Commits
+
Use clear commit messages with the following structure:
```plaintext
diff --git a/ChangeLog b/ChangeLog
index 2777680bc0f..a56a9462451 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -276,7 +276,6 @@ QUAL: professional identifiers - remove TODO by adding profid.lib.php
QUAL: Properties ->date_update and ->date_modification were merged
QUAL: removed duplicate language file
QUAL: Remove the external js library jstimezonedetect
-QUAL: Remove use of customurl filter. Must use the USF syntax.
QUAL: Rename all input fields "tel" into "phone"
QUAL: Rename column fk_origin_line on shipment lines into fk_elementdet to match a generic use. (#28989)
QUAL: replace $conf->global with getDolGlobalString()
@@ -301,6 +300,7 @@ The following changes may create regressions for some external modules, but were
* All CLI tools (into /scripts) return a positive value to the shell if error (0 remains success) for a better
cross platform compatibility. On linux the exit(-1) was caught as 255, it may be now exit(1) so will be caught as 1.
* The parameter $filter of method fetchAll does not accept array of SQL but must be a string of an Universal Search Filter syntax.
+* Remove use of customurl into $filter. Must use the USF syntax.
* Use of dol_eval with parameter $returnvalue=0 is deprecated.
* The signature for all ->delete() method has been modified to match the modulebuilder template (so first param is now always $user), except
the delete for thirdparty (still accept the id of thirdparty to delete as first parameter). Will probably be modified into another version.
@@ -316,7 +316,6 @@ The following changes may create regressions for some external modules, but were
* The signature of method fetch() of class CompanyBankAccount has been modified to match the signature of method Account->fetch()
-
***** ChangeLog for 19.0.2 compared to 19.0.1 *****
FIX: $object->oldcopy may be a stdClass and not original object
FIX: 16.0 - parent company gets emptied when updating a third party from the card in edit mode (#28269)
diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
index d86b652ccb6..e08db3c0ccb 100755
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -33,7 +33,7 @@ $path = dirname(__FILE__).'/';
// Test if batch mode
if (substr($sapi_type, 0, 3) == 'cgi') {
echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
- exit;
+ exit(1);
}
require_once $path."../htdocs/master.inc.php";
@@ -51,7 +51,7 @@ $buildzip = 0;
if (empty($argv[1])) {
print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value] [buildzip=1]\n";
print "Example: ".$script_file." release=6.0.0 includecustom=1 includeconstant=FR:INVOICE_CAN_ALWAYS_BE_REMOVED:0 includeconstant=all:MAILING_NO_USING_PHPMAIL:1\n";
- exit -1;
+ exit(1);
}
@@ -87,7 +87,7 @@ while ($i < $argc) {
if (empty($release)) {
print "Error: Missing release parameter\n";
print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
- exit -1;
+ exit(2);
}
$savrelease = $release;
@@ -107,21 +107,21 @@ if (empty($includecustom)) {
if (DOL_VERSION != $tmpverbis[0] && $savrelease != 'auto') {
print 'Error: When parameter "includecustom" is not set and there is no suffix in release parameter, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
- exit -1;
+ exit(3);
}
} else {
$tmpverter = explode('-', DOL_VERSION, 2);
if ($tmpverter[0] != $tmpverbis[0]) {
print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must have value without prefix ('.$tmpverter[0].') that is exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
- exit -1;
+ exit(4);
}
}
} else {
if (!preg_match('/'.preg_quote(DOL_VERSION, '/').'-/', $release)) {
print 'Error: When parameter "includecustom" is set, version declared into filefunc.inc.php ('.DOL_VERSION.') must be used with a suffix into "release" parameter (ex: '.DOL_VERSION.'-mydistrib).'."\n";
print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
- exit -1;
+ exit(5);
}
}
@@ -147,7 +147,7 @@ $outputfile = $outputdir.'/filelist-'.$release.'.xml';
$fp = fopen($outputfile, 'w');
if (empty($fp)) {
print 'Failed to open file '.$outputfile."\n";
- exit(-1);
+ exit(6);
}
fputs($fp, ''."\n");
diff --git a/dev/tools/codespell/codespell-lines-ignore.txt b/dev/tools/codespell/codespell-lines-ignore.txt
index 9029f7b0162..c04c6d0446d 100644
--- a/dev/tools/codespell/codespell-lines-ignore.txt
+++ b/dev/tools/codespell/codespell-lines-ignore.txt
@@ -58,7 +58,7 @@
$this->datee = $this->db->jdate($obj->datee);
$this->periode = $this->db->jdate($obj->period);
$tmp = array('id_users' => $obj->id_users, 'nom' => $obj->name, 'reponses' => $obj->reponses);
- $tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0, true); // Disable hook for the moment
+ $tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0, 1); // Disable hook for the moment
//si les reponses ne concerne pas la colonne effacée, on concatenate
GETPOST("mouvement", 'alpha'),
GETPOSTINT("mouvement"),
diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index ef24e13faff..1f83048b7b5 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -47,7 +47,7 @@ return [
// PhanPluginConstantVariableNull : 10+ occurrences
// PhanPluginDuplicateExpressionBinaryOp : 10+ occurrences
// PhanPluginSuspiciousParamPosition : 10+ occurrences
- // PhanRedefineClass : 10+ occurrences
+ // PhanRedefineClass : 3 occurrences
// PhanTypeMismatchDimFetchNullable : 10+ occurrences
// PhanEmptyFQSENInClasslike : 5 occurrences
// PhanInvalidFQSENInClasslike : 4 occurrences
@@ -704,7 +704,7 @@ return [
'htdocs/core/modules/expedition/doc/pdf_rouget.modules.php' => ['PhanPluginDuplicateExpressionAssignmentOperation', 'PhanPluginUnknownObjectMethodCall', 'PhanPluginUnknownPropertyType', 'PhanTypeMismatchArgumentNullableInternal', 'PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
'htdocs/core/modules/expedition/mod_expedition_ribera.php' => ['PhanTypeMismatchArgumentProbablyReal'],
'htdocs/core/modules/expedition/modules_expedition.php' => ['PhanPluginUnknownArrayMethodReturnType'],
- 'htdocs/core/modules/expensereport/doc/pdf_standard.modules.php' => ['PhanPluginDuplicateExpressionAssignmentOperation', 'PhanPluginUnknownPropertyType', 'PhanRedefineClass', 'PhanTypeInvalidLeftOperandOfNumericOp', 'PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
+ 'htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php' => ['PhanPluginDuplicateExpressionAssignmentOperation', 'PhanPluginUnknownPropertyType', 'PhanTypeInvalidLeftOperandOfNumericOp', 'PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
'htdocs/core/modules/expensereport/mod_expensereport_sand.php' => ['PhanTypeMismatchArgumentProbablyReal'],
'htdocs/core/modules/expensereport/modules_expensereport.php' => ['PhanPluginUnknownArrayMethodReturnType'],
'htdocs/core/modules/export/export_csviso.modules.php' => ['PhanPluginUnknownArrayMethodParamType'],
@@ -724,7 +724,7 @@ return [
'htdocs/core/modules/fichinter/modules_fichinter.php' => ['PhanPluginUnknownArrayMethodReturnType', 'PhanPluginUnknownObjectMethodCall'],
'htdocs/core/modules/holiday/mod_holiday_immaculate.php' => ['PhanTypeMismatchArgumentProbablyReal'],
'htdocs/core/modules/holiday/modules_holiday.php' => ['PhanPluginUnknownArrayMethodReturnType'],
- 'htdocs/core/modules/hrm/doc/pdf_standard.modules.php' => ['PhanPluginDuplicateExpressionAssignmentOperation', 'PhanPluginUnknownPropertyType', 'PhanRedefineClass', 'PhanTypeInvalidLeftOperandOfNumericOp', 'PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
+ 'htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php' => ['PhanPluginDuplicateExpressionAssignmentOperation', 'PhanPluginUnknownPropertyType', 'PhanTypeInvalidLeftOperandOfNumericOp', 'PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
'htdocs/core/modules/hrm/mod_evaluation_advanced.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
'htdocs/core/modules/hrm/modules_evaluation.php' => ['PhanPluginUnknownArrayMethodReturnType'],
'htdocs/core/modules/import/import_csv.modules.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownObjectMethodCall', 'PhanPluginUnknownPropertyType', 'PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty'],
@@ -740,11 +740,11 @@ return [
'htdocs/core/modules/mailings/xinputfile.modules.php' => ['PhanPluginUnknownArrayMethodReturnType'],
'htdocs/core/modules/mailings/xinputuser.modules.php' => ['PhanPluginUnknownArrayMethodReturnType'],
'htdocs/core/modules/member/doc/doc_generic_member_odt.class.php' => ['PhanPluginUnknownArrayMethodReturnType', 'PhanPossiblyUndeclaredVariable', 'PhanTypeSuspiciousNonTraversableForeach'],
- 'htdocs/core/modules/member/doc/pdf_standard.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanRedefineClass'],
+ 'htdocs/core/modules/member/doc/pdf_standard_member.class.php' => ['PhanPluginUnknownArrayMethodParamType'],
'htdocs/core/modules/member/modules_cards.php' => ['PhanPluginUnknownArrayFunctionParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanPluginUnknownObjectMethodCall'],
'htdocs/core/modules/member/modules_member.class.php' => ['PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgumentProbablyReal'],
'htdocs/core/modules/modFacture.class.php' => ['PhanPluginDuplicateExpressionAssignmentOperation'],
- 'htdocs/core/modules/movement/doc/pdf_standard.modules.php' => ['PhanPluginDuplicateExpressionAssignmentOperation', 'PhanPluginDuplicateExpressionBinaryOp', 'PhanPluginEmptyStatementIf', 'PhanPluginUnknownObjectMethodCall', 'PhanPluginUnknownPropertyType', 'PhanPossiblyUndeclaredVariable', 'PhanRedefineClass', 'PhanUndeclaredMethod'],
+ 'htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php' => ['PhanPluginDuplicateExpressionAssignmentOperation', 'PhanPluginDuplicateExpressionBinaryOp', 'PhanPluginEmptyStatementIf', 'PhanPluginUnknownObjectMethodCall', 'PhanPluginUnknownPropertyType', 'PhanPossiblyUndeclaredVariable', 'PhanUndeclaredMethod'],
'htdocs/core/modules/movement/modules_movement.php' => ['PhanPluginUnknownArrayMethodReturnType'],
'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanPluginDuplicateExpressionAssignmentOperation', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty', 'PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
'htdocs/core/modules/mrp/mod_mo_advanced.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
@@ -761,7 +761,7 @@ return [
'htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php' => ['PhanPluginUnknownArrayMethodParamType'],
'htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php' => ['PhanPluginUnknownArrayMethodParamType'],
'htdocs/core/modules/printsheet/modules_labels.php' => ['PhanPluginUnknownArrayFunctionParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanPluginUnknownObjectMethodCall'],
- 'htdocs/core/modules/product/doc/pdf_standard.modules.php' => ['PhanPluginDuplicateExpressionAssignmentOperation', 'PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredVariable', 'PhanRedefineClass', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredMethod'],
+ 'htdocs/core/modules/product/doc/pdf_standard.modules.php' => ['PhanPluginDuplicateExpressionAssignmentOperation', 'PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredMethod'],
'htdocs/core/modules/product/modules_product.class.php' => ['PhanPluginUnknownArrayMethodReturnType'],
'htdocs/core/modules/product_batch/mod_lot_advanced.php' => ['PhanTypeMismatchArgumentProbablyReal'],
'htdocs/core/modules/product_batch/mod_lot_free.php' => ['PhanTypeMismatchArgumentProbablyReal'],
@@ -788,7 +788,7 @@ return [
'htdocs/core/modules/societe/mod_codecompta_aquarium.php' => ['PhanPluginUnknownPropertyType'],
'htdocs/core/modules/societe/mod_codecompta_digitaria.php' => ['PhanPluginUnknownPropertyType', 'PhanPossiblyUndeclaredVariable', 'PhanTypeInvalidLeftOperandOfNumericOp', 'PhanTypeMismatchArgumentNullableInternal'],
'htdocs/core/modules/societe/modules_societe.class.php' => ['PhanPluginUnknownArrayMethodReturnType'],
- 'htdocs/core/modules/stock/doc/pdf_standard.modules.php' => ['PhanPluginDuplicateExpressionAssignmentOperation', 'PhanPluginUnknownPropertyType', 'PhanPossiblyUndeclaredVariable', 'PhanRedefineClass', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredMethod'],
+ 'htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php' => ['PhanPluginDuplicateExpressionAssignmentOperation', 'PhanPluginUnknownPropertyType', 'PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredMethod'],
'htdocs/core/modules/stock/modules_stock.php' => ['PhanPluginUnknownArrayMethodReturnType'],
'htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php' => ['PhanPluginDuplicateExpressionAssignmentOperation', 'PhanPluginUnknownObjectMethodCall', 'PhanPossiblyUndeclaredVariable', 'PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
'htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php' => ['PhanPluginDuplicateExpressionAssignmentOperation', 'PhanPluginUnknownObjectMethodCall', 'PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty', 'PhanUndeclaredMethod'],
@@ -804,7 +804,7 @@ return [
'htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php' => ['PhanPossiblyUndeclaredVariable'],
'htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php' => ['PhanTypeMismatchArgumentProbablyReal'],
'htdocs/core/modules/supplier_order/modules_commandefournisseur.php' => ['PhanPluginUnknownArrayMethodReturnType', 'PhanPluginUnknownPropertyType'],
- 'htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php' => ['PhanPluginUnknownPropertyType', 'PhanRedefineClass', 'PhanUndeclaredMethod'],
+ 'htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php' => ['PhanPluginUnknownPropertyType', 'PhanUndeclaredMethod'],
'htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php' => ['PhanTypeMismatchArgumentProbablyReal'],
'htdocs/core/modules/supplier_payment/modules_supplier_payment.php' => ['PhanPluginUnknownArrayMethodReturnType'],
'htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php' => ['PhanPluginConstantVariableBool', 'PhanPluginUnknownObjectMethodCall', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 0f5b8213ab9..1d15ae5d3a3 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -492,7 +492,7 @@ if ($resql) {
// There is several pages
if ($num > $listlimit) {
print '
| ';
- print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '');
+ print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit ? 1 : 0), '');
print ' |
';
}
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 3e3a85c672e..4442b88a668 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -617,7 +617,7 @@ if ($resql) {
// There is several pages
if ($num > $listlimit) {
print '| ';
- print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '');
+ print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit ? 1 : 0), '');
print ' |
';
}
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 6b201fe8e13..ed021d04917 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -1,6 +1,7 @@
* Copyright (C) 2024 MDW
+ * Copyright (C) 2024 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
@@ -494,7 +495,7 @@ if ($id) {
// There is several pages
if ($num > $listlimit) {
print '| ';
- print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '');
+ print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit ? 1 : 0), '');
print ' |
';
}
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 40315b46433..a3318346695 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -9,7 +9,7 @@
* Copyright (C) 2022 Lionel Vessiller
* Copyright (C) 2013-2017 Olivier Geffroy
* Copyright (C) 2017 Elarifr. Ari Elbaz
- * Copyright (C) 2017-2019 Frédéric France
+ * Copyright (C) 2017-2024 Frédéric France
* Copyright (C) 2017 André Schild
* Copyright (C) 2020 Guillaume Alexandre
* Copyright (C) 2022 Joachim Kueter
@@ -1025,7 +1025,7 @@ class AccountancyExport
$arrayofinclusion = array();
// If it is a supplier invoice, we want to use last uploaded file
$arrayofinclusion[] = '^'.preg_quote($objectFileName, '/').(($line->doc_type == 'supplier_invoice') ? '.+' : '').'\.pdf$';
- $fileFoundList = dol_dir_list($objectDirPath.'/'.$objectFileName, 'files', 0, implode('|', $arrayofinclusion), '(\.meta|_preview.*\.png)$', 'date', SORT_DESC, 0, true);
+ $fileFoundList = dol_dir_list($objectDirPath.'/'.$objectFileName, 'files', 0, implode('|', $arrayofinclusion), '(\.meta|_preview.*\.png)$', 'date', SORT_DESC, 0, 1);
if (!empty($fileFoundList)) {
$attachmentFileNameTrunc = str_pad(self::trunc($line->piece_num, 8), 8, '0', STR_PAD_LEFT);
foreach ($fileFoundList as $fileFound) {
@@ -1491,7 +1491,7 @@ class AccountancyExport
$arrayofinclusion = array();
// If it is a supplier invoice, we want to use last uploaded file
$arrayofinclusion[] = '^'.preg_quote($objectFileName, '/').(($line->doc_type == 'supplier_invoice') ? '.+' : '').'\.pdf$';
- $fileFoundList = dol_dir_list($objectDirPath.'/'.$objectFileName, 'files', 0, implode('|', $arrayofinclusion), '(\.meta|_preview.*\.png)$', 'date', SORT_DESC, 0, true);
+ $fileFoundList = dol_dir_list($objectDirPath.'/'.$objectFileName, 'files', 0, implode('|', $arrayofinclusion), '(\.meta|_preview.*\.png)$', 'date', SORT_DESC, 0, 1);
if (!empty($fileFoundList)) {
$attachmentFileNameTrunc = $line->doc_ref;
foreach ($fileFoundList as $fileFound) {
@@ -1703,7 +1703,7 @@ class AccountancyExport
$arrayofinclusion = array();
// If it is a supplier invoice, we want to use last uploaded file
$arrayofinclusion[] = '^'.preg_quote($objectFileName, '/').(($line->doc_type == 'supplier_invoice') ? '.+' : '').'\.pdf$';
- $fileFoundList = dol_dir_list($objectDirPath.'/'.$objectFileName, 'files', 0, implode('|', $arrayofinclusion), '(\.meta|_preview.*\.png)$', 'date', SORT_DESC, 0, true);
+ $fileFoundList = dol_dir_list($objectDirPath.'/'.$objectFileName, 'files', 0, implode('|', $arrayofinclusion), '(\.meta|_preview.*\.png)$', 'date', SORT_DESC, 0, 1);
if (!empty($fileFoundList)) {
$attachmentFileNameTrunc = $line->doc_ref;
foreach ($fileFoundList as $fileFound) {
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index a4b757ef958..4c4be8bb0b0 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -1,11 +1,11 @@
- * Copyright (C) 2013-2024 Alexandre Spangaro
- * Copyright (C) 2014-2015 Ari Elbaz (elarifr)
- * Copyright (C) 2013-2021 Florian Henry
- * Copyright (C) 2014 Juanjo Menent
- * Copyright (C) 2016 Laurent Destailleur
- * Copyright (C) 2021 Gauthier VERDOL
+/* Copyright (C) 2013-2014 Olivier Geffroy
+ * Copyright (C) 2013-2024 Alexandre Spangaro
+ * Copyright (C) 2014-2015 Ari Elbaz (elarifr)
+ * Copyright (C) 2013-2021 Florian Henry
+ * Copyright (C) 2014 Juanjo Menent
+ * Copyright (C) 2016 Laurent Destailleur
+ * 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
@@ -232,7 +232,7 @@ $formother = new FormOther($db);
$help_url = 'EN:Module_Double_Entry_Accounting|FR:Module_Comptabilité_en_Partie_Double#Liaisons_comptables';
-llxHeader('', $langs->trans("CustomersVentilation"), $help_url, '', 0, 0, '', '', '', 'mod-accountancy accountancy-customer page-list');
+llxHeader('', $langs->trans("CustomersVentilation"), $help_url, '', 0, 0, '', '', '', 'bodyforlist mod-accountancy accountancy-customer page-list');
if (empty($chartaccountcode)) {
print $langs->trans("ErrorChartOfAccountSystemNotSelected");
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 667a20347df..c729802eaf2 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -1,11 +1,11 @@
- * Copyright (C) 2013-2024 Alexandre Spangaro
- * Copyright (C) 2014-2015 Ari Elbaz (elarifr)
- * Copyright (C) 2013-2014 Florian Henry
- * Copyright (C) 2014 Juanjo Menent
- * Copyright (C) 2016 Laurent Destailleur
- * Copyright (C) 2024 Frédéric France
+/* Copyright (C) 2013-2014 Olivier Geffroy
+ * Copyright (C) 2013-2024 Alexandre Spangaro
+ * Copyright (C) 2014-2015 Ari Elbaz (elarifr)
+ * Copyright (C) 2013-2014 Florian Henry
+ * Copyright (C) 2014 Juanjo Menent
+ * Copyright (C) 2016 Laurent Destailleur
+ * Copyright (C) 2024 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
@@ -225,7 +225,7 @@ $formother = new FormOther($db);
$help_url = 'EN:Module_Double_Entry_Accounting|FR:Module_Comptabilité_en_Partie_Double#Liaisons_comptables';
-llxHeader('', $langs->trans("ExpenseReportsVentilation"), $help_url, '', 0, 0, '', '', '', 'mod-accountancy accountancy-expensereport page-list');
+llxHeader('', $langs->trans("ExpenseReportsVentilation"), $help_url, '', 0, 0, '', '', '', 'bodyforlist mod-accountancy accountancy-expensereport page-list');
if (empty($chartaccountcode)) {
print $langs->trans("ErrorChartOfAccountSystemNotSelected");
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index a20724fbd84..3de0a96fa7c 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -242,6 +242,7 @@ if ($result) {
// one line tabpay = line into bank
// one line for bank record = tabbq
// one line for thirdparty record = tabtp
+ // Note: tabcompany is used to store the subledger account
$i = 0;
while ($i < $num) {
$obj = $db->fetch_object($result);
@@ -289,7 +290,8 @@ if ($result) {
);
// Set accountancy code for user
- // $obj->accountancy_code is the accountancy_code of table u=user but it is defined only if a link with type 'user' exists)
+ // $obj->accountancy_code is the accountancy_code of table u=user (but it is defined only if
+ // a link with type 'user' exists and user as a subledger account)
$compta_user = (!empty($obj->accountancy_code) ? $obj->accountancy_code : '');
$tabuser[$obj->rowid] = array(
@@ -408,13 +410,26 @@ if ($result) {
$userstatic->lastname = $tabuser[$obj->rowid]['lastname'];
$userstatic->status = $tabuser[$obj->rowid]['status'];
$userstatic->accountancy_code = $tabuser[$obj->rowid]['accountancy_code'];
+
+ // For a payment of social contribution, we have a link sc + user.
+ // but we already fill the $tabpay[$obj->rowid]["soclib"] in the line 'sc'.
+ // If we fill it here to, we must concat.
if ($userstatic->id > 0) {
- $tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(1, 'accountancy', 0);
+ if ($is_sc) {
+ $tabpay[$obj->rowid]["soclib"] .= ' '.$userstatic->getNomUrl(1, 'accountancy', 0);
+ } else {
+ $tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(1, 'accountancy', 0);
+ }
} else {
$tabpay[$obj->rowid]["soclib"] = '???'; // Should not happen, but happens with old data when id of user was not saved on expense report payment.
}
+
if ($compta_user) {
- $tabtp[$obj->rowid][$compta_user] += $amounttouse;
+ if ($is_sc) {
+ //$tabcompany[$obj->rowid][$compta_user] += $amounttouse;
+ } else {
+ $tabtp[$obj->rowid][$compta_user] += $amounttouse;
+ }
}
} elseif ($links[$key]['type'] == 'sc') {
$chargestatic->id = $links[$key]['url_id'];
@@ -431,6 +446,8 @@ if ($result) {
$chargestatic->label = $links[$key]['label'];
}
$chargestatic->ref = $chargestatic->label;
+ //$chargestatic->fetch($chargestatic->id);
+
$tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30);
$tabpay[$obj->rowid]["paymentscid"] = $chargestatic->id;
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index b2262067683..66f87389533 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -1,11 +1,11 @@
- * Copyright (C) 2013-2024 Alexandre Spangaro
- * Copyright (C) 2014-2015 Ari Elbaz (elarifr)
- * Copyright (C) 2013-2021 Florian Henry
- * Copyright (C) 2021 Gauthier VERDOL
- * Copyright (C) 2014 Juanjo Menent s
- * Copyright (C) 2016 Laurent Destailleur
+/* Copyright (C) 2013-2014 Olivier Geffroy
+ * Copyright (C) 2013-2024 Alexandre Spangaro
+ * Copyright (C) 2014-2015 Ari Elbaz (elarifr)
+ * Copyright (C) 2013-2021 Florian Henry
+ * Copyright (C) 2021 Gauthier VERDOL
+ * Copyright (C) 2014 Juanjo Menent s
+ * Copyright (C) 2016 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
@@ -234,7 +234,7 @@ $formother = new FormOther($db);
$help_url = 'EN:Module_Double_Entry_Accounting|FR:Module_Comptabilité_en_Partie_Double#Liaisons_comptables';
-llxHeader('', $langs->trans("SuppliersVentilation"), $help_url, '', 0, 0, '', '', '', 'mod-accountancy accountancy-supplier page-list');
+llxHeader('', $langs->trans("SuppliersVentilation"), $help_url, '', 0, 0, '', '', '', 'bodyforlist mod-accountancy accountancy-supplier page-list');
if (empty($chartaccountcode)) {
print $langs->trans("ErrorChartOfAccountSystemNotSelected");
diff --git a/htdocs/adherents/admin/member.php b/htdocs/adherents/admin/member.php
index 617e8037983..0f5af1d4817 100644
--- a/htdocs/adherents/admin/member.php
+++ b/htdocs/adherents/admin/member.php
@@ -1,16 +1,17 @@
- * Copyright (C) 2003 Jean-Louis Bergamo
- * Copyright (C) 2004-2012 Laurent Destailleur
- * Copyright (C) 2004 Sebastien Di Cintio
- * Copyright (C) 2004 Benoit Mortier
- * Copyright (C) 2005-2012 Regis Houssin
- * Copyright (C) 2011-2012 Juanjo Menent
- * Copyright (C) 2012 J. Fernando Lagrange
- * Copyright (C) 2015 Jean-François Ferry
- * Copyright (C) 2020-2021 Frédéric France
- * Copyright (C) 2023 Waël Almoman
+/* Copyright (C) 2003 Rodolphe Quiedeville
+ * Copyright (C) 2003 Jean-Louis Bergamo
+ * Copyright (C) 2004-2012 Laurent Destailleur
+ * Copyright (C) 2004 Sebastien Di Cintio
+ * Copyright (C) 2004 Benoit Mortier
+ * Copyright (C) 2005-2012 Regis Houssin
+ * Copyright (C) 2011-2012 Juanjo Menent
+ * Copyright (C) 2012 J. Fernando Lagrange
+ * Copyright (C) 2015 Jean-François Ferry
+ * Copyright (C) 2020-2021 Frédéric France
+ * Copyright (C) 2023 Waël Almoman
* Copyright (C) 2024 MDW
+ * Copyright (C) 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
@@ -219,9 +220,10 @@ if ($action == 'unset') {
$form = new Form($db);
+$title = $langs->trans("MembersSetup");
$help_url = 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder';
-llxHeader('', $langs->trans("MembersSetup"), $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-member page-admin');
$linkback = ''.$langs->trans("BackToModuleList").'';
diff --git a/htdocs/adherents/admin/member_emails.php b/htdocs/adherents/admin/member_emails.php
index 88d5e0e108a..ee99f4cdef4 100644
--- a/htdocs/adherents/admin/member_emails.php
+++ b/htdocs/adherents/admin/member_emails.php
@@ -1,13 +1,14 @@
- * Copyright (C) 2003 Jean-Louis Bergamo
- * Copyright (C) 2004-2012 Laurent Destailleur
- * Copyright (C) 2004 Sebastien Di Cintio
- * Copyright (C) 2004 Benoit Mortier
- * Copyright (C) 2005-2012 Regis Houssin
- * Copyright (C) 2011-2012 Juanjo Menent
- * Copyright (C) 2012 J. Fernando Lagrange
- * Copyright (C) 2015 Jean-François Ferry
+/* Copyright (C) 2003 Rodolphe Quiedeville
+ * Copyright (C) 2003 Jean-Louis Bergamo
+ * Copyright (C) 2004-2012 Laurent Destailleur
+ * Copyright (C) 2004 Sebastien Di Cintio
+ * Copyright (C) 2004 Benoit Mortier
+ * Copyright (C) 2005-2012 Regis Houssin
+ * Copyright (C) 2011-2012 Juanjo Menent
+ * Copyright (C) 2012 J. Fernando Lagrange
+ * Copyright (C) 2015 Jean-François Ferry
+ * Copyright (C) 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
@@ -135,9 +136,10 @@ if ($action == 'update' || $action == 'add') {
$form = new Form($db);
+$title = $langs->trans("MembersSetup");
$help_url = 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder';
-llxHeader('', $langs->trans("MembersSetup"), $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-member page-admin_emails');
$linkback = ''.$langs->trans("BackToModuleList").'';
diff --git a/htdocs/adherents/admin/member_extrafields.php b/htdocs/adherents/admin/member_extrafields.php
index b89a3a4cd05..e1ffbf5fceb 100644
--- a/htdocs/adherents/admin/member_extrafields.php
+++ b/htdocs/adherents/admin/member_extrafields.php
@@ -1,8 +1,9 @@
- * Copyright (C) 2003 Jean-Louis Bergamo
- * Copyright (C) 2004-2012 Laurent Destailleur
- * Copyright (C) 2012 Regis Houssin
+/* Copyright (C) 2001-2002 Rodolphe Quiedeville
+ * Copyright (C) 2003 Jean-Louis Bergamo
+ * Copyright (C) 2004-2012 Laurent Destailleur
+ * Copyright (C) 2012 Regis Houssin
+ * Copyright (C) 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
@@ -61,8 +62,10 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
$textobject = $langs->transnoentitiesnoconv("Members");
+$title = $langs->trans("MembersSetup");
$help_url = 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder';
-llxHeader('', $langs->trans("MembersSetup"), $help_url);
+
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-member page-admin_extrafields');
$linkback = ''.$langs->trans("BackToModuleList").'';
diff --git a/htdocs/adherents/admin/member_type_extrafields.php b/htdocs/adherents/admin/member_type_extrafields.php
index d8e935c592a..9ce9780f1d9 100644
--- a/htdocs/adherents/admin/member_type_extrafields.php
+++ b/htdocs/adherents/admin/member_type_extrafields.php
@@ -1,10 +1,11 @@
- * Copyright (C) 2003 Jean-Louis Bergamo
- * Copyright (C) 2004-2012 Laurent Destailleur
- * Copyright (C) 2012 Regis Houssin
- * Copyright (C) 2013 Florian Henry
- * Copyright (C) 2015 Jean-François Ferry
+/* Copyright (C) 2001-2002 Rodolphe Quiedeville
+ * Copyright (C) 2003 Jean-Louis Bergamo
+ * Copyright (C) 2004-2012 Laurent Destailleur
+ * Copyright (C) 2012 Regis Houssin
+ * Copyright (C) 2013 Florian Henry
+ * Copyright (C) 2015 Jean-François Ferry
+ * Copyright (C) 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
@@ -64,8 +65,10 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
$textobject = $langs->transnoentitiesnoconv("MembersTypes");
+$title = $langs->trans("MembersSetup");
$help_url = 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder';
-llxHeader('', $langs->trans("MembersSetup"), $help_url);
+
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-member page-admin_type_extrafields');
$linkback = ''.$langs->trans("BackToModuleList").'';
diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index df69c5274d5..d15f0d19605 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -1,8 +1,9 @@
- * Copyright (C) 2006-2015 Laurent Destailleur
- * Copyright (C) 2006-2012 Regis Houssin
- * Copyright (C) 2011 Juanjo Menent
+/* Copyright (C) 2001-2002 Rodolphe Quiedeville
+ * Copyright (C) 2006-2015 Laurent Destailleur
+ * Copyright (C) 2006-2012 Regis Houssin
+ * Copyright (C) 2011 Juanjo Menent
+ * Copyright (C) 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
@@ -104,7 +105,8 @@ $form = new Form($db);
$title = $langs->trans("MembersSetup");
$help_url = 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder';
-llxHeader('', $title, $help_url);
+
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-member page-admin_website');
$linkback = ''.$langs->trans("BackToModuleList").'';
diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index 286a66ea493..bd40ed7166e 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -1,10 +1,12 @@
- * Copyright (C) 2005 Brice Davoleau
- * Copyright (C) 2005-2009 Regis Houssin
- * Copyright (C) 2006-2011 Laurent Destailleur
- * Copyright (C) 2007 Patrick Raguin
- * Copyright (C) 2010 Juanjo Menent
+/* Copyright (C) 2001-2007 Rodolphe Quiedeville
+ * Copyright (C) 2005 Brice Davoleau
+ * Copyright (C) 2005-2009 Regis Houssin
+ * Copyright (C) 2006-2011 Laurent Destailleur
+ * Copyright (C) 2007 Patrick Raguin
+ * Copyright (C) 2010 Juanjo Menent
+ * Copyright (C) 2024 Alexandre Spangaro
+ * Copyright (C) 2024 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
@@ -135,7 +137,7 @@ if ($object->id > 0) {
$help_url = "EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder";
- llxHeader("", $title, $help_url);
+ llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-member page-card_agenda');
if (isModEnabled('notification')) {
$langs->load("mails");
@@ -190,7 +192,7 @@ if ($object->id > 0) {
$param .= '&limit='.$limit;
}
- print_barre_liste($langs->trans("ActionsOnMember"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', '', $newcardbutton, '', 0, 1, 0);
+ print_barre_liste($langs->trans("ActionsOnMember"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $newcardbutton, '', 0, 1, 0);
// List of all actions
$filters = array();
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 99eb76ee0bf..334ec4827f6 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1,14 +1,14 @@
- * Copyright (C) 2002-2003 Jean-Louis Bergamo
- * Copyright (C) 2004-2012 Laurent Destailleur
- * Copyright (C) 2005-2018 Regis Houssin
- * Copyright (C) 2012 Marcos García
- * Copyright (C) 2012-2020 Philippe Grand
- * Copyright (C) 2015-2024 Alexandre Spangaro
- * Copyright (C) 2018-2024 Frédéric France
- * Copyright (C) 2021 Waël Almoman
- * Copyright (C) 2024 MDW
+/* Copyright (C) 2001-2004 Rodolphe Quiedeville
+ * Copyright (C) 2002-2003 Jean-Louis Bergamo
+ * Copyright (C) 2004-2012 Laurent Destailleur
+ * Copyright (C) 2005-2018 Regis Houssin
+ * Copyright (C) 2012 Marcos García
+ * Copyright (C) 2012-2020 Philippe Grand
+ * Copyright (C) 2015-2024 Alexandre Spangaro
+ * Copyright (C) 2018-2024 Frédéric France
+ * Copyright (C) 2021 Waël Almoman
+ * Copyright (C) 2024 MDW
*
* 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
@@ -891,7 +891,8 @@ $formcompany = new FormCompany($db);
$title = $langs->trans("Member")." - ".$langs->trans("Card");
$help_url = 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder';
-llxHeader('', $title, $help_url);
+
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-member page-card');
$countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index 1b4eb4979e1..fe33407cf21 100644
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -1,7 +1,8 @@
- * Copyright (C) 2003 Jean-Louis Bergamo
- * Copyright (C) 2006-2013 Laurent Destailleur
+/* Copyright (C) 2003 Rodolphe Quiedeville
+ * Copyright (C) 2003 Jean-Louis Bergamo
+ * Copyright (C) 2006-2013 Laurent Destailleur
+ * Copyright (C) 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
@@ -264,7 +265,10 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
$form = new Form($db);
-llxHeader('', $langs->trans("MembersCards"));
+$title = $langs->trans('MembersCards');
+$help_url = 'EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios|DE:Modul_Mitglieder';
+
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-member page-cards');
print load_fiche_titre($langs->trans("LinkToGeneratedPages"), '', $adherentstatic->picto);
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 3aeb87792f0..7eb943244d4 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1,20 +1,20 @@
- * Copyright (C) 2002-2003 Jean-Louis Bergamo
- * Copyright (C) 2004-2012 Laurent Destailleur
- * Copyright (C) 2004 Sebastien Di Cintio
- * Copyright (C) 2004 Benoit Mortier
- * Copyright (C) 2009-2017 Regis Houssin
- * Copyright (C) 2014-2018 Alexandre Spangaro
- * Copyright (C) 2015 Marcos García
- * Copyright (C) 2015-2024 Frédéric France
- * Copyright (C) 2015 Raphaël Doursenaud
- * Copyright (C) 2016 Juanjo Menent
- * Copyright (C) 2018-2019 Thibault FOUCART
- * Copyright (C) 2019 Nicolas ZABOURI
- * Copyright (C) 2020 Josep Lluís Amador
- * Copyright (C) 2021 Waël Almoman
- * Copyright (C) 2021 Philippe Grand
+/* Copyright (C) 2002-2003 Rodolphe Quiedeville
+ * Copyright (C) 2002-2003 Jean-Louis Bergamo
+ * Copyright (C) 2004-2012 Laurent Destailleur
+ * Copyright (C) 2004 Sebastien Di Cintio
+ * Copyright (C) 2004 Benoit Mortier
+ * Copyright (C) 2009-2017 Regis Houssin
+ * Copyright (C) 2014-2018 Alexandre Spangaro
+ * Copyright (C) 2015 Marcos García
+ * Copyright (C) 2015-2024 Frédéric France
+ * Copyright (C) 2015 Raphaël Doursenaud
+ * Copyright (C) 2016 Juanjo Menent
+ * Copyright (C) 2018-2019 Thibault FOUCART
+ * Copyright (C) 2019 Nicolas ZABOURI
+ * Copyright (C) 2020 Josep Lluís Amador
+ * Copyright (C) 2021 Waël Almoman
+ * Copyright (C) 2021 Philippe Grand
* Copyright (C) 2024 MDW
*
* This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index e92e1da0d41..8afcd57d5c8 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -1,9 +1,10 @@
- * Copyright (C) 2004-2010 Laurent Destailleur
- * Copyright (C) 2005-2012 Regis Houssin
- * Copyright (C) 2010 Juanjo Menent
- * Copyright (C) 2013 Cédric Salvador
+/* Copyright (C) 2002-2007 Rodolphe Quiedeville
+ * Copyright (C) 2004-2010 Laurent Destailleur
+ * Copyright (C) 2005-2012 Regis Houssin
+ * Copyright (C) 2010 Juanjo Menent
+ * Copyright (C) 2013 Cédric Salvador
+ * Copyright (C) 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
@@ -114,10 +115,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
$form = new Form($db);
$title = $langs->trans("Member")." - ".$langs->trans("Documents");
-
$help_url = "EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder";
-llxHeader("", $title, $help_url);
+llxHeader("", $title, $help_url, '', 0, 0, '', '', '', 'mod-member page-card_documents');
if ($id > 0) {
$result = $membert->fetch($object->typeid);
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index bd08c394026..1f48941688a 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -1,12 +1,13 @@
- * Copyright (C) 2003 Jean-Louis Bergamo
- * Copyright (C) 2004-2020 Laurent Destailleur
- * Copyright (C) 2005-2012 Regis Houssin
- * Copyright (C) 2019 Nicolas ZABOURI
- * Copyright (C) 2021-2023 Frédéric France
- * Copyright (C) 2021-2023 Waël Almoman
+/* Copyright (C) 2001-2002 Rodolphe Quiedeville
+ * Copyright (C) 2003 Jean-Louis Bergamo
+ * Copyright (C) 2004-2020 Laurent Destailleur
+ * Copyright (C) 2005-2012 Regis Houssin
+ * Copyright (C) 2019 Nicolas ZABOURI
+ * Copyright (C) 2021-2023 Frédéric France
+ * Copyright (C) 2021-2023 Waël Almoman
* Copyright (C) 2024 MDW
+ * Copyright (C) 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
@@ -77,7 +78,10 @@ $form = new Form($db);
// Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
$resultboxes = FormOther::getBoxesArea($user, "2");
-llxHeader('', $langs->trans("Members"), 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder');
+$title = $langs->trans("Members");
+$help_url = 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder';
+
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-member page-index');
$staticmember = new Adherent($db);
$statictype = new AdherentType($db);
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index f94cc476321..e39152c788e 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -1,6 +1,7 @@
- * Copyright (C) 2006-2021 Regis Houssin
+/* Copyright (C) 2006 Laurent Destailleur
+ * Copyright (C) 2006-2021 Regis Houssin
+ * Copyright (C) 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
@@ -17,9 +18,9 @@
*/
/**
- * \file htdocs/adherents/ldap.php
- * \ingroup ldap member
- * \brief Page fiche LDAP adherent
+ * \file htdocs/adherents/ldap.php
+ * \ingroup ldap member
+ * \brief Page fiche LDAP adherent
*/
// Load Dolibarr environment
@@ -104,7 +105,10 @@ if ($action == 'dolibarr2ldap') {
$form = new Form($db);
-llxHeader('', $langs->trans("Member"), 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder');
+$title = $langs->trans("Member");
+$help_url = 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder';
+
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-member page-card_ldap');
$head = member_prepare_head($object);
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 0f969a97bbc..586b34b05b6 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -1,13 +1,14 @@
- * Copyright (C) 2002-2003 Jean-Louis Bergamo
- * Copyright (C) 2004-2022 Laurent Destailleur
- * Copyright (C) 2013-2015 Raphaël Doursenaud
- * Copyright (C) 2014-2016 Juanjo Menent
- * Copyright (C) 2018 Alexandre Spangaro
- * Copyright (C) 2021-2024 Frédéric France
- * Copyright (C) 2024 MDW
- * Copyright (C) 2024 Benjamin Falière
+/* Copyright (C) 2001-2003 Rodolphe Quiedeville
+ * Copyright (C) 2002-2003 Jean-Louis Bergamo
+ * Copyright (C) 2004-2022 Laurent Destailleur
+ * Copyright (C) 2013-2015 Raphaël Doursenaud
+ * Copyright (C) 2014-2016 Juanjo Menent
+ * Copyright (C) 2018-2024 Alexandre Spangaro
+ * Copyright (C) 2021-2024 Frédéric France
+ * Copyright (C) 2024 MDW
+ * Copyright (C) 2024 Benjamin Falière
+ * Copyright (C) 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
@@ -202,7 +203,7 @@ foreach ($object->fields as $key => $val) {
$arrayfields[$tableprefix.'.'.$key] = array(
'label' => $val['label'],
'checked' => (($visible < 0) ? 0 : 1),
- 'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
+ 'enabled' => (abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
'position' => $val['position'],
'help' => isset($val['help']) ? $val['help'] : ''
);
@@ -629,7 +630,7 @@ if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $s
// 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, $morejs, $morecss, '', 'mod-member page-list bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
$arrayofselected = is_array($toselect) ? $toselect : array();
diff --git a/htdocs/adherents/messaging.php b/htdocs/adherents/messaging.php
index 545b3f9b57c..63dfaaa564e 100644
--- a/htdocs/adherents/messaging.php
+++ b/htdocs/adherents/messaging.php
@@ -1,12 +1,13 @@
- * Copyright (C) 2005 Brice Davoleau
- * Copyright (C) 2005-2012 Regis Houssin
- * Copyright (C) 2006-2019 Laurent Destailleur
- * Copyright (C) 2007 Patrick Raguin
- * Copyright (C) 2010 Juanjo Menent
- * Copyright (C) 2015 Marcos García
+/* Copyright (C) 2001-2007 Rodolphe Quiedeville
+ * Copyright (C) 2005 Brice Davoleau
+ * Copyright (C) 2005-2012 Regis Houssin
+ * Copyright (C) 2006-2019 Laurent Destailleur
+ * Copyright (C) 2007 Patrick Raguin
+ * Copyright (C) 2010 Juanjo Menent
+ * Copyright (C) 2015 Marcos García
* Copyright (C) 2024 Frédéric France
+ * Copyright (C) 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
@@ -122,8 +123,9 @@ $form = new Form($db);
$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
$title = $person_name." - ".$langs->trans('Info');
-$help_url = '';
-llxHeader('', $title, $help_url);
+$help_url = 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder';
+
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-member page-card_messaging');
$head = member_prepare_head($object);
diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index b76a08e6d82..3a176747716 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -1,7 +1,8 @@
- * Copyright (C) 2004-2014 Laurent Destailleur
- * Copyright (C) 2015 Frederic France
+/* Copyright (C) 2004 Rodolphe Quiedeville
+ * Copyright (C) 2004-2014 Laurent Destailleur