Merge branch 'develop' into dev_add_param_select_product_to_get_by_wa…

…rehouse

.gitignore

@@ -41,6 +41,7 @@ htdocs/includes/php-parallel-lint/
 htdocs/includes/sebastian/
 htdocs/includes/squizlabs/
 htdocs/includes/webmozart/
+htdocs/install/install.forced.php
 htdocs/.well-known/apple-developer-merchantid-domain-association
 /factory/
 /output/

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ exclude: (?x)^( htdocs/includes/ckeditor/.*|(\.[^/]*/.*))$
 repos:
   # Several miscellaneous checks and fix (on yaml files, end of files fix)
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       # This hook tests the name of the branch and return an error if the name is
       #  'develop' or an official version 'x.y'
@@ -177,7 +177,7 @@ repos:
 
   # Check format of yaml files
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.33.0
+    rev: v1.35.1
     hooks:
       - id: yamllint
         args:
@@ -187,7 +187,7 @@ repos:
 
   # Execute codespell to fix typo errors (setup of codespell into dev/tools/codespell/)
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+    rev: v2.3.0
     hooks:
       - id: codespell
         # Due to a current limitation of configuration files,
@@ -230,14 +230,14 @@ repos:
 
   # Check some shell scripts
   - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.9.0.6
+    rev: v0.10.0.1
     hooks:
       - id: shellcheck
         args: [-W, "100"]
 
   # Check sql file syntax
   - repo: https://github.com/sqlfluff/sqlfluff
-    rev: 3.0.4
+    rev: 3.1.0
     hooks:
       - id: sqlfluff-lint
         stages: [pre-commit, manual]  # manual needed for ci

ChangeLog

@@ -1643,7 +1643,7 @@ NEW: Add link to create an element from the category page
 NEW: add margin infos to takepos invoice lines
 NEW: Add max size send for "backup and link to mail" option
 NEW: Add method httponly_accessforbidden()
-NEW: Add more advices into the Setup security page
+NEW: Add more advice into the Setup security page
 NEW: Add new global variable for keeping the previous signature information on proposal (case of reopening a proposal)
 NEW: Add objectLink on shipment
 NEW: Add option --force on CLI cron_run_jobs.php
@@ -3061,8 +3061,8 @@ NEW: add option in Workflow module to set a shipment as closed
 
 
  for Admins
-NEW: Add a security center page with all information and advices related to the security of your instance
-NEW: Add a performance center page with all information and advices related to the performance of your instance
+NEW: Add a security center page with all information and advice related to the security of your instance
+NEW: Add a performance center page with all information and advice related to the performance of your instance
 
  Modules
 NEW: Module Recruitment is now stable
@@ -7080,7 +7080,7 @@ NEW: Add index and constraints keys on supplier proposal detail table
 NEW: Add phpunit to check the engine is defined into sql create files.
 NEW: Add project and Hook to Loan
 NEW: Add REST API to push a file.
-NEW: Allow extrafields list select to be dependands on other standard list and not only other extrafields list
+NEW: Allow extrafields list select to be dependent on other standard list and not only other extrafields list
 NEW: Architecture to manage search criteria persistence (using save_lastsearch_values=1 on exit links and restore_lastsearch_values=1 in entry links)
 NEW: data files are now also parsed by phpunit for sql syntax
 NEW: Hook to allow inserting custom product head #6001
@@ -8104,7 +8104,7 @@ NEW: The clicktodial module is now able to provide link "tel:" on phone numbers.
 NEW: The conditional IF into ODT templates works also on not defined var so we can show data only if defined. Close #3819
 NEW: The free text in PDF footers can now be a HTML content. So the WYSIWYG editor is on by default to edit it into module setup.
 NEW: The thirdparties tabs, the contacts tabs and the members tabs are now presented using a new "top banner", saving space and using a same way to show address, status and navigation arrows.
-NEW: Thumbs for statistics on main page are fully clicable (not only link inside the thumb)
+NEW: Thumbs for statistics on main page are fully clickable (not only link inside the thumb)
 NEW: Translate extrafield's labels.
 NEW: Use new select2 component for juridical status, country and state selection.
 NEW: When creating order, proposal or invoice from thirdparty card, the project is asked during creation. A link to create project if it does not exists is also available.
@@ -8703,7 +8703,7 @@ NEW: [ task #851 ] Add a new field: Commercial name
 NEW: [ task #977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
 NEW: The line where mouse is over can be highlight with option THEME_ELDY_USE_HOVER (on by default)
 NEW: The notification module accept keyword __SUPERVISOR__ to send notification to supervisor of user.
-NEW: Thumbs for statistics on main page are fully clicable (not only link inside the thumb)
+NEW: Thumbs for statistics on main page are fully clickable (not only link inside the thumb)
 NEW: Title of page project contains project ref and label
 NEW: update skeleton and class builder
 NEW: Use new select2 component for juridical status, country and state selection.
@@ -9854,7 +9854,7 @@ For users:
   prices, radio).
 - New: [ task #798 ] Add range limit date on product/services as it is done on order
   and invoice.
-- New: [ task #814 ] Add extrafield feature for projects ands tasks.
+- New: [ task #814 ] Add extrafield feature for projects and tasks.
 - New: [ task #770 ] Add ODT document generation for Projects module.
 - New: [ task #741 ] Add intervention box.
 - New: [ task #826 ] Optional increase stock when deleting an invoice already validated.

dev/dolibarr_changes.txt

@@ -355,7 +355,9 @@ PHP PARSEDOWN
 
 PHP OAUTH
 ---------
-Add into Class Google of file OAuth2/Service/Google:
+Restore old OAuth2/Service/Google.php file and OAuth2/Service/Microsoft.php and OAuth2/Service/Microsoft2.php
+
+Or add into Class Google of file OAuth2/Service/Google:
 
     // LDR CHANGE Add approval_prompt to force the prompt if value is set to 'force' so it force return of a "refresh token" in addition to "standard token"
     public $approvalPrompt='auto';
@@ -369,6 +371,17 @@ Add into Class Google of file OAuth2/Service/Google:
     }
 
 
+Modify function
+
+    public function getAuthorizationEndpoint()
+    {
+		// LDR CHANGE Add approval_prompt to force the prompt if value is set to 'force' so it force return of a "refresh token" in addition to "standard token"
+		//return new Uri('https://accounts.google.com/o/oauth2/auth?access_type='.$this->accessType);
+		$url = 'https://accounts.google.com/o/oauth2/auth?'.($this->approvalPrompt?'approval_prompt='.$this->approvalPrompt.'&':'').'access_type='.$this->accessType;
+		return new Uri($url);
+	}
+
+
 
 JS JSGANTT:
 -----------

dev/resources/iso-normes/format_FEC - fie example.txt → dev/resources/iso-normes/accountancy/format_FEC - fie example.txt

@@ -1,16 +1,16 @@
 JOURNALCODE	JOURNALLIB	ECRITURENUM	ECRITUREDATE	COMPTENUM	COMPTELIB	COMPAUXNUM	COMPAUXLIB	PIECEREF	PIECEDATE	ECRITURELIB	DEBIT	CREDIT	ECRITURELET	DATELET	VALIDDATE	MONTANTDEVISE	IDEVISE
-Banque	Banque	17293	20170109	401PPRO	PUBLI-PROV			L08	20170109	PPRO domiciliation 1TR	       187,20	         0,00			20170109		
-Banque	Banque	17293	20170109	5121CRA	CR AGRICOLE			L08	20170109	PPRO domiciliation 1TR	         0,00	       187,20			20170109		
-Banque	Banque	17295	20170109	401ORPA	ORANGE PARIS			Report	20170109	ORPA adsl par 12	        96,00	         0,00			20170109		
-Banque	Banque	17295	20170109	5121CRA	CR AGRICOLE			Report	20170109	ORPA adsl par 12	         0,00	        96,00			20170109		
-Banque	Banque	17302	20170105	401ORVI	ORANGE VEBRON INTERNET			Report	20170105	ORVI adsl veb 12	        26,00	         0,00			20170109		
-Banque	Banque	17302	20170105	5121CRA	CR AGRICOLE			Report	20170105	ORVI adsl veb 12	         0,00	        26,00			20170109		
-Fournisseurs	Fournisseurs	17305	20170119	401ZDAV	SANDRA DAVILA			A01	20170119	ZDAV courtage s/ ventes	         0,00	       508,00			20170119		
-Fournisseurs	Fournisseurs	17305	20170119	622200	Courtages s/ ventes			A01	20170119	ZDAV courtage s/ ventes	       508,00	         0,00			20170119		
-Banque	Banque	17306	20170119	5121CRA	CR AGRICOLE			A01	20170119	ZDAV courtage s/ ventes	         0,00	       508,00			20170119		
-Banque	Banque	17306	20170119	401ZDAV	SANDRA DAVILA			A01	20170119	ZDAV courtage s/ ventes	       508,00	         0,00			20170119		
-Banque	Banque	17307	20170119	401ZDAV	SANDRA DAVILA			A01	20170119	ZDAV courtage s/ ventes	       508,00	         0,00			20170131		
-Banque	Banque	17307	20170119	5121CRA	CR AGRICOLE			A01	20170119	ZDAV courtage s/ ventes	         0,00	       508,00			20170131		
+Banque	Banque	17293	20170109	401PPRO	PUBLI-PROV			L08	20170109	PPRO domiciliation 1TR	       187,20	         0,00			20170109
+Banque	Banque	17293	20170109	5121CRA	CR AGRICOLE			L08	20170109	PPRO domiciliation 1TR	         0,00	       187,20			20170109
+Banque	Banque	17295	20170109	401ORPA	ORANGE PARIS			Report	20170109	ORPA adsl par 12	        96,00	         0,00			20170109
+Banque	Banque	17295	20170109	5121CRA	CR AGRICOLE			Report	20170109	ORPA adsl par 12	         0,00	        96,00			20170109
+Banque	Banque	17302	20170105	401ORVI	ORANGE VEBRON INTERNET			Report	20170105	ORVI adsl veb 12	        26,00	         0,00			20170109
+Banque	Banque	17302	20170105	5121CRA	CR AGRICOLE			Report	20170105	ORVI adsl veb 12	         0,00	        26,00			20170109
+Fournisseurs	Fournisseurs	17305	20170119	401ZDAV	SANDRA DAVILA			A01	20170119	ZDAV courtage s/ ventes	         0,00	       508,00			20170119
+Fournisseurs	Fournisseurs	17305	20170119	622200	Courtages s/ ventes			A01	20170119	ZDAV courtage s/ ventes	       508,00	         0,00			20170119
+Banque	Banque	17306	20170119	5121CRA	CR AGRICOLE			A01	20170119	ZDAV courtage s/ ventes	         0,00	       508,00			20170119
+Banque	Banque	17306	20170119	401ZDAV	SANDRA DAVILA			A01	20170119	ZDAV courtage s/ ventes	       508,00	         0,00			20170119
+Banque	Banque	17307	20170119	401ZDAV	SANDRA DAVILA			A01	20170119	ZDAV courtage s/ ventes	       508,00	         0,00			20170131
+Banque	Banque	17307	20170119	5121CRA	CR AGRICOLE			A01	20170119	ZDAV courtage s/ ventes	         0,00	       508,00			20170131
 
 
 

dev/resources/iso-normes/accountancy/import-ofx-format.txt

@@ -0,0 +1,2 @@
+OFX is an old Financial format:
+See https://stackoverflow.com/questions/15735330/how-to-parse-a-ofx-version-1-0-2-file-in-php

dev/resources/iso-normes/qr-bar-codes/QR code for invoices.txt

@@ -11,6 +11,7 @@ List of QR Code format we found on some invoices
 ------------------------------------------
 https://en.wikipedia.org/wiki/EPC_QR_code#Generators
 
+Experimental support can be enabled in Dolibarr by setting INVOICE_ADD_EPC_QR_CODE = 1
 
 
 * For ZATCA QR Code format (Saudi Arabia). Used when INVOICE_ADD_ZATCA_QR_CODE is set
@@ -19,10 +20,14 @@ https://www.pwc.com/m1/en/services/tax/me-tax-legal-news/2021/saudi-arabia-guide
 
 https://www.tecklenborgh.com/post/ksa-zatca-publishes-guide-on-how-to-develop-a-fatoora-compliant-qr-code
 
-Method to encode/decode ZATCA string is available in test/phpunit/BarcodeTest.php 
+Method to encode/decode ZATCA string is available in test/phpunit/BarcodeTest.php
 
 
-* FOR QR-Bill in switzerland - Facture-QR
-Syntax of QR Code - See file ig-qr-bill-v2.2-fr.pdf  (more doc on https://www.swiss-qr-invoice.org/downloads/)
-Syntax of complentary field named "structured information of invoice S1": https://www.swiss-qr-invoice.org/downloads/qr-bill-s1-syntax-fr.pdf
+* FOR QR-Bill in switzerland - Facture-QR or QR-Facture
+-------------------------------------------------------
+- Syntax of QR Code - See file ig-qr-bill-v2.2-fr.pdf  (more doc on https://www.swiss-qr-invoice.org/downloads/)
+- Syntax of complementary field named "structured information of invoice S1": https://www.swiss-qr-invoice.org/downloads/qr-bill-s1-syntax-fr.pdf
 To test/validate: https://www.swiss-qr-invoice.org/validator/
+
+Experimental support to show the QR code can be enabled in dolibarr by setting INVOICE_ADD_SWISS_QR_CODE = 1.
+If setting value to "bottom", the complete top banner can be added at bottom of invoice PDF. Note: an external PHP library may be requested at first PDF generation.

dev/resources/iso-normes/sepa/text.txt → dev/resources/iso-normes/transfer-bank-sepa/text.txt

@@ -2,11 +2,11 @@ https://en.wikipedia.org/wiki/Single_Euro_Payments_Area
 https://www.ecb.europa.eu/paym/integration/retail/sepa/html/index.en.html
 https://www.europeanpaymentscouncil.eu/about-sepa
 
-Spec for credit transfer: 
+Spec for credit transfer:
 https://docs.oracle.com/cd/E39124_01/doc.91/e60210/fields_sepa_pay_file_appx.htm#EOAEL00515
 
 To validate a SEPA file:
 xmllint --schema pain.001.001.03.xsd T200801.xml --noout
 
-To test a SEPA file: 
-https://www.mesfluxdepaiement.fr/testez-vos-fichiers-sepa 
+To test a SEPA file:
+https://www.mesfluxdepaiement.fr/testez-vos-fichiers-sepa

dev/setup/pre-commit/README.md

@@ -94,4 +94,4 @@ CI also runs pre-commit to help maintain code quality.
 
 Note:
 Code for precommits are saved into:
-.cache/pre-commit/repoyXXXXX/py_env-python3/lib/pythonX.Y/site-packages/pre_commit_hooks/no_commit_to_branch.py
+.cache/pre-commit/repo*/py_env-python3/lib/python*/site-packages/pre_commit_hooks/no_commit_to_branch.py

dev/tools/apstats.php

@@ -98,7 +98,7 @@
 }
 
 // PHPSTAN setup
-$PHPSTANLEVEL = 4;
+$PHPSTANLEVEL = 6;
 
 // PHAN setup. Configuration is required, otherwise phan is disabled.
 $PHAN_CONFIG = "{$path}phan/config_extended.php";