FIX create invoice from order using API and multi-entity (#35654)

* FIX create invoice from order using API and multi-entity

* FIX API not allow to access order in other entity on creating invoice from order

* Update api_invoices.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

.github/CONTRIBUTING.md

@@ -26,9 +26,8 @@ Default **language here is english**. So please prepare your contributions in en
 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).
-4. Read our developer documentation on the [Dolibarr Wiki](https://wiki.dolibarr.org/index.php?title=Developer_documentation).
-5. Commit and push your changes.
-6. [Make a pull request](https://help.github.com/articles/creating-a-pull-request).
+4. Commit and push your changes.
+5. [Make a pull request](https://help.github.com/articles/creating-a-pull-request).
 
 <span id="branches" name="branches"></span>
 ### Branches
@@ -117,13 +116,13 @@ a process to follow to optimize the chance to have PRs merged efficiently...
 
 Also, some code changes need a prior approbation:
 
-* if you want to include a new external library (into htdocs/includes directory), please ask before to the core project manager (mention @dolibarr-jedi in your issue) to see if such a library can be accepted.
+* if you want to include a new external library (into htdocs/includes directory), please ask before to the core project manager (mention @dolibarr-yoda in your issue) to see if such a library can be accepted.
 
-* if you add a new tables or fields, you MUST first submit a standalone PR with the data structure changes you plan to add/modify (and only data structure changes). Start development only once this data structure has been accepted.
+* if you add a new table, you must first create a page on https://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Then ask the project manager (@dolibarr-yoda) if the new data model you plan to add is compatible with curent and future works in progress and can be accepted as you suggest.
 
 Once a PR has been submitted, you may need to wait for its integration. It is common that the project leader let the PR open for a long delay to allow every developer discuss about the PR (A label is added in such a case).
 
-If the label of PR start with "Draft" or "WIP" (Work In Progress), it will not be analyzed for merging until you change the label of the PR (but it can be analyzed for discussion).
+If the label of PR start with "Draft" or "WIP" (Work In Progress), it will not be analyzed for merging until you change the label of PR (but it can be analyzed for discussion).
 
 If your PR has errors reported by the Continuous Integration Platform, it means your PR is not valid and nothing will be done with it. It will be kept open to allow developers to fix this, or it may be closed several month later. Don't expect anything on your PR if you have such errors, you MUST first fix the Continuous Integration error to have it taken into consideration.
 

.github/FUNDING.yml

@@ -2,4 +2,4 @@
 
 open_collective: dolibarr
 custom: https://wiki.dolibarr.org/index.php/Subscribe
-github: [eldy]
+# github: [eldy]

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us fix something that is broken
+title: ''
+labels: Bug
+assignees: ''
+
+---
+
+# Instructions
+*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
+*Please:*
+- *replace the bracket enclosed texts with meaningful information*
+- *remove any unused sub-section*
+
+
+# Bug
+[*Short description*]
+
+## Environment
+- **Version**: [*Affected Dolibarr version(s)*]
+- **OS**: [*Server OS type and version*]
+- **Web server**: [*Webserver type and version*]
+- **PHP**: [*PHP version*]
+- **Database**: [*Database type and version*]
+- **URL(s)**: [*Affected URL(s)*]
+
+## Expected and actual behavior
+[*Verbose description*]
+
+## Steps to reproduce the behavior
+[*Verbose description*]
+
+## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)
+[*Files*]

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,71 +0,0 @@
-name: Bug report
-description: Create a report to help us fix something that is broken
-labels: ["Bug"]
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.
-        
-  - type: textarea
-    id: bug
-    attributes:
-      label: Bug
-      description: Please give a short description of the bug
-    validations:
-      required: true
-
-  - type: input
-    id: environment-version
-    attributes:
-      label: Environment Version
-      description: Affected Dolibarr version(s)
-
-  - type: input
-    id: environment-os
-    attributes:
-      label: Environment OS
-      description: Server OS type and version
-      
-  - type: input
-    id: environment-webserver
-    attributes:
-      label: Environment Web server
-      description: Webserver type and version
-      
-  - type: input
-    id: environment-php
-    attributes:
-      label: Environment PHP
-      description: PHP version
-      
-  - type: input
-    id: environment-database
-    attributes:
-      label: Environment Database
-      description: Database type and version
-
-  - type: input
-    id: environment-urls
-    attributes:
-      label: Environment URL(s)
-      description: Affected URL(s)
-
-  - type: textarea
-    id: expected-behaviour
-    attributes:
-      label: Expected and actual behavior
-      description: Verbose description
-
-  - type: textarea
-    id: reproduce
-    attributes:
-      label: Steps to reproduce the behavior
-      description: Verbose description
-      
-  - type: textarea
-    id: files
-    attributes:
-      label: Attached files
-      description: Screenshots, screencasts, dolibarr.log, debugging informations

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,27 @@
+---
+name: Feature request
+about: Suggest a new idea for this project
+title: ''
+labels: Feature request
+assignees: ''
+
+---
+
+# Instructions
+*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
+*Please:*
+- *replace the bracket enclosed texts with meaningful information*
+- *remove any unused sub-section*
+
+
+# Feature Request
+[*Short description*]
+
+## Use case
+[*Verbose description*]
+
+## Suggested implementation
+[*Verbose description*]
+
+## Suggested steps
+[*List of tasks to achieve goal*]

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,35 +0,0 @@
-name: Feature request
-description: Suggest a new idea for this project
-labels: ["Feature request"]
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.
-
-  - type: textarea
-    id: feature-request
-    attributes:
-      label: Feature Request
-      description: Short description
-    validations:
-      required: true
-
-  - type: textarea
-    id: use-case
-    attributes:
-      label: Use case
-      description: Verbose description
-      
-  - type: textarea
-    id: suggested-implementation
-    attributes:
-      label: Suggested implementation
-      description: Verbose description
-
-  - type: textarea
-    id: suggested-steps
-    attributes:
-      label: Suggested steps
-      description: List of tasks to achieve goal

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,18 +1,18 @@
 # Instructions
 *This is a template to help you make good pull requests. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
 *Please:*
-- *only keep the "FIX", "CLOSE" or "NEW" section* (use uppercase to have the PR appears into the ChangeLog, lowercase will not appears)
+- *only keep the "Fix", "Close" or "New" section*
 - *follow the project [contributing guidelines](/.github/CONTRIBUTING.md)*
-- *replace the bracket enclosed texts with meaningful information*
+- *replace the bracket enclosed textswith meaningful informations*
 
 
-# FIX|Fix #[*issue_number Short description*]
+# Fix #[*issue_number Short description*]
 [*Long description*]
 
 
-# CLOSE|Close #[*issue_number Short description*]
+# Close #[*issue_number Short description*]
 [*Long description*]
 
 
-# NEW|New [*Short description*]
+# New [*Short description*]
 [*Long description*]

.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/workflows/exakat.yml

@@ -5,14 +5,11 @@ on:
   schedule:
   - cron: "0 20 * * *"
 
-permissions:
-  contents: read
-
 jobs:
   exakat:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
     - name: Exakat
       uses: docker://exakat/exakat-ga
       with:

.gitignore

@@ -42,8 +42,6 @@ htdocs/includes/sebastian/
 htdocs/includes/squizlabs/
 htdocs/includes/webmozart/
 htdocs/.well-known/apple-developer-merchantid-domain-association
-/factory/
-/output/
 
 # Node Modules
 build/yarn-error.log
@@ -57,3 +55,4 @@ yarn.lock
 package-lock.json
 
 doc/install.lock
+/factory/

.scrutinizer.yml

@@ -18,10 +18,9 @@ filter:
         - dev/*
         - doc/*
         - documents/*
+        - htdocs/includes/*
         - node_modules/*
         - test/*
-    dependency_paths:
-        - htdocs/includes/*
     paths: 
         - htdocs/*
         - scripts/*

.travis.yml

@@ -9,6 +9,8 @@ dist: xenial
 
 language: php
 
+scan_logs: false
+
 git:
   depth: 1
 
@@ -57,7 +59,7 @@ jobs:
       php: nightly 
       env: DB=mysql
     - stage: PHP Dev
-      if: type = push AND branch = 15.0
+      if: type = push AND branch = 14.0
       php: nightly 
       env: DB=mysql
 
@@ -93,26 +95,23 @@ install:
   echo
 
 - |
-  echo "Installing Composer dependencies - PHP Unit, Parallel Lint, PHP CodeSniffer, PHP Vardump check - for $TRAVIS_PHP_VERSION"
+  echo "Installing Composer dependencies - PHP Unit, Parallel Lint, PHP CodeSniffer - for $TRAVIS_PHP_VERSION"
   if [ "$TRAVIS_PHP_VERSION" = '5.6' ]; then
     composer -n require phpunit/phpunit ^5 \
                         php-parallel-lint/php-parallel-lint ^1 \
                         php-parallel-lint/php-console-highlighter ^0 \
-                        php-parallel-lint/php-var-dump-check ~0.4 \
                         squizlabs/php_codesniffer ^3
   fi
   if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ]; then
     composer -n require phpunit/phpunit ^6 \
                         php-parallel-lint/php-parallel-lint ^1 \
                         php-parallel-lint/php-console-highlighter ^0 \
-                        php-parallel-lint/php-var-dump-check ~0.4 \
                         squizlabs/php_codesniffer ^3
   fi
   if [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ] || [ "$TRAVIS_PHP_VERSION" = '7.4.22' ]; then
     composer -n require phpunit/phpunit ^7 \
                         php-parallel-lint/php-parallel-lint ^1.2 \
                         php-parallel-lint/php-console-highlighter ^0 \
-                        php-parallel-lint/php-var-dump-check ~0.4 \
                         squizlabs/php_codesniffer ^3
   fi
   # phpunit 9 is required for php 8
@@ -120,7 +119,6 @@ install:
       composer -n require --ignore-platform-reqs phpunit/phpunit ^7 \
                                                  php-parallel-lint/php-parallel-lint ^1.2 \
                                                  php-parallel-lint/php-console-highlighter ^0 \
-                                                 php-parallel-lint/php-var-dump-check ~0.4 \
                                                  squizlabs/php_codesniffer ^3
   fi
   echo
@@ -170,10 +168,6 @@ before_script:
     which phpcs
     phpcs --version | head -
     phpcs -i | head -
-    # Check PHP Vardump check version
-    echo "PHP Vardump check version"
-    which var_dump_check
-    var_dump_check --version
     # Check PHPUnit version
     echo "PHPUnit version"
     which phpunit
@@ -305,17 +299,6 @@ script:
   set +e
   echo
 
-- |
-  echo "Checking missing debug"
-  # Ensure we catch errors
-  set -e
-  # Exclusions are defined in the ruleset.xml file
-  if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "7.4.22" ]; then
-     var-dump-check --extensions php --tracy --exclude htdocs/includes --exclude test/ --exclude htdocs/public/test/ --exclude htdocs/core/lib/functions.lib.php .
-  fi
-  set +e
-  echo
-
 - |
   export INSTALL_FORCED_FILE=htdocs/install/install.forced.php
   echo "Setting up Dolibarr $INSTALL_FORCED_FILE to test installation"
@@ -430,12 +413,6 @@ script:
   php upgrade.php 13.0.0 14.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade13001400.log
   php upgrade2.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-2.log
   php step5.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-3.log
-  php upgrade.php 14.0.0 15.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade14001500.log
-  php upgrade2.php 14.0.0 15.0.0 > $TRAVIS_BUILD_DIR/upgrade14001500-2.log
-  php step5.php 14.0.0 15.0.0 > $TRAVIS_BUILD_DIR/upgrade14001500-3.log
-  php upgrade.php 15.0.0 16.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade15001600.log
-  php upgrade2.php 15.0.0 16.0.0 > $TRAVIS_BUILD_DIR/upgrade15001600-2.log
-  php step5.php 15.0.0 16.0.0 > $TRAVIS_BUILD_DIR/upgrade15001600-3.log
   ls -alrt $TRAVIS_BUILD_DIR/
 
 - |

.tx/config

@@ -140,6 +140,18 @@ source_file = htdocs/langs/en_US/exports.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.externalsite]
+file_filter = htdocs/langs/<lang>/externalsite.lang
+source_file = htdocs/langs/en_US/externalsite.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
+[dolibarr.ftp]
+file_filter = htdocs/langs/<lang>/ftp.lang
+source_file = htdocs/langs/en_US/ftp.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.help]
 file_filter = htdocs/langs/<lang>/help.lang
 source_file = htdocs/langs/en_US/help.lang
@@ -158,6 +170,12 @@ source_file = htdocs/langs/en_US/hrm.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.intracommreport]
+file_filter = htdocs/langs/<lang>/intracommreport.lang
+source_file = htdocs/langs/en_US/intracommreport.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.install]
 file_filter = htdocs/langs/<lang>/install.lang
 source_file = htdocs/langs/en_US/install.lang
@@ -170,12 +188,6 @@ source_file = htdocs/langs/en_US/interventions.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.intracommreport]
-file_filter = htdocs/langs/<lang>/intracommreport.lang
-source_file = htdocs/langs/en_US/intracommreport.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.knowledgemanagement]
 file_filter = htdocs/langs/<lang>/knowledgemanagement.lang
 source_file = htdocs/langs/en_US/knowledgemanagement.lang
@@ -380,18 +392,18 @@ source_file = htdocs/langs/en_US/stripe.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.supplier_proposal]
-file_filter = htdocs/langs/<lang>/supplier_proposal.lang
-source_file = htdocs/langs/en_US/supplier_proposal.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.suppliers]
 file_filter = htdocs/langs/<lang>/suppliers.lang
 source_file = htdocs/langs/en_US/suppliers.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.supplier_proposal]
+file_filter = htdocs/langs/<lang>/supplier_proposal.lang
+source_file = htdocs/langs/en_US/supplier_proposal.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.ticket]
 file_filter = htdocs/langs/<lang>/ticket.lang
 source_file = htdocs/langs/en_US/ticket.lang

COPYRIGHT

@@ -24,35 +24,34 @@ Component              Version       License                     GPL Compatible
 -------------------------------------------------------------------------------------
 PHP libraries:
 ADOdb-Date             0.36          Modified BSD License        Yes             Date convertion (not into rpm package)
+CKEditor               4.12.1        LGPL-2.1+                   Yes             Editor WYSIWYG
 EvalMath               1.0           BSD                         Yes             Safe math expressions evaluation
 Escpos-php             2.2           MIT License                 Yes             Thermal receipt printer library, for use with ESC/POS compatible printers
 GeoIP2                 0.2.0         Apache License 2.0          Yes             Lib to make geoip convert
-Mobiledetect           2.8.39        MIT License                 Yes             Detect mobile devices browsers
+Mobiledetect           2.8.34        MIT License                 Yes             Detect mobile devices browsers
 NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
 PEAR Mail_MIME         1.8.9         BSD                         Yes             NuSoap dependency
 ParseDown              1.6           MIT License                 Yes             Markdown parser
 PCLZip                 2.8.4         LGPL-3+                     Yes             Library to zip/unzip files             
 PHPDebugBar            1.15.1        MIT License                 Yes             Used only by the module "debugbar" for developers
 PHPSpreadSheet         1.8.2         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
-php-iban               4.1           LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
+php-iban               1.4.7         LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
 PHPoAuthLib            0.8.2         MIT License                 Yes             Library to provide oauth1 and oauth2 to different service
 PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
-PSR/Logs               1.0           MIT License                 Yes             Library for logs (used by DebugBar)
+PSR/Logs               1.0                                                       Library for logs (used by DebugBar)
 PSR/simple-cache       ?             MIT License                 Yes             Library for cache (used by PHPSpreadSheet)
 Restler                3.1.1         LGPL-3+                     Yes             Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
 Sabre                  3.2.2         BSD                         Yes             DAV support
 Swift Mailer           5.4.2-DEV     MIT License                 Yes             Comprehensive mailing tools for PHP
-Symfony/var-dumper     ??? 			 MIT License                 Yes             Library to make var dump (used by DebugBar)
 Stripe                 7.67.0        MIT Licence                 Yes             Library for Stripe module
 TCPDF                  6.3.2         LGPL-3+                     Yes             PDF generation
 TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
 
 JS libraries:
-Ace                    1.4.14        BSD                         Yes             JS library to get code syntaxique coloration in a textarea.
-ChartJS                3.7.1         MIT License                 Yes             JS library for graph
-CKEditor               4.18          LGPL-2.1+                   Yes             Editor WYSIWYG
-jQuery                 3.6.0         MIT License                 Yes             JS library
-jQuery UI              1.13.1        GPL and MIT License         Yes             JS library plugin UI
+Ace                    1.4.8         BSD                         Yes             JS library to get code syntaxique coloration in a textarea.
+ChartJS                2.9.4         MIT License                 Yes             JS library for graph
+jQuery                 3.5.1         MIT License                 Yes             JS library
+jQuery UI              1.12.1        GPL and MIT License         Yes             JS library plugin UI
 jQuery select2         4.0.13        GPL and Apache License      Yes             JS library plugin for sexier multiselect. Warning: 4.0.6+ create troubles without patching css
 jQuery blockUI         2.70.0        GPL and MIT License         Yes             JS library plugin blockUI (to use ajax popups)
 jQuery Colorpicker     1.1           MIT License                 Yes             JS library for color picker for a defined list of colors

ChangeLog

@@ -3,581 +3,6 @@ English Dolibarr ChangeLog
 --------------------------------------------------------------
 
 
-
-***** ChangeLog for 16.0.0 compared to 15.0.0 *****
-
-For users:
----------------
-
-NEW: PHP 8.1 compatibility:
-     Warning: Application works correctly with PHP8 and 8.1 but you may experience a lot of PHP warning into the PHP server log files (depending 
-     on the PHP setup). Removal of all PHP warnings on server side is planned for v17.
-NEW: Support for recurring purchase invoices.
-NEW: #20292 Include German public holidays
-NEW: Can show ZATCA QRCode on PDFs
-NEW: Can show Swiss QR Code on PDFs
-NEW: #17123 added ExtraFields for Stock Mouvement
-NEW: #20609 : new massaction to assign a sale representatives on a selection of thirdparties
-NEW: #20653 edit discount pourcentage for all lines in one shot
-NEW: Accept 'auto' for ref of object on import of purchase order/proposal
-NEW: Accountancy - Add more filters and info on page to bind accounting accounts
-NEW: Accountancy - Add subledger account when we generate a transaction with a deposit invoice
-NEW: Accountancy - Add a massaction to preselect an account (customer and supplier list)
-NEW: ACE Editor is restored at same cursor position after a save.
-NEW: Add "addMoreActionsButtons" hook to subscription form
-NEW: Add an option in GUI to show a Quick add button into top menu bar
-NEW: Module Recruitment - Add a public page with all list of open job positions.
-NEW: Module Recruitment - Add a tab with list of application on the jobposition file.
-NEW: Add a workflow to auto link contract on a ticket
-NEW: Add column date of Signature on proposal list
-NEW: Add column template invoice in invoice list
-NEW: Add column "Total HT" to products array on document creation card
-NEW: ADD configuration for text color of button action
-NEW: Add constant to hide categories in TakePos
-NEW: Add constant to show category description in TakePos
-NEW: Add constant to show only the products in stock in TakePos
-NEW: Add entity filter in exports
-NEW: Show the event block on recurring invoices #20870
-NEW: Add filter "opportunity status" on statistics of projects.
-NEW: Add firstname, lastname and max number of attendees for module "Event Organization"
-NEW: add margin info in proposal and order list
-NEW: Add massaction "Edit Extrafield" for Product
-NEW: Add more fields to detect duplicate during import of thirdparties
-NEW: Add option to foce delivery on email for purchase order receipt to yes
-NEW: Add param boder table for md theme
-NEW: Add param color button action
-NEW: Add possibility to create contract from invoice
-NEW: Add possibility with constant MAIN_LOGIN_BADCHARUNAUTHORIZED to define bad character unauthorized into login name
-NEW: Add private and public notes on tax files.
-NEW: Add status "Obsolete" to KM articles
-NEW: Add substitutions "user numbers"
-NEW: Add the possibility to add sub-BOMs to BOM
-NEW: allow a ticket to be automatically marked as read when created from backend.
-NEW: allow cut&paste as real numeric value to excel
-NEW: A public form to send a message and create a lead is available
-NEW: automatically set totally received status in reception
-NEW: Auto set invoice paid when adding credit not and remain to pay is 0
-NEW: Availibility dictionnary has a new column unit and number
-NEW: barcode rule to insert product in takepos
-NEW: Can change value of AWP during the inventory
-NEW: Can enter price with tax for predefined products on purchase objects
-NEW: Can filter on a thirdparty on product statistics
-NEW: Can removed doc templates from setup page of thirdparty
-NEW: Can set the parent company during the creation of thirdparty (action=add of societe/card.php)
-NEW: Can use ! to make a search that exclude a string
-NEW: Change in theme colors does not need to use the refresh button
-NEW: clean values and amount in FEC import
-NEW: const MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND for mailing mass action
-NEW: Contact filter project list
-NEW: Create contract from invoice
-NEW: create third-party with contact if not found on public ticket
-NEW: Default value for MAIN_SECURITY_CSRF_WITH_TOKEN is now 2 (GET are also protected agains CSRF attacks)
-NEW: deposit payment terms: add field into dictionary admin page to define default percentage of deposit. 
-NEW: Dictionaries - add possibility to manage countries in EEC
-NEW: display errors in a message box after generating documents
-NEW: Display physical and virtual stock of the products when creating OF from a BOM
-NEW: Display product ref in "Object link" product tab for BOM
-NEW: Enhance the import. Can use 'auto' for the ref (import of orders)
-NEW: Events on Proposal to Return to Draft
-NEW: Page to list expense report payments
-NEW: JS inventory autocalc input
-NEW: language support for more emailing target selectors
-NEW: leave requests: add field into type dictionary to block request if balance is negative
-NEW: MAIN_MAIL_AUTOCOPY_TO can accept several email and special keys
-NEW: MAIN_SEARCH_CAT_OR_BY_DEFAULT const for search by category
-NEW: Mass action "Close shipments"
-NEW: Module website now supports the multicompany module
-NEW: More mode for THEME_TOPMENU_DISABLE_IMAGE (2, 3, ...)
-NEW: Add option to move checkbox column as first column on Thirdparty list (only few screens)
-NEW: Add tabs for nets Bom
-NEW: on redirect of page in website module, GET parameters are kept.
-NEW: optional display warning icons on ticket list
-NEW: option to default check "notify tier at creation" in ticket module
-NEW: option update prices on proposal cloning
-NEW: payment conditions enabling semi-automatic deposit creation (Issue #18439)
-NEW: possibility to consume multiple batch
-NEW: Reverse movement product consumption
-NEW: Send email to the supplier order contact
-NEW: New permission to report time on timesheet.
-NEW: SEPA XML - option to place payment Type Info at Credit transfer Transaction level
-NEW: Show number of votes into the label of tab "Results" of a survey
-NEW: Show product reference in Takepos
-NEW: Some core tables are created only at module activation
-NEW: split consumption line on MO
-NEW: stock filter in reassort lists
-NEW: stock limit in stock export CSV
-NEW: Sub-bom are availables
-NEW: Supplier order - Show ref supplier of reception in linked object block
-NEW: support user_modif in order
-NEW: TakePos - pagination on search results
-NEW: The backup tools has an "lowmemory" option for mysqldump on large database
-NEW: The 'reposition' class works on ajax constantonoff that make redirects
-NEW: Thirdparty - Add rules "customer accountancy code" is mandatory to validate invoice
-NEW: thumbnail field in product list
-NEW: total mark rate in list
-NEW: uncheck "send message" by default on a ticket when private messages has been checked
-NEW: VAT Report by month - Show detail by rate and also by code
-NEW: Ticket triggers: allow to automatically send messages on new tickets
-NEW: Accountancy - Add hidden feature for accounting reconciliation
-NEW: Can store the session into database (instead of beeing managed by PHP)
-NEW: Added MMK currency (Myanmar Kyat)
-NEW: On a form to send an email, we show all emails of contacts of object
-
- Modules
-NEW: Module Partnership Management
-NEW: Module Event Organization Management
-
-
-For developers or integrators:
-------------------------------
-NEW: dol_uncompress() supports more extensions (.gz, .bz2, .zstd). Only .zip was supported before.
-NEW: Implement a generic method for Kaban views
-NEW: Upgrade chartjs library to 3.7.1
-NEW: update rank line is possible on API for customer invoices, sales orders and supplier invoice
-NEW: stripe element with more gateways
-NEW: solde() function evolution to be able to get solde until a chosen date
-NEW: Suggest a way to run upgrade per entities.
-NEW: Support html content for multiselect component.
-NEW: ModuleBuilder - Add tabs view in module builder
-NEW: ModuleBuilder - More feature that can be modifed after module generation
-NEW: Hook getNomUrl available everywhere in tooltip of ref links
-NEW: Identification of tr is possible with by attribute data-id on some pages
-NEW: Import with select boxes V2
-NEW: Can update rank of invoice, proposal and order lines with API update
-NEW: Can use current entity filter on 'chkbxlst'
-NEW: Creation of the function select_bom() used to display bom select list
-NEW: add printFieldListWhere hook in product reassort card
-NEW: Add trigger and event on completely received status change
-NEW: Add utility function send backup by mail
-NEW: add WordPress OAuth to save a token (not SSO)
-NEW: A module can embed a sql script run at each Dolibarr upgrade
-NEW: API Proposals - Add POST lines
-NEW: API REST filter states by country
-NEW: Add option INVOICEREC_SET_AUTOFILL_DATE_START/END
-NEW: Add option MAIN_API_DEBUG to save API logs into a file
-NEW: Add param to keep the robot=index meta tag on public pages
-NEW: Add method hintindex() in database handlers.
-NEW: add modifications for new function "$db->prefix()"
-NEW: addMoreActionsButtonsList hook for button in list
-NEW: Add API to get a template invoice
-NEW: Standardize a lot of code.
-NEW: #20736 Allow extrafields SQL filters on REST API product lookup
-NEW: #19294 implement detailed timespent in task of project API
-NEW: Add a protection into PHPunit to avoid to forget a var_dump
-NEW: Add datem and type parameters to API to create movements
-NEW: Add hidden option on contract PDF line to hide qty and price
-NEW: Option MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND to send last document in mass mailing action
-NEW: Add hooks: selectContactListWhere hook, selectThirdpartyListWhere hook 
-NEW: TakePos - add hooks complete product display
-NEW: TakePos - add hooks for cart display
-NEW: TakePos - add hooks to complete ajax return array
-NEW: Add hook before the public ticket list
-NEW: Add hook doaction in takepos invoice
-NEW: Add Hook for Notif
-NEW: Add hook for more buttons
-NEW: Add hook printFieldListWhere in "show_contacts" function
-NEW: Add hook printFieldWhere in load_state_board function
-NEW: Add hooks contact tab badge and hooks parameter for avoid conflicts
-NEW: Add hook selectProductsListWhere in select_produits_list function
-NEW: Add hooks in commercial index
-NEW: Add hooks in customers and products boxes
-NEW: Add hooks in thirdparty index page
-NEW: Add hooks on project task time page
-NEW: Add hooks on salaries and sociales card
-NEW: Add hooks select product list and select thirdparty list function
-NEW: Add hook to getSellPrice function
-
-
-Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
-* There is a new specific permission to be allowed to enter timesheets. If you use timesheet, don't forget to give the new permission (disable and 
-  enable the module project if it is not visible).
-* The default value for MAIN_SECURITY_CSRF_WITH_TOKEN has been set to 2. It means any POST and any GET request that contains the "action" or "massaction"
-  with a value of a sensitive action must also a valid token parameter (With previous value 1, only POST was concerned). Note: With value 3, any URL
-  with parameter "action" or "massaction" need the token, whatever is the value of the action.
-* verifCond('stringtoevaluate') now return false when string contains a bad syntax content instead of true. 
-* The deprecated method thirdparty_doc_create() has been removed. You can use the generateDocument() instead.
-* All triggers with a name XXX_UPDATE have been renamed with name XXX_MODIFY for code consistency purpose.
-* Rename build_path_from_id_categ() into buildPathFromId() and set method to private.
-* Move massaction 'confirm_createbills' from actions_massactions.inc.php to commande/list.php
-* Method fetch_all_resources(), fetch_all_used(), fetch_all_available() of DolResource has been removed (they were not used by core code).
-* Method fetch_all of DolResource has been renamed into fetchAll() to match naming conventions.
-* The hook 'upgrade' and 'doUpgrade2" has been renamed 'doUpgradeBefore' and 'doUpgradeAfterDB'. A new trigger 'doUpgradeAfterFiles' has been introduced.
-* The context hook 'suppliercard' when on the supplier tab of a thirdparty has been renamed into 'thirdpartysupplier'
-
-
-***** ChangeLog for 15.0.3 compared to 15.0.2 *****
-
-FIX: 15.0: modules cannot declare more than 1 cron job using the same method with different parameters
-FIX: 15 fix graph ficheinter status
-FIX: #18704
-FIX: #20444
-FIX: #20448 missing preg_replace for vat rate when adding a free line
-FIX: #20476 migration postgresql 13.0.x to 14.0.x packaging type
-FIX: #20487 missing letter D in constant THIRDPARTIES_DISABLE_RELATED_…
-FIX: #20487 missing letter D in constant THIRDPARTIES_DISABLE_RELATED_OBJECT_TAB
-FIX: #20527 Accountancy - Unbalanced entry proposed when an employee are declared on a social contribution
-FIX: #20527 Accountancy Unbalanced entry proposed when an employee are declared on social contribution
-FIX: #20621 signature online with proposal with n page.
-FIX: #20696
-FIX: #20828
-FIX: #20886 : manage durations in list_print_total.tpl.php
-FIX: #20902
-FIX: #21051
-FIX: #21093
-FIX: #21138
-FIX: #21140
-FIX: #21174
-FIX: #21323
-FIX: #21472 On the bank transfer lists, a change of page switches to the lists of the direct debit module
-FIX: #21495
-FIX: #21518
-FIX: Accountancy - Label of VAT account is empty
-FIX: Accountancy - Model account list - Problem of CSRF
-FIX: Accountancy - Partitioning of the entity on an automatic binding
-FIX: add missing thead, th and id on table
-FIX: backport commit 5b3fcc5e43979b1b0789bf81fb8f1b2b59c93056, chkbxlst cannot be emptied
-FIX: Bank account not set when creating invoice from order
-FIX: Bank transfer - Link on code supplier invoice was bad
-FIX: Can convert a partially closed down payment when close for
-FIX: class center linkedObjectblock order date
-FIX: count elements in invoice list (Issue #21444)
-FIX: Customer price non numeric warning when 0 vat.
-FIX: errors in getLinesArray()
-FIX: False alert of WAF when there is "set" into some URL action=update.
-FIX: Intervention graph by status on ficheinter Index page
-FIX: Intervention url link into Commerce index
-FIX: Fix get origin from other than supplier proposal when add a new supplier proposal
-FIX: Fix show errors in card
-FIX: fourn/commande/card.php Added "$object" parameter to $formfile->showdocuments call
-FIX: french traductions for payment methods
-FIX: hook for dol_format_address
-FIX: Index page for "Sales" give wrong URL link to Intervention
-FIX: issue Dolibarr#21495 for v15
-FIX: label and get_substitutionarray_each_var_object on ODT generation
-FIX: load product stock in inventory lines
-FIX: missing morecss for multiselectarray
-FIX: missins time spent list menu
-FIX: new member subscription: bank account and payment mode might be hidden
-FIX: ODT generation of BOM document
-FIX: ODT tags for subobjects {object_subobject_yyy} was not working.
-FIX: qty received label in Squille PDF model
-FIX: rank duplicate on mass action invoice from multiple orders
-FIX: regression + add $forceentity parameter
-FIX: regression PR #20713
-FIX: security breach if we have same ref number in multiple entities
-FIX: selection of type of invoice
-FIX: Send remind to pay invoice only on validated invoices
-FIX: Show sellist type of extrafield when none category selected
-FIX: signature online with proposal with n page.
-FIX: sql error when PRODUCT_USE_SUPPLIER_PACKAGING enabled.
-FIX: sql order
-FIX: trash icon on crontask list to do not work
-FIX: v15 linked object block center order date
-FIX: Warning on attribut
-FIX: We must remove empty values of $features array in fetchByProductCombination2ValuePairs() because some products can use only several attributes in their variations and not necessarily all. In this case, fetch doesn't work without my correction
-FIX: with callback function
-FIX: xml file for company with special chars in name
-FIX: Zatca QR code must use company name/vat
-
-
-***** ChangeLog for 15.0.2 compared to 15.0.1 *****
-
-FIX: #19777 #20281
-FIX: #20140 #20301
-FIX: #20279 Accountancy - PostGreSQL - Error on mass update lines already binded
-FIX: #20476 migration postgresql 14.0.x to 15.0.x packaging type
-FIX: #20733 Inventory: Do not use batch qty even if present if batch module is disabled.
-FIX: action comm list: holiday last day not included + handle duration with halfdays
-FIX: Add missing entity on salary's payment
-FIX: Add 'recruitment' into check array
-FIX: add tools to fix bad bank amount in accounting with multicurrency
-FIX: assign member cateogry to a member
-FIX: backport
-FIX: bad bank amount in accounting with multicurrency
-FIX: Bad condition on remx
-FIX: Bad filter on date on salary list
-FIX: bad link to add a customer price (token duplicated)
-FIX: bad status of member on widget by type and status
-FIX: better error management at product selling price update
-FIX: Can't edit bank record
-FIX: check mandatory thirdparty fields for mass action
-FIX: check thirdparty object loaded and properties exist
-FIX: comment
-FIX: compatibility for ticket number sharing
-FIX: compatibility with multicompany sharings
-FIX: contact card: single extrafield update failed
-FIX: country not visible into list of states
-FIX: Delete an extrafield where type is double
-FIX: deprecated module are not more viewed as external modules
-FIX: Disable customer type by default if type prospect/customer is disabled
-FIX: each time we create a supplier order, we need to give it a ref_supplier
-FIX: Error management
-FIX: fatal error for $db  usage in tpl
-FIX: filter into the list of product lots
-FIX: Filter on Object Referent page give CRSF page
-FIX: Fix default options ($hidedetails, $hidedesc, $hideref) with globales when generate PDF in mass actions
-FIX: Fix search by filters
-FIX: Fix the adding of lines in the create invoice functions
-FIX: forgotten form confirm before various payment delete
-FIX: holiday/leave requests: write status change emails in HTML
-FIX: include discount price for PMP after a reception (Issue #20029)
-FIX: incrementation
-FIX: in salary stats and payment list, we must check right perms as well as salary list
-FIX: intervention entity missing
-FIX: label tax cat trad
-FIX: Mass action ship orders
-FIX: missing advanced perms
-FIX: missing call to executeHooks()
-FIX: Missing entity on adding new VAT
-FIX: missing hook for row ordering
-FIX: missing hook parameter ($possiblelinks)
-FIX: missing parenthesis
-FIX: missing picto in combo of mass actions of thirdparties.
-FIX: missing signature library when ODT model is used
-FIX: Missing unset fields after updateline expensereport
-FIX: ModuileBuilder - Fix getLinesArray() error reporting
-FIX: Move delete task time trigger position
-FIX: Navigation between invoices
-FIX: No empty line inserted into accounting_bookkeeping
-FIX: Numbering of sepa files
-FIX: object cloning: set unique extrafield values to null to prevent duplicates
-FIX: on update with action reminder in future there is user key error
-FIX: originproductline array td identification data-id
-FIX: out of memory when more than 100 000 invoices.
-FIX: permit access to medias when logged in a different entity
-FIX: phpcs
-FIX: project creation prevented if PROJECTLEADER contact role renamed, de-activated or deleted
-FIX: project timesheet by week: cleanup unused code
-FIX: project timesheet: public holidays offset by 1 day
-FIX: project timesheets: assume Saturday and Sunday as default weekend days when working days conf is empty or badly formed
-FIX: propal list: bad error management when setting "not signed" mass action
-FIX: propal list mass action translations and error management (v14 edition)
-FIX: propal list: missing not signed massaction translation keys for transifex
-FIX: PR returns
-FIX: ref_client doesn't exists on supplier invoice, then ref_fourn needs to have a default value when we want to bill several supplier orders
-FIX: replenish and manage product stock by warhouse
-FIX: sending email on payment of registration of event
-FIX: SEPA ICS is not mandatory for bank transfer
-FIX: Set datec when add time spent on a project task
-FIX: status filter on supplierOrder stats doesn't work
-FIX: stickler-ci
-FIX: still prevent project creation if PROJECTLEADER role unavailable, but with a specific error message
-FIX: Supplier order stats
-FIX: Tabulation must be allowed for HTML content
-FIX: tool to fix bank account not in main currency for vendor invoice
-FIX: translations
-FIX: Travis + Update dev
-FIX: truncate Customer Reference too long on PDF header (PR #20718)
-FIX: uniformize code
-FIX: Update of sale price (log not correctly updated)
-FIX: user actions rights when mulit-company transverse mode is enabled
-FIX: user employee tab: offset in open days messes up holiday length calculation
-FIX: We need to have a different default_ref_supplier for each new fourn invoice
-FIX: "WHERE" clause missing on resource export
-FIX: #yogosha9754
-
-
-***** ChangeLog for 15.0.1 compared to 15.0.0 *****
-FIX: #19777 #20281
-FIX: bad position of extrafields for interventions
-FIX: Blocking situation when a payment was deleted in bank.
-FIX: creation of the shipment if order contains services
-FIX: Drag and drop line of files on join files tab
-FIX: Error management on mass action "Approve holiday"
-FIX: error with php8
-FIX: in case of VAT refund, negative amount must be allowed
-FIX: invoice pdf: lines originating from deposits were not detailed anymore
-FIX: Invoice - When you create an invoice for a given thirdparty, fk_account is not retrieved from company card
-FIX: list of visible type of event was not correctly filtered
-FIX: Missing or bad permissions
-FIX: Missing the field date start/end in export supplier invoice/order
-FIX: On large proposal or invoice, fix n(n+1) sql into a n sql.
-FIX: options should not exists on invoices
-FIX: payment not completed when using Paypal.
-FIX: permission to download files of expense report with readall.
-FIX- Preview icon in documents list PDF in the admin page third-party
-FIX: shipping list, e.shipping_method_id should be e.fk_shipping_method.
-FIX: Show product photo on Supplier order Cornas model.
-FIX: User name in ManufacturingOrder
-FIX: viewimage.php blocks requests with multicompany from other enties
-FIX: #yogosha9048
-FIX: #yogosha9054
-FIX: #yogosha9095
-
-
-***** ChangeLog for 15.0.0 compared to 14.0.0 *****
-
-For users:
----------------
-
-NEW: Online proposal signature
-NEW: Can define some max limit on expense report (per period, per type or expense, ...)
-NEW: Provide a special pages for bookmarks and multicompany for a better use of some mobile applications (like DoliDroid) 
-NEW: Allow the use of __NEWREF__ to get for example the new reference a draft order will get after validation.
-NEW: Add option to disable globaly some notifications emails.
-NEW: #18401 Add __NEWREF__ subtitute to get new object reference.
-NEW: #18403 Add __URL_SHIPMENT__ substitute to get the URL of a shipment
-NEW: #18689 REST API module: add api key generate / modify permission.
-NEW: #18663 Make "L'Annuaire des Entreprises" the default provider for SIREN verification for French thirdparties.
-NEW: #18046 Add tags on ticket/categories
-NEW: #18326 Workflow: Close order on shipment closing.
-NEW: #18770 Can enter the buying price (for Weighted Average Price update) on lines during the reception step
-NEW: #18814 Add legal form for Sweden
-NEW: #18820 Accountancy - Add product account in import/export of thirdparty (level 3)
-NEW: Accountancy - Format FEC/FEC2 - Add column NumFacture
-NEW: Add $dolibarr_main_db_readonly in conf.php for readonly access.
-NEW: add auto creation of agenda event on supplier_order cancellation
-NEW: Add a PDF document template for Manufacturing Orders
-NEW: Add budget field into task #18986
-NEW: add cancel button to `classify reception` form on supplier_orders
-NEW: Added address field into contacts list
-NEW: Added documents page and send mail possibility in payments
-NEW: Add edit option in propal
-NEW: Added linked files page and send mail possibility in payments
-NEW: Add field date from/to in customer and supplier payment list
-NEW: Add filter from date to date into action/evt list
-NEW: Add import / export of MO and BOMLines - Close #18499
-NEW: Adding accounting export model for iSuite Expert
-NEW: add link to an element by ref
-NEW: add missing printFieldListFrom hook call on several lists
-NEW: add MRP into Object Linked Box
-NEW: Add option to hide customer code on PDF documents
-NEW: Add param $nolog to avoid logging into dol_delete_recursive_dir()
-NEW: Add sale representative in order and invoice list
-NEW: add a setting to create PDF in PDF/A - 1b format #18990
-NEW: Add `SOCIETE_SHOW_VAT_IN_LIST` to display VAT number in combo list of thirdparties
-NEW: Add sortorder on units list
-NEW: Adds PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES to hide product label in supplier order lines
-NEW: Add STOCK_MOVEMENT_LIST_HIDE_UNIT_PRICE to hide unit price on some pages
-NEW: add support for zstd compression
-NEW: Allow drag and drop on kits
-NEW: Allow exporting supplier order validation date + validation user
-NEW: Allows product ref generation after the form is validated with PRODUCT_GENERATE_REF_AFTER_FORM
-NEW: autocomplete account group when editing an account card
-NEW: Auto create invoice for payment done on an order with online payment link of order
-NEW: Can edit fields of proposal when proposal is not yet signed
-NEW: Can edit the translation key of an overwrote translation key.
-NEW: can enable/disable external calendar by default
-NEW: Can hide sender name on PDF documents
-NEW: Can select lot from a combo list of existing batch numbers (in MRP consumtion)
-NEW: Can set the default BOM on a product
-NEW: Can set/unset the usual working day of the week (friday, saturday, sunday) 
-NEW: Can show progression of task into combo list of tasks
-NEW: can upload the odt file for the product doc template
-NEW: Contract - Add From/to input on search date
-NEW: Customer Display with TakePOS
-NEW: Split Sale in TakePOS
-NEW: Customer invoice template list - Add input date from/to
-NEW: date filter on project list and task list From->To
-NEW: display shipping method and tracking url on shipment list
-NEW: expense reports: conf to force amounts to be entered only including taxes
-NEW: expense reports: conf to pre-fill start/end dates with bounds of current month
-NEW: expense reports: show link to already existing overlapping expense report
-NEW: expense reports: can make project field mandatory on lines
-NEW: Expose bank account holder, label and number
-NEW: feature #18986
-NEW: field and behavior in product object
-NEW: generate intervention from time spent
-NEW: holiday: handle monthly balance updates with cronjob
-NEW: HRM integration, source code
-NEW: HRM admin - Add tabs
-NEW: HRM - Include more options to manage/custom dashboard
-NEW: Increase size of params of actions for emailcollector
-NEW: Invoice list - Use complete country select field with EEC or not
-NEW: mass action delete, no more break if at least one object has child
-NEW: mass action paid on customer invoice list
-NEW: mass action validate on supplier orders list
-NEW: mass action send email to all attendees of an event
-NEW: mass action to switch status on sale / on purchase of a product
-NEW: expense reports: conf to pre-fill start/end dates with bounds of current month
-NEW: Option "Add a link on the PDF to make the online payment"
-NEW: More options to generate PDF (show Frame option, width of picture option)
-NEW: Preview of pdf files of expense report lines
-NEW: print without details
-NEW: project time spent: conf to prevent recording time after X months
-NEW: rewrite bind accountancy code finding on customer and sales invoice
-NEW: Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
-NEW: Survey - Add a clickable link in email send
-NEW: Social Contributions - Add from/to filter on list
-NEW: Supplier order and proposal - Add From/to input on search date
-NEW: Task - Add From/to input on search date
-NEW: Add theme option THEME_ELDY_USEBORDERONTABLE
-NEW: The Anti-CSRF protection MAIN_SECURITY_CSRF_WITH_TOKEN is on to value 1 by default
-NEW: Update SQL : install and migration
-NEW: Use an ajax call for the clicktodial feature instead of href link.
-NEW: when multiple order linked to facture, show list into note.
-NEW: when we delete several objects with massaction, if somes object has child we must see which objects are concerned and nevertheless delete objects which can be deleted
-NEW: Editing a page in website module keep old page with name .back
-NEW: External backups can be downloaded from the "About info page".
-
-
-
- Modules
-NEW: Stable module Knowledge Management
-NEW: Experimental module Event Organization Management
-NEW: Experimental module Workstations Management
-NEW: Development of module Partnership Management
-OLD: module SimplePOS has been completely removed -> use TakePOS
-
-
-For developers:
----------------
-
-API:
-NEW: #18319 REST API - Shipment: Add 'close' action / endpoint / POST method.
-NEW: add API /approve and /makeOrder for purchase orders 
-NEW: API for knowledgemanagement
-NEW: API get list of legal form of business
-NEW: API list of staff units
-NEW: Hidden option API_DISABLE_COMPRESSION is now visible in API setup page.
-
-Hook:
-NEW: add hook 'beforeBodyClose'
-NEW: add hook 'hookGetEntity'
-NEW: add hook 'menuLeftMenuItems' to filter the leftmenu items
-NEW: add hook 'printUnderHeaderPDFline' on invoice PDF templates (can be used for example to add a barcode or more information on header of invoices).
-NEW: add hookmanager on note pages
-NEW: hook after rank update
-NEW: 'printFieldListFrom' hook call on several lists
-
-ModuleBuilder:
-NEW: add the property "copytoclipboard" in modulebuilder
-NEW: Use lang selector when using a field key 'lang' in modulebuilder
-
-Options:
-NEW: add options MAIN_IBAN_IS_NEVER_MANDATORY, MAIN_IBAN_NOT_MANDATORY, PROPAL_NOT_BILLABLE, PROPAL_REOPEN_UNSIGNED_ONLY, PROPOSAL_ARE_NOT_BILLABLE, TICKETS_MESSAGE_FORCE_MAIL
-
-Trigger:
-NEW: add action trigger for member excluded
-
-
-NEW: Introduce method hasRight
-NEW: Can use textarea field into a confirm popup.
-NEW: Can use the result_mode of mysqli driver. Save memory for list count
-NEW: add code codebar column on serial/lot structure
-NEW: add date_valid and date_approve columns in the list of supplier orders
-NEW: we need to be able to put more filters on deleteByParentField() function
-NEW: make it easier to set the `keyword`, `keywords` and `description` attributes of an ecm file object
-NEW: Experimental feature to manage user sessions in database
-
- 
-Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
-* ALL EXTERNAL MODULES THAT WERE NOT CORRECTLY DEVELOPPED WILL NOT WORK ON V15 (All modules that forgot to manage the security token field 
-  into forms will be broken. The security token field is expected since Dolibarr v9 but a lot of external modules did not implement it).
-* Update hook 'printOriginObjectLine', removed check on product type and special code. Need now reshook.
-* Old deprecated module "SimplePOS" has been completely removed. Use module "TakePOS" is you need a Point Of Sale.
-* The method static ActionComm::getActions($db, ...) is no more static. Use $actioncomm->getActions(...) instead (without $db param). 
-* The 'action=delete&file=...' has been replaced with 'action=deletefile&file=...' to avoid confusion with deletion of object lines.
-* Method getDictvalue has been renamed into getDictionaryValue to match camel case rule.
-* To execute shell or command line command, your code must never use method like exec, shell_exec, popen, .. but must use the built-in 
-  method executeCLI() available into core/class/utils.class.php  
-* Class file expeditionbatch.class.php renamed to expeditionlinebatch.class.php
-* ExpeditionLineBatch::fetchAll is not static anymore and first parameter $db is removed
-* ExtraFields->showOutputField parameter 4 'extrafieldsobjectkey' is now required
-* CommonObject method add_object_linked now sets targettype to 'mymodule_myobject' instead of 'myobject', 
-  you can use hook 'setLinkedObjectSourceTargetType' to set your usual targettype
-
-
 ***** ChangeLog for 14.0.5 compared to 14.0.4 *****
 
 FIX: 13.0: printFieldListWhere called twice on same query
@@ -1077,7 +502,7 @@ Following changes may create regressions for some external modules, but were nec
 * The ICS value for direct debit or credit transfer is now stored on each bank account instead of into the global setup.
 * API /setup/shipment_methods has been replaced with API /setup/shipping_methods
 * Field "total" renamed into "total_ht"  for table llx_facture, llx_facture_rec for better field name consistency
-* Field "tva"   renamed into "total_tva" for llx_facture, table llx_propal, llx_supplier_proposal, llx_commande, llx_commande_fournisseur for better field name consistency
+* Field "tva"   renamed into "total_tva" for table llx_propal, llx_supplier_proposal, llx_commande, llx_commande_fournisseur for better field name consistency
 * Field "total" renamed into "total_ttc" for table llx_propal, llx_supplier_proposal for better field name consistency
 * If your database is PostgreSQL, you must use version 9.1.0 or more (Dolibarr need the SQL function CONCAT)
 * If your database is MySQL or MariaDB, you need at least version 5.1
@@ -1087,6 +512,8 @@ Following changes may create regressions for some external modules, but were nec
 * v14 seems to work correctly on PHP v8 but it generates a lot of verbose warnings. Currently, v14 i snot yet officialy supported with PHP 8.
 * To execute shell or command line command, your code must never use method like exec, shell_exec, popen, .. but must use the built-in 
   method executeCLI() available into core/class/utils.class.php  
+* the trigger "*_DELETE_CONTACT" inside "delete_contact()" function from commonobject.class.php is call before delete the object element
+  and a $object->context['contact_id'] is now available for this trigger
 
 
 ***** ChangeLog for 13.0.5 compared to 13.0.4 *****
@@ -1122,11 +549,11 @@ FIX: wrong users count in multicompany transverse mode
 ***** ChangeLog for 13.0.4 compared to 13.0.3 *****
 
 FIX: Allow disabling of a module (not a dangerous action) even if there is problem with token (due to bugged modules).
-FIX: 13.0 - fatal - missing inclusion of ajax.lib.php for calling 'ajax_autocompleter()'
-FIX: #17919 pictures in docs
+FIX: 13.0 - fatal - missing inclusion of ajax.lib.php for calling `ajax_autocompleter()`
+FIX: #17919 pictures in docs.
 FIX: #18006
 FIX: Accountancy - if we define a date start, automatic binding try to continue to solve old binding
-FIX: Accountancy - Limit date payment not registered on purchases operations
+FIX: Accoutancy Limit date payment not registered on purchases operations
 FIX: Can't edit replacement invoice
 FIX: deposit can create credit note in payment conf
 FIX: division by zero on create
@@ -1230,7 +657,7 @@ FIX: File attachment on lots/batches
 FIX: handling $heightforinfotot when he's superior to a page height on Supplier Invoice
 FIX: hourglass and hide button to pay
 FIX: massaction validate invoice do not regenerate PDF
-FIX: #16627 fix missing mp4 video mime
+FIX: missing mp4 video mime
 FIX: picto on shipment to reset qty to 0. Some quantities were not reset.
 FIX: Protection to avoid #16504
 FIX: rounding amount on card updating
@@ -1416,6 +843,7 @@ NEW: introduce constant FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM
 NEW: introducing new modal boxes in TakePOS
 NEW: keep TakePOS terminal when login/logout
 NEW: link on balance to the ledger
+NEW: MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER const in email collector
 NEW: manage errors on update extra fields in ticket card
 NEW: mass-actions for the event list view
 NEW: more filter for "View change logs"

README-FR.md

@@ -8,10 +8,12 @@ Il est simple d'utilisation et modulaire, vous permettant de n'activez que les f
 
 ![ScreenShot](https://www.dolibarr.org/medias/dolibarr_screenshot1_1920x1080.jpg)
 
+
 ## LICENCE
 
 Dolibarr est distribué sous les termes de la licence GNU General Public License v3+ ou supérieure.
 
+
 ## INSTALLER DOLIBARR
 
 ### Configuration simple
@@ -52,6 +54,7 @@ Vous pouvez aussi utiliser un serveur Web et une base de données prise en charg
 
 - Suivez les instructions de l'installateur
 
+
 ## METTRE A JOUR DOLIBARR
 
 Pour mettre à jour Dolibarr depuis une vieille version vers celle ci:
@@ -62,12 +65,14 @@ Pour mettre à jour Dolibarr depuis une vieille version vers celle ci:
 - Au prochain accès, Dolibarr proposera la page de "mise à jour" des données (si nécessaire).
   Si un fichier install.lock existe pour verrouiller le processus de mise à jour, il sera demandé de le supprimer manuellement (vous devriez trouver le fichier install.lock dans le répertoire utilisé pour stocker les documents générés ou transférés sur le serveur. Dans la plupart des cas, c'est le répertoire appelé "documents")
 
-Note: *Le processus de migration peut être lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/*
+*Note: Le processus de migration peut être lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/*
+
 
 ## CE QUI EST NOUVEAU
 
 See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
 
+
 ## CE QUE DOLIBARR PEUT FAIRE
 
 ### Modules principaux (tous optionnels)
@@ -117,7 +122,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Peux être multi-société par ajout du module externe multi-société.
 - Plusieurs thèmes visuels.
 - Application simple à utiliser.
-- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur [https://wiki.dolibarr.org/index.php/Prérequis](https://wiki.dolibarr.org/index.php/Prérequis)).
+- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur https://wiki.dolibarr.org/index.php/Prérequis).
 - Compatible avec toutes les offres Cloud du marché respectant les prérequis de base de données et PHP.
 - APIs.
 - Génération PDF et ODT des éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
@@ -137,6 +142,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 
 Dolibarr peut aussi être étendu à volonté avec l'ajout de module/applications externes développées par des développeus tiers, disponible sur [DoliStore](https://www.dolistore.com).
 
+
 ## CE QUE DOLIBARR NE PEUT PAS (ENCORE) FAIRE
 
 Voici un liste de fonctionnalités pas encore gérées par Dolibarr:
@@ -146,15 +152,18 @@ Voici un liste de fonctionnalités pas encore gérées par Dolibarr:
 - Dolibarr n'embarque pas de Webmail intégré nativement.
 - Dolibarr ne fait pas le café (pas encore).
 
+
 ## DOCUMENTATION
 
 La documentation utilisateur, développeur et traducteur est disponible sous forme de ressources de la communauté via le site [Wiki](https://wiki.dolibarr.org).
 
+
 ## CONTRIBUER
 
 Ce projet existe grâce à ses nombreux contributeurs [[Contribuer](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)].
 
-[![Dolibarr](https://opencollective.com/dolibarr/contributors.svg?width=890&button=false)](https://github.com/Dolibarr/dolibarr/graphs/contributors)
+<a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>
+
 
 ## CREDITS
 
@@ -162,6 +171,7 @@ Dolibarr est le résultat du travail de nombreux contributeurs depuis des année
 
 Voir le fichier [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT)
 
+
 ## ACTUALITES ET RESEAUX SOCIAUX
 
 Suivez le projet Dolibarr project sur les réseaux francophones

README.md

@@ -4,7 +4,6 @@
 ![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg)
 [![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%205.6-8892BF.svg?style=flat-square)](https://php.net/)
 [![GitHub release](https://img.shields.io/github/v/release/Dolibarr/dolibarr)](https://github.com/Dolibarr/dolibarr)
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5521/badge)](https://bestpractices.coreinfrastructure.org/projects/5521)
 
 Dolibarr ERP & CRM is a modern software package that helps manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
 
@@ -32,7 +31,7 @@ Other licenses apply for some included dependencies. See [COPYRIGHT](https://git
 
 If you have low technical skills and you're looking to install Dolibarr ERP/CRM in just a few clicks, you can use one of the packaged versions:
 
-- [DoliWamp for Windows](https://wiki.dolibarr.org/index.php/Dolibarr_for_Windows_(DoliWamp))
+- [DoliWamp for Windows](https://wiki.dolibarr.org/index.php/Dolibarr_for_Windows_DoliWamp)
 - [DoliDeb for Debian](https://wiki.dolibarr.org/index.php/Dolibarr_for_Ubuntu_or_Debian)
 - DoliRpm for Redhat, Fedora, OpenSuse, Mandriva or Mageia
 
@@ -44,7 +43,7 @@ You can use a web server and a supported database (MariaDB, MySQL or PostgreSQL)
 
 On GNU/Linux, first check if your distribution has already packaged Dolibarr.
 
-#### Generic install steps
+#### Generic install steps:
 
 - Check that your installed PHP version is supported [see PHP support](https://wiki.dolibarr.org/index.php/Releases).
 
@@ -72,113 +71,116 @@ On GNU/Linux, first check if your distribution has already packaged Dolibarr.
 
 - Follow the installer instructions
 
+
 ### Saas/Cloud setup
 
-If you don't have time to install it yourself, you can try some commercial 'ready to use' Cloud offers (See [https://saas.dolibarr.org](https://saas.dolibarr.org)). However, this third solution is not free.
+If you don't have time to install it yourself, you can try some commercial 'ready to use' Cloud offers (See https://saas.dolibarr.org). However, this third solution is not free.
+
 
 ## UPGRADING
 
-Dolibarr supports upgrading, usually without the need for any (commercial) support (depending on if you use any commercial extensions). It supports upgrading all the way from any version after 2.8 without breakage. This is unique in the ERP ecosystem and a benefit our users highly appreciate!
-
-- At first make a backup of your Dolibarr files & then [see](https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr)
+Dolibarr supports upgrading usually wihtout the need for any (commercial) support (depending on if you use any commercial extensions) and supports upgrading all the way from any version after 2.8 without breakage. This is unique in the ERP ecosystem and a benefit our users highly appreciate!
+ 
+- At first make a backup of your Dolibarr files & than [see](https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr)
 - Check that your installed PHP version is supported by the new version [see PHP support](./doc/phpmatrix.md).
 - Overwrite all old files from 'dolibarr' directory with files provided into the new version's package.
 - At first next access, Dolibarr will redirect you to the "install/" page to follow the upgrade process.
   If an `install.lock` file exists to lock any other upgrade process, the application will ask you to remove the file manually (you should find the `install.lock` file in the directory used to store generated and uploaded documents, in most cases, it is the directory called "*documents*").
 
+
 ## WHAT'S NEW
 
 See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
 
+
 ## FEATURES
 
 ### Main application/modules (all optional)
 
-- Third-Parties Management: Customers, Prospects (Leads) and/or Suppliers + Contacts
-- Members/Membership/Foundation management
+- Third-Parties Management: Customers, Prospects (Leads) and/or Suppliers + Contacts 
+- Members/Membership/Foundation management 
 
- Product Management
-
-- Products and/or Services catalog
-- Stock / Warehouse management + Inventory
-- Barcodes
-- Batches / Lots / Serials
-- Product Variants
+ Product Management 
+- Products and/or Services catalog 
+- Stock / Warehouse management + Inventory 
+- Barcodes 
+- Batches / Lots / Serials 
+- Product Variants 
 - Bill of Materials (BOM)
-- Manufacturing Orders
+- Manufacturing Orders 
 
- Customer/Sales Management
+ Customer/Sales Management 
+- Customers/Prospects + Contacts management 
+- Opportunities or Leads management 
+- Commercial proposals management 
+- Customer Orders management 
+- Contracts/Subscription management 
+- Interventions management 
+- Ticket System 
+- Shipping management 
+- Customer Invoices/Credit notes and payment management 
+- Point of Sale (POS) 
 
-- Customers/Prospects + Contacts management
-- Opportunities or Leads management
-- Commercial proposals management (online signing)
-- Customer Orders management
-- Contracts/Subscription management
-- Interventions management
-- Ticket System
-- Shipping management
-- Customer Invoices/Credit notes and payment management
-- Point of Sale (POS)
+ Supplier/Purchase Management 
+- Suppliers/Vendors + Contacts 
+- Supplier (price) requests 
+- Purchase Orders management 
+- Delivery/Receiption 
+- Supplier Invoices/credit notes and payment management 
+- INCOTERMS 
 
- Supplier/Purchase Management
+ Finance / Accounting 
+- Invoices / Payments 
+- Bank accounts management 
+- Direct debit orders management (European SEPA) 
+- Accounting management 
+- Donations management 
+- Loan management 
+- Margins 
+- Reports 
 
-- Suppliers/Vendors + Contacts
-- Supplier (price) requests
-- Purchase Orders management
-- Delivery/Receiption
-- Supplier Invoices/credit notes and payment management
-- INCOTERMS
-
- Finance/Accounting
-
-- Invoices/Payments
-- Bank accounts management
-- Direct debit and Credit transfer management (European SEPA)
-- Accounting management
-- Donations management
-- Loan management
-- Margins
-- Reports
-
- Collaboration
-
-- Shared calendar/agenda (with ical and vcal import/export for third party tools integration)
-- Projects & Tasks management
-- Ticket System
+ Collaboration 
+- Shared calendar/agenda (with ical and vcal export for third party tools integration) 
+- Projects & Tasks management 
+- Ticket System 
 - Surveys
 
- HR
+ HR 
+- Employee's leave requests management 
+- Expense reports 
+- Recruitment management 
+- Timesheets 
 
-- Employee's leaves management
-- Expense reports
-- Recruitment management
-- Timesheets
 
 ### Other application/modules
 
 - Electronic Document Management (EDM)
-- Bookmarks
+- Bookmarks management
 - Reporting
 - Data export/import
 - Barcodes
+- Margin calculations
 - LDAP connectivity
 - ClickToDial integration
 - Mass emailing
 - RSS integration
+- Skype integration
 - Social platforms linking
 - Payment platforms integration (PayPal, Stripe, Paybox...)
 - Email-Collector
 
 (around 100 modules available by default, 1000+ on the addon market place)
 
+
 ### Other general features
 
-- Multi-Language Support (Localization in most major languages)
+- Localization in most major languages
+- Multi-Language Support
 - Multi-Users and groups with finely grained rights
 - Multi-Currency
 - Multi-Company (by adding of an external module)
 - Very user friendly and easy to use
-- Customizable dashboards
+- customizable Dashboard
 - Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
 - APIs (REST, SOAP)
 - Code that is easy to understand, maintain and develop (PHP with no heavy framework; trigger and hook architecture)
@@ -188,25 +190,27 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
   - Canadian double taxes (federal/province) and other countries using cumulative VAT
   - Tunisian tax stamp
   - Argentina invoice numbering using A,B,C...
-  - ZATCA e-invoicing QR-Code
-  - Compatible with [European directives](https://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
-  - Compatible with data privacy rules (europe GDPR, ...)
+  - Compatible with [European directives] (https://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
+  - Compatible with European GDPR rules
   - ...
 - Flexible PDF & ODT generation for invoices, proposals, orders...
 - ...
 
+
 ### System Environment / Requirements
 
 - PHP
-- MariaDB, MySQL or PostgreSQL
+- MariaDB, MySQL or PostgreSQL 
 - Compatible with all Cloud solutions that match PHP & MySQL or PostgreSQL prerequisites.
 
 See exact requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite)
 
+
 ### Extending
 
 Dolibarr can be extended with a lot of other external application or modules from third party developers available at the [DoliStore](https://www.dolistore.com).
 
+
 ## WHAT DOLIBARR CAN'T DO YET
 
 These are features that Dolibarr does **not** yet fully support:
@@ -216,18 +220,21 @@ These are features that Dolibarr does **not** yet fully support:
 - No native embedded Webmail, but you can send email to contacts in Dolibarr with e.g. offers, invoices, etc.
 - Dolibarr can't do coffee (yet)
 
+
 ## DOCUMENTATION
 
 Administrator, user, developer and translator's documentations are available along with other community resources in the [Wiki](https://wiki.dolibarr.org).
 
+
 ## CONTRIBUTING
 
-This project exists thanks to all the people who contribute.
+This project exists thanks to all the people who contribute. 
 Please read the instructions how to contribute (report a bug/error, a feature request, send code ...)  [[Contribute](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)]
 
 A view on Contributors:
 
-[![Dolibarr](https://opencollective.com/dolibarr/contributors.svg?width=890&button=false)](https://github.com/Dolibarr/dolibarr/graphs/contributors)
+<a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>
+
 
 ## CREDITS
 
@@ -235,6 +242,7 @@ Dolibarr is the work of many contributors over the years and uses some fine PHP
 
 See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) file.
 
+
 ## NEWS AND SOCIAL NETWORKS
 
 Follow Dolibarr project on:
@@ -242,10 +250,11 @@ Follow Dolibarr project on:
 - [Facebook](https://www.facebook.com/dolibarr)
 - [Twitter](https://www.twitter.com/dolibarr)
 - [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
-- [Reddit](https://www.reddit.com/r/Dolibarr_ERP_CRM/)
 - [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
 - [GitHub](https://github.com/Dolibarr/dolibarr)
 
+
 ### Sponsors
 
 Support this project by becoming a sponsor. Your logo will show up here. 🙏 [[Become a sponsor/backer](https://opencollective.com/dolibarr#backer)]
+

SECURITY.md

@@ -4,27 +4,26 @@ This file contains some policies about the security reports on Dolibarr ERP CRM
 
 ## Supported Versions for security reports
 
-| Version    | Supported              |
-| ---------- | ---------------------- |
-| <= 15.0.0  | :x:                    |
-| >= 15.0.1+ | :white_check_mark: except CSRF attacks|
-| >= 16.0.0  | :white_check_mark:     |
-| >= develop | :white_check_mark:     |
+| Version   | Supported          |
+| --------- | ------------------ |
+| <= 12.*   | :x:                |
+| >= 13.*   | :white_check_mark: |
+
 
 ## Reporting a Vulnerability
 
-To report a vulnerability, for a private report, please use GitHub security advisory at [https://github.com/Dolibarr/dolibarr/security/advisories/new](https://github.com/Dolibarr/dolibarr/security/advisories/new) (if you have permissions).
-Alternatively send an email to security@dolibarr.org (for everybody)
+To report a vulnerability, please use GitHub security advisory at https://github.com/Dolibarr/dolibarr/security/advisories/new (if you have permissions) or alternatively send an email to security@dolibarr.org (for everybody)
+
 
 ## Hunting vulnerabilities on Dolibarr
 
-We believe that the future of software is online SaaS. This means software are more and more critical and no technology is perfect. Working with skilled security researchers is crucial in identifying weaknesses in our technology.
+We believe that future of software is online SaaS. This means software are more and more critical and no technology is perfect. Working with skilled security researchers is crucial in identifying weaknesses in our technology.
 
 If you believe you've found a security bug in our service, we are happy to work with you to resolve the issue promptly and ensure you are fairly rewarded for your discovery.
 
 Any type of denial of service attacks is strictly forbidden, as well as any interference with network equipment and Dolibarr infrastructure.
 
-We recommand to install Dolibarr ERP CRM on your own server (as most Open Source software, download and use is free: [https://www.dolibarr.org/download](https://www.dolibarr.org/download)) to get access on every side of application.
+We recommand to install Dolibarr ERP CRM on your own server (as most Open Source software, download and use is free: https://www.dolibarr.org/download) to get access on every side of application.
 
 ### User Agent
 
@@ -32,20 +31,22 @@ If you try to find bug on Dolibarr, we recommend to append to your user-agent he
 
 ### Account access
 
-You can install the web application yourself on your own platform/server so you get full access to application and sources. Download the zip of the files to put into your own web server virtual host from [https://www.dolibarr.org/download](https://www.dolibarr.org/download)
+You can install the web application yourself on your own platform/server so you get full access to application and sources. Download the zip of the files to put into your own web server virtual host from https://www.dolibarr.org/download
+
 
 ## Eligibility and Responsible Disclosure
 
-We are happy to thank everyone who submits valid reports which help us improve the security of Dolibarr, however only those that meet the following eligibility requirements will be "validated reports" (if not, we may close the report without any answer):
+We are happy to thank everyone who submits valid reports which help us improve the security of Dolibarr however, only those that meet the following eligibility requirements will be "validated reports" (if not, we may close the report without any answer):
 
 You must be the first reporter of the vulnerability (duplicate reports are closed).
 
 You must send a clear textual description of the report along with steps to reproduce the issue, include attachments such as screenshots or proof of concept code as necessary.
 
-You must avoid tests that could cause degradation or interruption of our service (refrain from using automated tools, and limit yourself about requests per second), that's why we recommand to install software on your own platform.
+You must avoid tests that could cause degradation or interruption of our service (refrain from using automated tools, and limit yourself about requests per second), that's why we recommand to install softwate on your own platform.
 
 You must not leak, manipulate, or destroy any user data of third parties to find your vulnerability.
 
+
 ## Scope for qualified vulnerabilities
 
 ONLY vulnerabilities discovered, when the following setup on test platform is used, are "valid":
@@ -53,22 +54,23 @@ ONLY vulnerabilities discovered, when the following setup on test platform is us
 * $dolibarr_main_prod must be set to 1 into conf.php
 * $dolibarr_nocsrfcheck must be kept to the value 0 into conf.php (this is the default value)
 * $dolibarr_main_force_https must be set to something else than 0.
-* The constant MAIN_SECURITY_CSRF_WITH_TOKEN must be set to 3 into backoffice menu Home - Setup - Other (this protection should be set to 3 soon by default)
+* The constant MAIN_SECURITY_CSRF_WITH_TOKEN must be set to 1 into backoffice menu Home - Setup - Other (this protection should be set to 1 soon by default)
 * The module DebugBar and ModuleBuilder must NOT be enabled (by default, these modules are not enabled. They are developer tools)
 * ONLY security reports on modules provided by default and with the "stable" status are valid (troubles into "experimental", "developement" or external modules are not valid vulnerabilities).
 * The root of web server must link to htdocs and the documents directory must be outside of the web server root (this is the default when using the default installer but may differs with external installer).
-* The web server setup must be done so that only the documents directory is in write mode. The root directory called htdocs must be read-only.
-* CSRF attacks are accepted but double check that you have set MAIN_SECURITY_CSRF_WITH_TOKEN to value 3.
+* The web server setup must be done so only the documents directory is in write mode. The root directory called htdocs must be readonly.
+* CSRF attacks are accepted when using a POST URL, but when using GET URL, they are validated only for creating, updating or deleting data resctricted from pages restricted to admin users.
 * Ability for a high level user to edit web site pages into the CMS by including HTML or Javascript is an expected feature. Vulnerabilities into the website module are validated only if HTML or Javascript injection can be done by a non allowed user.
 
 Scope is the web application (back office) and the APIs.
 
+
 ## Qualifying vulnerabilities for reporting
 
 * Remote code execution (RCE)
 * Local files access and manipulation (LFI, RFI, XXE, SSRF, XSPA)
 * Code injections (HTML, JS, SQL, PHP, ...)
-* Cross-Site Scripting (XSS), except from setup page of module "External web site" (allowing any content here, editable by admin user only, is accepted on purpose) and except into module "Web site" when permission to edit website content is allowed (injecting any data in this case is allowed too).
+* Cross-Site Scripting (XSS), except from setup page of module "External web site" (allowing any content here, editable by admin user only, is accepted on purpose or into module "Web site" when permission to edit website content is allowed).
 * Cross-Site Requests Forgery (CSRF) with real security impact (when using GET URLs, CSRF are qualified only for creating, updating or deleting data from pages restricted to admin users)
 * Open redirect
 * Broken authentication & session management
@@ -79,6 +81,7 @@ Scope is the web application (back office) and the APIs.
 * Software version disclosure (for non admin users only)
 * Stack traces or path disclosure (for non admin users only)
 
+
 ## Non-qualifying vulnerabilities for reporting
 
 * "Self" XSS
@@ -87,8 +90,9 @@ Scope is the web application (back office) and the APIs.
 * Clickjacking/UI redressing
 * Physical or social engineering attempts or issues that require physical access to a victim’s computer/device
 * Presence of autocomplete attribute on web forms
-* Vulnerabilities affecting outdated browsers or platforms, or vulnerabilities inside browsers themself.
+* Vulnerabilities affecting outdated browsers or platforms
 * Logout and other instances of low-severity Cross-Site Request Forgery
+* Missing cookie flags
 * Missing security-related HTTP headers which do not lead directly to a vulnerability
 * Reports from automated web vulnerability scanners (Acunetix, Vega, etc.) that have not been validated
 * Invalid or missing SPF (Sender Policy Framework) records (Incomplete or missing SPF/DKIM/DMARC)
@@ -96,3 +100,4 @@ Scope is the web application (back office) and the APIs.
 * Software version or private IP disclosure when logged user is admin
 * Stack traces or path disclosure when logged user is admin
 * Any vulnerabilities due to a configuration different than the one defined into chapter "Scope for qualified vulnerabilities".
+

build/README

@@ -13,12 +13,32 @@ It is here only to build Dolibarr packages, and those generated packages will no
 
 There are several tools:
 
---------------------------------------------------------------------------------------------------
 
 - To build full Dolibarr packages, launch the script
 > Launch command perl makepack-dolibarr.pl
 
-See makepack-howto.txt for prerequisites.
+--------------------------------------------------------------------------------------------------
+
+
+Prerequisites to build tgz, debian and rpm packages:
+> apt-get install tar dpkg dpatch p7zip-full rpm zip
+
+
+--------------------------------------------------------------------------------------------------
+
+Prerequisites to build autoexe DoliWamp package:
+> apt-get install wine q4wine
+> Launch "wine cmd" to check a drive Z: pointing to / exists.
+> Install InnoSetup
+   For example by running isetup-5.5.8.exe (https://www.jrsoftware.org)  https://files.jrsoftware.org/is/5/
+> Install WampServer into "C:\wamp64" to have Apache, PHP and MariaDB
+   For example by running wampserver3.2.0_x64.exe (https://www.wampserver.com). 
+   See file build/exe/doliwamp.iss to know the doliwamp version currently setup.
+> Add path to ISCC into PATH windows var:
+  Launch wine cmd, then regedit and add entry int HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PATH
+> To build manually the .exe from Windows (running from makepack-dolibarr.pl script is however recommanded), 
+  open file build/exe/doliwamp.iss and click on button "Compile".
+  The .exe file will be build into directory build.
 
 --------------------------------------------------------------------------------------------------
   

build/docker/Dockerfile

@@ -55,6 +55,7 @@ RUN echo "host mail" >> /etc/msmtprc
 RUN echo "from local@localdomain.com" >> /etc/msmtprc
 RUN echo "domain localhost.localdomain" >> /etc/msmtprc
 RUN echo "sendmail_path=/usr/bin/msmtp -t" >> /usr/local/etc/php/conf.d/php-sendmail.ini
+RUN echo "localhost localhost.localdomain" >> /etc/hosts
 
 EXPOSE 80
 

build/docker/docker-run.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
-# Script used by the Dockerfile.
-# See README.md to know how to create a Dolibarr env with docker 
 
 usermod -u ${HOST_USER_ID} www-data
 groupmod -g ${HOST_USER_ID} www-data

build/exe/doliwamp/.gitignore

@@ -1 +1 @@
-/doliwamp.tmp.iss*
+/doliwamp.tmp.iss

build/exe/doliwamp/doliwamp.iss

@@ -24,14 +24,15 @@ OutputBaseFilename=__FILENAMEEXEDOLIWAMP__
 ;OutputManifestFile=build\doliwampbuild.log
 ; Define full path from which all relative path are defined
 ; You must modify this to put here your dolibarr root directory
+;SourceDir=Z:\home\ldestailleur\git\dolibarrxxx
 SourceDir=..\..\..
 AppId=doliwamp
-AppPublisher=DoliCloud
-AppPublisherURL=https://www.dolicloud.com
+AppPublisher=NLTechno
+AppPublisherURL=https://www.nltechno.com
 AppSupportURL=https://www.dolibarr.org
 AppUpdatesURL=https://www.dolibarr.org
 AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql software.
-AppCopyright=Copyright (C) 2008-2022 Laurent Destailleur (DoliCloud), Fabian Rodriguez (Le Goût du Libre)
+AppCopyright=Copyright (C) 2008-2020 Laurent Destailleur (NLTechno), Fabian Rodriguez (Le Goût du Libre)
 DefaultDirName=c:\dolibarr
 DefaultGroupName=Dolibarr
 ;LicenseFile=COPYING
@@ -80,7 +81,7 @@ Name: "desktopicon"; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:
 Name: "{app}\logs"
 Name: "{app}\tmp"
 Name: "{app}\dolibarr_documents"
-Name: "{app}\bin\apache\apache2.4.51\logs"
+Name: "{app}\bin\apache\apache2.4.41\logs"
 
 [Files]
 ; Stop/start
@@ -98,12 +99,19 @@ Source: "build\exe\doliwamp\startdoliwamp_manual_donotuse.bat.install"; DestDir:
 Source: "build\exe\doliwamp\builddemosslfiles.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversion;
 
-; Apache, Php, Mysql
+; PhpMyAdmin, Apache, Php, Mysql
 ; Put here path of Wampserver applications
-; Value OK: apache 2.4.51, php 7.3.33, mariadb10.6.5 (wampserver3.2.6_x64.exe)
-Source: "C:\wamp64\bin\apache\apache2.4.51\*.*"; DestDir: "{app}\bin\apache\apache2.4.51"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
-Source: "C:\wamp64\bin\php\php7.3.33\*.*"; DestDir: "{app}\bin\php\php7.3.33"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
-Source: "C:\wamp64\bin\mariadb\mariadb10.6.5\*.*"; DestDir: "{app}\bin\mariadb\mariadb10.6.5"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
+; Value OK: apache 2.2.6,  php 5.2.5 (5.2.11, 5.3.0 and 5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45
+; Value OK: apache 2.2.11, php 5.3.0 (if no php_exif, php_pgsql, php_zip), mysql 5.0.45
+; Value OK: apache 2.4.9,  php 5.5.12, mysql 5.0.45 instead of 5.6.17 (wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe)
+; Value OK: apache 2.4.41, php 7.3.12, mariadb10.4.10 (wampserver3.2.0_x64.exe)
+Source: "C:\wamp64\apps\phpmyadmin4.9.2\*.*"; DestDir: "{app}\apps\phpmyadmin4.9.2"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log,darkblue_orange"
+;Source: "C:\Program Files\Wamp\bin\apache\apache2.4.9\*.*"; DestDir: "{app}\bin\apache\apache2.4.9"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
+Source: "C:\wamp64\bin\apache\apache2.4.41\*.*"; DestDir: "{app}\bin\apache\apache2.4.41"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
+;Source: "C:\Program Files\Wamp\bin\php\php5.5.12\*.*"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
+Source: "C:\wamp64\bin\php\php7.3.12\*.*"; DestDir: "{app}\bin\php\php7.3.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
+;Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
+Source: "C:\wamp64\bin\mariadb\mariadb10.4.10\*.*"; DestDir: "{app}\bin\mariadb\mariadb10.4.10"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
 
 ; Mysql data files (does not overwrite if exists)
 ; We must copy them because the tool mysql_install_db.exe to generate them at first install does not return to prompt so make install hang
@@ -117,11 +125,15 @@ Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversi
 Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,default.properties,install.lock"
 
 ; Config files
+Source: "build\exe\doliwamp\phpmyadmin.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\dolibarr.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.51\conf"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\config.inc.php.install"; DestDir: "{app}\apps\phpmyadmin4.1.14"; Flags: ignoreversion;
+;Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.9\conf"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.41\conf"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mariadb\mariadb10.6.5"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php7.3.33"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mariadb\mariadb10.4.10"; Flags: ignoreversion;
+;Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php7.3.12"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\index.php.install"; DestDir: "{app}\www"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\install.forced.php.install"; DestDir: "{app}\www\dolibarr\htdocs\install"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\openssl.conf"; DestDir: "{app}"; Flags: ignoreversion;
@@ -184,6 +196,7 @@ var destFileA: String;
 var srcContents: String;
 var browser: String;
 var mysqlVersion: String;
+var phpmyadminVersion: String;
 var phpDllCopy: String;
 var batFile: String;
 
@@ -227,9 +240,13 @@ procedure InitializeWizard();
 begin
 
   //version des applis, a modifier pour chaque version de WampServer 2
-  apacheVersion := '2.4.51';
-  phpVersion := '7.3.33' ;
-  mysqlVersion := '10.6.5';
+  //apacheVersion := '2.4.9';
+  //phpVersion := '5.5.12' ;
+  apacheVersion := '2.4.41';
+  phpVersion := '7.3.12' ;
+  //mysqlVersion := '5.0.45';
+  mysqlVersion := '10.4.10';
+  phpmyadminVersion := '4.1.14';
 
   smtpServer := 'localhost';
   apachePort := '80';
@@ -363,9 +380,9 @@ begin
 
 	
 	// Migration of database
-//	datadir := pathWithSlashes+'/bin/mariadb/mariadb10.6.5/data';
-//    exedirold := pathWithSlashes+'/bin/mariadb/mariadb10.6.5/';
-//    exedirnew := pathWithSlashes+'/bin/mariadb/mariadb10.6.5/';
+//	datadir := pathWithSlashes+'/bin/mariadb/marradb10.4.10/data';
+//    exedirold := pathWithSlashes+'/bin/mariadb/marradb10.4.10/';
+//    exedirnew := pathWithSlashes+'/bin/mariadb/marradb10.4.10/';
 		
     // If we have a new database version, we should only copy old my.ini file into new directory
     // and change only all basedir= strings to use new version. Like this, data dir is still correct.
@@ -618,6 +635,27 @@ begin
       begin
 
 		
+		    //----------------------------------------------
+		    // Create file alias phpmyadmin (always)
+		    //----------------------------------------------
+		
+		    destFile := pathWithSlashes+'/alias/phpmyadmin.conf';
+		    srcFile := pathWithSlashes+'/alias/phpmyadmin.conf.install';
+		
+		    if FileExists(srcFile) then
+		    begin
+		      LoadStringFromFile (srcFile, srcContents);
+		
+		      //installDir et version de phpmyadmin
+		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
+		      StringChangeEx (srcContents, 'WAMPPHPMYADMINVERSION', phpmyadminVersion, True);
+		
+		      SaveStringToFile(destFile,srcContents, False);
+		    end;
+		    DeleteFile(srcFile);
+		
+		
+		
 		    //----------------------------------------------
 		    // Create file alias dolibarr (if not exists)
 		    //----------------------------------------------
@@ -653,6 +691,35 @@ begin
 		
 		
 		
+		    //----------------------------------------------
+		    // Create file configuration for phpmyadmin (if not exists)
+		    //----------------------------------------------
+		
+		    destFile := pathWithSlashes+'/apps/phpmyadmin'+phpmyadminVersion+'/config.inc.php';
+		    srcFile := pathWithSlashes+'/apps/phpmyadmin'+phpmyadminVersion+'/config.inc.php.install';
+		
+		    if FileExists(srcFile) then
+		    begin
+	  	      if not FileExists (destFile) then
+		      begin
+	            LoadStringFromFile (srcFile, srcContents);
+	            StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
+	            StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
+	            SaveStringToFile(destFile,srcContents, False);
+		      end
+		      else
+		      begin
+		        // We must replace to use format 2.4 of apache
+	            DeleteFile(destFile);
+	            LoadStringFromFile (srcFile, srcContents);
+	            StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
+	            StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
+	            SaveStringToFile(destFile,srcContents, False);
+		      end;
+		    end;
+		
+		
+		
 		    //----------------------------------------------
 		    // Create file httpd.conf (if not exists)
 		    //----------------------------------------------
@@ -1015,7 +1082,7 @@ Filename: "{app}\rundoliwamp.bat"; Description: {cm:LaunchNow}; Flags: shellexec
 
 [UninstallDelete]
 Type: files; Name: "{app}\*.*"
-Type: files; Name: "{app}\bin\mariadb\mariadb10.6.5\*.*"
+Type: files; Name: "{app}\bin\mariadb\mariadb10.4.10\*.*"
 Type: filesandordirs; Name: "{app}\alias"
 Type: filesandordirs; Name: "{app}\apps"
 Type: filesandordirs; Name: "{app}\bin\apache"

build/generate_filelist_xml.php

@@ -55,9 +55,10 @@ if (empty($argv[1])) {
 
 
 $i=0;
+$result = array();
 while ($i < $argc) {
-	if (! empty($argv[$i])) {
-		parse_str($argv[$i]);	// set all params $release, $includecustom, $includeconstant, $buildzip ...
+	if (!empty($argv[$i])) {
+		parse_str($argv[$i], $result);	// set all params $release, $includecustom, $includeconstant, $buildzip ...
 	}
 	if (preg_match('/includeconstant=/', $argv[$i])) {
 		$tmp=explode(':', $includeconstant, 3);			// $includeconstant has been set with previous parse_str()

build/makepack-dolibarr.pl

@@ -65,7 +65,7 @@ $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
 
 $SOURCE="$DIR/..";
 $DESTI="$SOURCE/build";
-if ($SOURCE !~ /^\// && $SOURCE !~ /^[a-z]:/i)
+if ($SOURCE !~ /^\//)
 {
 	print "Error: Launch the script $PROG.$Extension with its full path from /.\n";
 	print "$PROG.$Extension aborted.\n";
@@ -76,23 +76,15 @@ if (! $ENV{"DESTIBETARC"} || ! $ENV{"DESTISTABLE"})
 {
 	print "Error: Missing environment variables.\n";
 	print "You must define the environment variable DESTIBETARC and DESTISTABLE to point to the\ndirectories where you want to save the generated packages.\n";
-	print "$PROG.$Extension aborted.\n";
-	print "\n";
-	print "You can set them with\n";
-	print "On Linux:\n";
-	print "export DESTIBETARC='/tmp'; export DESTISTABLE='/tmp';\n";
-	print "On Windows:\n";
-	print "set DESTIBETARC=c:/tmp\n";
-	print "set DESTISTABLE=c:/tmp\n";
-	print "\n";
 	print "Example: DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild'\n";
 	print "Example: DESTISTABLE='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/stable'\n";
+	print "$PROG.$Extension aborted.\n";
 	sleep 2;
 	exit 1;
 }
 if (! -d $ENV{"DESTIBETARC"} || ! -d $ENV{"DESTISTABLE"})
 {
-	print "Error: Directory of environment variable DESTIBETARC ($ENV{'DESTIBETARC'}) or DESTISTABLE ($ENV{'DESTISTABLE'}) does not exist.\n";
+	print "Error: Directory of environment variable DESTIBETARC or DESTISTABLE does not exist.\n";
 	print "$PROG.$Extension aborted.\n";
 	sleep 2;
 	exit 1;
@@ -102,7 +94,7 @@ if (! -d $ENV{"DESTIBETARC"} || ! -d $ENV{"DESTISTABLE"})
 # --------------
 if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='linux'; $CR=''; }
 elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
-elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i || "$^O" =~ /msys/i) { $OS='windows'; $CR="\r"; }
+elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
 if (! $OS) {
 	print "Error: Can't detect your OS.\n";
 	print "Can't continue.\n";
@@ -398,7 +390,7 @@ if ($nboftargetok) {
 		$olddir=getcwd();
 		chdir("$SOURCE");
 		
-		print "Clean $SOURCE/htdocs/includes/autoload.php\n";
+		print "Clean $SOURCE/htdocs\n";
 		$ret=`rm -f  $SOURCE/htdocs/includes/autoload.php`;
 		
 		$ret=`git ls-files . --exclude-standard --others`;
@@ -507,9 +499,8 @@ if ($nboftargetok) {
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/cache.manifest`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
-		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.nova*`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
-		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.pgsql`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
 
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mssql/README`;
@@ -591,7 +582,9 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/timesheet*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/webmail*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/common/fontawesome-5/svgs`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/allscreen*`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/theme/common/octicons/LICENSE`;
 		
 		# Removed other test files
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
@@ -621,7 +614,6 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/scripts`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/src`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/test`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/php-iban/docs`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/*/tests`;
@@ -632,7 +624,7 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/utils`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/vendor`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/webmozart`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/autoload.php`;
@@ -1082,52 +1074,28 @@ if ($nboftargetok) {
      		print "Remove target $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe...\n";
     		unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe";
  
- 			if ($OS eq 'windows') {
- 				print "Check that ISCC.exe is in your PATH.\n";
-			} else {
- 				print "Check that in your Wine setup, you have created a Z: drive that point to your / directory.\n";
-			}
-			
+ 			print "Check that in your Wine setup, you have created a Z: drive that point to your / directory.\n";
+
  			$SOURCEBACK=$SOURCE;
  			$SOURCEBACK =~ s/\//\\/g;
 
-    		print "Prepare file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\" from \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
-    		
-    		#$ret=`cat "$SOURCE/build/exe/doliwamp/doliwamp.iss" | sed -e 's/__FILENAMEEXEDOLIWAMP__/$FILENAMEEXEDOLIWAMP/g' > "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
-    		open(IN, '<' . $SOURCE."/build/exe/doliwamp/doliwamp.iss") or die $!;
-			open(OUT, '>' . "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss") or die $!;
-			while(<IN>)
-			{
-			    $_ =~ s/__FILENAMEEXEDOLIWAMP__/$FILENAMEEXEDOLIWAMP/g;
-			    print OUT $_;
-			}
-			close(IN);
-			close(OUT);
+    		print "Prepare file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss from \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
+    		$ret=`cat "$SOURCE/build/exe/doliwamp/doliwamp.iss" | sed -e 's/__FILENAMEEXEDOLIWAMP__/$FILENAMEEXEDOLIWAMP/g' > "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
 
-    		print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\" on OS $OS\n";
-    		
- 			if ($OS eq 'windows') {
-	    		$cmd= "ISCC.exe \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"";
-	    	} else {
-	    		#$cmd= "wine ISCC.exe \"Z:$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"";
-	    	}
+    		print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"\n";
+    		$cmd= "wine ISCC.exe \"Z:$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"";
 			print "$cmd\n";
 			$ret= `$cmd`;
-			print "ret=$ret\n";
+			#print "$ret\n";
 
 			# Move to final dir
 			print "Move \"$SOURCE\\build\\$FILENAMEEXEDOLIWAMP.exe\" to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
     		rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe");
             print "Move $SOURCE/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
-            
-            use File::Copy;
-
-            #$ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`;
-            $ret=move("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe", "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe");
+            $ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`;
             
             print "Remove tmp file $SOURCE/build/exe/doliwamp/doliwamp.tmp.iss\n";
-            #$ret=`rm "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
-            $ret=unlink("$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss");
+            $ret=`rm "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
             
     		next;
     	}
@@ -1274,7 +1242,7 @@ if ($nboftargetok) {
 
 print "\n----- Summary -----\n";
 foreach my $target (sort keys %CHOOSEDTARGET) {
-	if ($target eq '-CHKSUM') { print "Checksum was generated\n"; next; }
+	if ($target eq '-CHKSUM') { print "Checksum was generated"; next; }
 	if ($CHOOSEDTARGET{$target} < 0) {
 		print "Package $target not built (bad requirement).\n";
 	} else {

build/makepack-howto.txt

@@ -1,47 +1,19 @@
 ----- Dolibarr Makepack How To -----
 This documentation describe steps to build a BETA or RELEASE versions
-of Dolibarr. There is a chapter for BETA version and a chapter for RELEASE version.
-
-
-***** Prerequisites For Linux *****
-
-Prerequisites to build tgz, debian and rpm packages:
-> apt-get install perl tar dpkg dpatch p7zip-full rpm zip php-cli
-
-Prerequisites to build autoexe DoliWamp package:
-> apt-get install wine q4wine
-> Launch "wine cmd" to check a drive Z: pointing to / exists.
-> Install InnoSetup
-   For example by running isetup-5.5.8.exe (https://www.jrsoftware.org)  https://files.jrsoftware.org/is/5/
-> Install WampServer into "C:\wamp64" to have Apache, PHP and MariaDB
-   For example by running wampserver3.2.0_x64.exe (https://www.wampserver.com). 
-   See file build/exe/doliwamp.iss to know the doliwamp version currently setup.
-> Add path to ISCC into PATH windows var:
-  Launch wine cmd, then regedit and add entry int HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PATH
-> To build manually the .exe from Windows (running from makepack-dolibarr.pl script is however recommanded), 
-  open file build/exe/doliwamp.iss and click on button "Compile".
-  The .exe file will be build into directory build.
-
-
-***** Prerequisites For Windows *****
-
-Install Perl
-Install WampServer-3.2.*-64.exe
-isetup-5.5.8.exe
-
+of Dolibarr. There is a chapter for BETA version and a chapter for 
+RELEASE version.
 
 ***** Actions to do a BETA *****
 This files describe steps made by Dolibarr packaging team to make a 
 beta version of Dolibarr, step by step.
 
 - Check all files are commited.
-- Update version/info in ChangeLog, for this you can: 
-To generate a changelog of a major new version x.y.0 (from a repo on branch develop), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
-To generate a changelog of a major new version x.y.0 (from a repo on branch x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
+- Update version/info in ChangeLog. 
+To generate a changelog of a major new version x.y.0 (from develop repo), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
+To generate a changelog of a major new version x.y.0 (from x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
 To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
-Recopy the content of the output file into the file ChangeLog.
-- Note: To know number of lines changes: git diff --shortstat A B
-- Update version number with x.y.z-w in file htdocs/filefunc.inc.php
+- To know number of lines changes: git diff --shortstat A B
+- Update version number with x.y.z-w in htdocs/filefunc.inc.php
 - Commit all changes.
 
 - Run makepack-dolibarr.pl to generate all packages.
@@ -52,6 +24,7 @@ Recopy the content of the output file into the file ChangeLog.
   (/home/dolibarr/wwwroot/files/lastbuild).
 
 - Post a news on dolibarr.org/dolibarr.fr + social networks
+- Send mail on mailings-list
 
 
 ***** Actions to do a RELEASE *****
@@ -59,13 +32,12 @@ This files describe steps made by Dolibarr packaging team to make a
 complete release of Dolibarr, step by step.
 
 - Check all files are commited.
-- Update version/info in ChangeLog, for this you can:
-To generate a changelog of a major new version x.y.0 (from a repo on branch develop), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
-To generate a changelog of a major new version x.y.0 (from a repo pn branch x.y), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
+- Update version/info in ChangeLog. 
+To generate a changelog of a major new version x.y.0 (from develop repo), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
+To generate a changelog of a major new version x.y.0 (from x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
 To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
-Recopy the content of the output file into the file ChangeLog.
-- Note: To know the number of lines changes: git diff --shortstat A B
-- Update version number with x.y.z in file htdocs/filefunc.inc.php
+- To know number of lines changes: git diff --shortstat A B
+- Update version number with x.y.z in htdocs/filefunc.inc.php
 - Commit all changes.
 
 - Run makepack-dolibarr.pl to generate all packages.
@@ -80,3 +52,4 @@ Recopy the content of the output file into the file ChangeLog.
   on server to point to new files (used by some web sites).
 
 - Post a news on dolibarr.org/dolibarr.fr + social networks
+- Send mail on mailings-list

build/pad/README

@@ -1,7 +1,6 @@
 README (English)
 ##################################################
 Building PAD files
-http://pad.asp-software.org/padgen.php
 ##################################################
 
 This directory contains files and docs used to build

build/perl/virtualmin/dolibarr.pl

@@ -30,7 +30,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "14.0.5", "13.0.5", "12.0.5", "11.0.5", "10.0.7", "9.0.4", "8.0.6", "7.0.5" );
+return ( "12.0.3", "11.0.5", "10.0.7", "9.0.4", "8.0.6", "7.0.5" );
 }
 
 sub script_dolibarr_release
@@ -400,8 +400,6 @@ sub script_dolibarr_check_latest
 {
 local ($ver) = @_;
 local @vers = &osdn_package_versions("dolibarr",
-				$ver >= 14.0 ? "dolibarr\\-(12\\.0\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 13.0 ? "dolibarr\\-(12\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 12.0 ? "dolibarr\\-(12\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 11.0 ? "dolibarr\\-(11\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 10.0 ? "dolibarr\\-(10\\.0\\.[0-9\\.]+)\\.tgz" :

build/rpm/dolibarr_fedora.spec

@@ -166,6 +166,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/blockedlog
 %_datadir/dolibarr/htdocs/bookmarks
 %_datadir/dolibarr/htdocs/bom
+%_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/collab
 %_datadir/dolibarr/htdocs/comm
@@ -227,7 +228,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/ticket
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
-%_datadir/dolibarr/htdocs/webhook
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/website
 %_datadir/dolibarr/htdocs/workstation

build/rpm/dolibarr_generic.spec

@@ -54,7 +54,7 @@ BuildRequires: desktop-file-utils
 Group: Applications/Productivity
 Requires: apache-base, apache-mod_php, php-cgi, php-cli, php-bz2, php-gd, php-ldap, php-imap, php-mysqli, php-openssl, fonts-ttf-dejavu 
 Requires: mysql, mysql-client 
-%else
+%else%_datadir/dolibarr/htdocs/datapolicy
 %if 0%{?suse_version}
 # Voir http://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros
 Group: Productivity/Office/Management
@@ -67,7 +67,7 @@ Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mbstring
 Requires: mysql-server, mysql 
 Requires: php-mysqli >= 4.1.0 
 %endif
-%endif
+%endif%_datadir/dolibarr/htdocs/eventorganization
 
 %endif
 
@@ -125,7 +125,7 @@ cui hai bisogno ed essere facile da usare.
 
 %if 0%{?sles_version}
 %{__rm} -rf $RPM_BUILD_ROOT
-%{__mkdir} $RPM_BUILD_ROOT%
+%{__mkdir} $RPM_BUILD_ROOT%_datadir/dolibarr/htdocs/datapolicy
 %{__mkdir} $RPM_BUILD_ROOT%{_sysconfdir}
 %{__mkdir} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 %else
@@ -247,6 +247,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/blockedlog
 %_datadir/dolibarr/htdocs/bookmarks
 %_datadir/dolibarr/htdocs/bom
+%_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/collab
 %_datadir/dolibarr/htdocs/comm
@@ -308,7 +309,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/ticket
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
-%_datadir/dolibarr/htdocs/webhook
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/website
 %_datadir/dolibarr/htdocs/workstation

build/rpm/dolibarr_mandriva.spec

@@ -163,6 +163,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/blockedlog
 %_datadir/dolibarr/htdocs/bookmarks
 %_datadir/dolibarr/htdocs/bom
+%_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/collab
 %_datadir/dolibarr/htdocs/comm
@@ -224,7 +225,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/ticket
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
-%_datadir/dolibarr/htdocs/webhook
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/website
 %_datadir/dolibarr/htdocs/workstation

build/rpm/dolibarr_opensuse.spec

@@ -66,7 +66,7 @@ ed essere facile da usare.
 Programmo web, progettato per poter fornire solo ciò di 
 cui hai bisogno ed essere facile da usare.
 
-%_datadir/dolibarr/htdocs/webhook
+
 
 #---- prep
 %prep
@@ -174,6 +174,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/blockedlog
 %_datadir/dolibarr/htdocs/bookmarks
 %_datadir/dolibarr/htdocs/bom
+%_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/collab
 %_datadir/dolibarr/htdocs/comm
@@ -235,7 +236,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/ticket
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
-%_datadir/dolibarr/htdocs/webhook
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/website
 %_datadir/dolibarr/htdocs/workstation

composer.json

@@ -28,14 +28,14 @@
 		"ext-curl" : "*",
 		"ckeditor/ckeditor" : "4.12.1",
 		"mike42/escpos-php" : "2.2",
-		"mobiledetect/mobiledetectlib" : "2.8.39",
+		"mobiledetect/mobiledetectlib" : "2.8.34",
 		"phpoffice/phpexcel" : "1.8.2",
 		"restler/framework" : "3.0.0-RC6",
 		"tecnickcom/tcpdf" : "6.3.2",
 		"nnnick/chartjs" : "^2.9",
 		"stripe/stripe-php" : "6.43.1",
 		"maximebf/debugbar" : "1.15.1",
-		"symfony/var-dumper" : "3.2"
+		"symfony/var-dumper" : "3"
 	},
 	"require-dev" : {
 		"php-parallel-lint/php-parallel-lint" : "^0",
@@ -59,4 +59,4 @@
 		"ext-zip" : "ODT, Excel and file compression support",
 		"ext-xml" : "Excel support"
 	}
-}
+}

dev/dolibarr_changes.txt

@@ -102,7 +102,7 @@ with
 * Replace in tcpdf.php
 
 			if (!@TCPDF_STATIC::file_exists($file)) {
-				return false;	
+				return false;
 			}
 
 with
@@ -110,13 +110,9 @@ with
 			if (!@TCPDF_STATIC::file_exists($file)) {
 				// DOL CHANGE If we keep this, the image is not visible on pages after the first one.
 				//var_dump($file.' '.(!@TCPDF_STATIC::file_exists($file)));
-				//return false;	
-                $tfile = str_replace(' ', '%20', $file);
-				if (@TCPDF_STATIC::file_exists($tfile)) {
-					$file = $tfile;
-				}
+				//return false;
 			}
-			
+
 * Replace in tcpdf.php
 
 		if (($imgsrc[0] === '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
@@ -138,7 +134,6 @@ with
 		}
 		elseif (($imgsrc[0] === '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
 
-
 * In tecnickcom/tcpdf/include/tcpdf_static.php, in function fopenLocal, replace
 
 		if (strpos($filename, '://') === false) {
@@ -154,16 +149,16 @@ with
         elseif (strpos($filename, '://') === false)
 
 * To avoid to have QRcode changed because generated with a random mask, replace
-define('QR_FIND_FROM_RANDOM', 2);
-with
-define('QR_FIND_FROM_RANDOM', false);
+	define('QR_FIND_FROM_RANDOM', 2);
+	with:
+	define('QR_FIND_FROM_RANDOM', false);
 
 * Removed useless directories ("examples", "tools")
 
-* Optionnaly, removed all fonts except 
-    dejavusans* (used by greek, arab, persan, romanian, turkish), 
-    freemono* (russian), 
-    cid*+msungstdlight+stsongstdlight+uni2cid* (chinese), 
+* Optionnaly, removed all fonts except
+    dejavusans* (used by greek, arab, persan, romanian, turkish),
+    freemono* (russian),
+    cid*+msungstdlight+stsongstdlight+uni2cid* (chinese),
     helvetica* (all other languages),
     zapfdingbats.php (for special chars like form checkboxes)
 
@@ -175,15 +170,15 @@ In htdocs/includes/tecnickcom/tcpdf/tcpdf.php
 * In tecnickcom/tcpdf/include/tcpdf_static, in function intToRoman, right at the beginning
   of the function, replace:
 
-		$roman = '';
+	$roman = '';
 
-with:
+	with:
 
-		$roman = '';
-		if ($number >= 4000) {
-			// do not represent numbers above 4000 in Roman numerals
-			return strval($number);
-		}
+	$roman = '';
+	if ($number >= 4000) {
+		// do not represent numbers above 4000 in Roman numerals
+		return strval($number);
+	}
 
 
 
@@ -201,14 +196,9 @@ with:
 
 * Fix syntax error by replacing
 	} elseif (($key == '/Index') AND ($v[0] == PDF_TYPE_ARRAY AND count($v[1] >= 2))) {
-with
+	with
 	} elseif (($key == '/Index') AND ($v[0] == PDF_TYPE_ARRAY AND count($v[1]) >= 2)) {
 
-* Fix php fatal error on php 8.0 on tcpdi.php
-	while (list($k, $v) = each($value[1])) {
-with
-	foreach ($value[1] as $k => $v) {
-
 
 
 JSGANTT:
@@ -239,13 +229,11 @@ JCROP:
 * Remove analytics tag into file index.html
 
 
-
 JQUERYFILETREE:
 ---------------
 * Remove directory htdocs/includes/jquery/plugins/jqueryFileTree/connectors
 
 
-
 RESTLER:
 --------
 
@@ -275,13 +263,24 @@ RESTLER:
 	with 
 	
 	$loaders = array_unique(static::$rogueLoaders, SORT_REGULAR);
-	
-* Replace CommentParser.php line 423
-	elseif (count($value) && is_numeric($value[0]))
-	
-	with
-	
-	elseif (count($value) && isset($value[0]) && is_numeric($value[0]))
+
+
+* Add a test into AutoLoader.php to complete function loadThisLoader and test if property exists before calling it. For this replace code
+
+	if (false !== $file = $b::$loader[1]($className) && $this->exists($className, $b::$loader[1])) {
+        	return $file;
+        }
+
+	with:
+
+	//avoid PHP Fatal error:  Uncaught Error: Access to undeclared static property: Composer\\Autoload\\ClassLoader::$loader
+	//in case of multiple autoloader systems
+	if(property_exists($b, $loader[1])) {
+		if (false !== $file = $b::$loader[1]($className)
+			&& $this->exists($className, $b::$loader[1])) {
+			return $file;
+		}
+	}
 
 
 +With swagger 2 provided into /explorer:
@@ -297,16 +296,15 @@ PARSEDOWN
 * Add support of css by adding in Parsedown.php:
 
 	// @CHANGE LDR
-	'class' => $Link['element']['attributes']['class'] 
+	'class' => $Link['element']['attributes']['class']
 
 	...
-	
+
 	// @CHANGE LDR
-    if (preg_match('/{([^}]+)}/', $remainder, $matches2))
-    {
-        $Element['attributes']['class'] = $matches2[1];
-       	$remainder = preg_replace('/{'.preg_quote($matches2[1],'/').'}/', '', $remainder);
-    }
+	if (preg_match('/{([^}]+)}/', $remainder, $matches2)) {
+		$Element['attributes']['class'] = $matches2[1];
+       		$remainder = preg_replace('/{'.preg_quote($matches2[1],'/').'}/', '', $remainder);
+    	}
 
 
 	// @CHANGE LDR
@@ -339,7 +337,7 @@ Add into Class Google of file OAuth2/Service/Google:
         }
         $this->approvalPrompt = $prompt;
     }
-    
+
 
 
 JEDITABLE.JS

dev/examples/code/README

@@ -5,4 +5,4 @@ This directory contains samples of code to use Dolibarr business classes to buil
 external interfaces that need to read/update data from/into Dolibarr.
 
 You can also have a look at the Dolibarr doxygen doc that describes all files and classes:
-https://doxygen.dolibarr.org/
+http://www.dolibarr.org/html_doxygen/index.html

dev/examples/zapier/package.json

@@ -15,7 +15,7 @@
     "npm": ">=5.6.0"
   },
   "dependencies": {
-    "zapier-platform-core": "11.3.1"
+    "zapier-platform-core": "11.0.1"
   },
   "devDependencies": {
     "mocha": "^5.2.0",

dev/initdemo/initdemo.sh

@@ -132,7 +132,7 @@ then
 	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
 	trap "rm -f $fichtemp" 0 1 2 5 15
 	$DIALOG --title "Init Dolibarr with demo values" --clear \
-	        --passwordbox "Password for Mysql user login :" 16 55 2> $fichtemp
+	        --inputbox "Password for Mysql user login :" 16 55 2> $fichtemp
 	
 	valret=$?
 	
@@ -153,7 +153,7 @@ then
 	# ---------------------------- confirmation
 	DIALOG=${DIALOG=dialog}
 	$DIALOG --title "Init Dolibarr with demo values" --clear \
-	        --yesno "Do you confirm ? \n Dump file : '$dumpfile' \n Dump dir : '$mydir' \n Document dir : '$documentdir' \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : --hidden--" 15 55
+	        --yesno "Do you confirm ? \n Dump file : '$dumpfile' \n Dump dir : '$mydir' \n Document dir : '$documentdir' \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : '$passwd'" 15 55
 	
 	case $? in
 	        0)      echo "Ok, start process...";;

dev/initdemo/initdemopassword.sh

@@ -171,10 +171,7 @@ if [ $res -ne 0 ]; then
 fi 
 
 if [ -s "$mydir/initdemopostsql.sql" ]; then
-	echo A file initdemopostsql.sql was found, we execute it.
 	mysql -P$port $base < "$mydir/initdemopostsql.sql"
-else
-	echo No file initdemopostsql.sql found, so no extra sql action done.
 fi 
 
 

dev/initdemo/savedemo.sh

@@ -116,7 +116,7 @@ then
 	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
 	trap "rm -f $fichtemp" 0 1 2 5 15
 	$DIALOG --title "Save Dolibarr with demo values" --clear \
-	        --passwordbox "Password for Mysql root login :" 16 55 2> $fichtemp
+	        --inputbox "Password for Mysql root login :" 16 55 2> $fichtemp
 	
 	valret=$?
 	
@@ -150,7 +150,7 @@ then
 	# ---------------------------- confirmation
 	DIALOG=${DIALOG=dialog}
 	$DIALOG --title "Save Dolibarr with demo values" --clear \
-	        --yesno "Do you confirm ? \n Dump file : '$dumpfile' \n Dump dir : '$mydir' \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : --hidden--" 15 55
+	        --yesno "Do you confirm ? \n Dump file : '$dumpfile' \n Dump dir : '$mydir' \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : '$passwd'" 15 55
 	
 	case $? in
 	        0)      echo "Ok, start process...";;

dev/initdemo/sftpget_and_loaddump.php

@@ -4,7 +4,7 @@
  *
  * 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
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,

dev/initdemo/updatedemo.php

@@ -4,7 +4,7 @@
  *
  * 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
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,

dev/resources/iso-normes/accountancy_rules.txt

@@ -2,13 +2,13 @@
 Gestion escompte:
 
 Sur une facture de 120 € TTC :
-707xxx      100 € HT
-44571x       20 € TVA
-411xxx      120 € TTC
-
+707xxx                 100 € HT
+44571x                 20 € TVA
+411xxx    120 € TTC
+ 
 Le client règle rapidement et on lui accorde un escompte de 3% (120 € * 3% = 3.6 € TTC), on aura donc :
-665000      3,00 € HT
-44571x      0,60 € TVA
-411xxx      3,60 € TTC
-
+665000     3,00 € HT
+44571x     0,60 € TVA
+411xxx                 3.60 € TVA
+ 
 Et ça marche à l’inverse avec un fournisseur sauf que l’on est en 775000 au lieu de 665000 pour escompte obtenus.

dev/resources/iso-normes/address_format.txt

@@ -1,5 +1,3 @@
-Address format
-
 https://bitboost.com/ref/international-address-formats.html#Formats
 
 https://www.upu.int/en/Postal-Solutions/Programmes-Services/Addressing-Solutions

dev/resources/iso-normes/barcode_EAN13.txt

@@ -0,0 +1,129 @@
+Barcode EAN 13
+
+FR
+==
+Signification des chiffres.
+
+- 2 chiffres pour le code pays ou code systeme
+- 5 chiffres pour l'identificateur de societe
+- 5 chiffres pour l'identificateur d'article
+- 1 chiffre pour la somme de controle
+
+Cette regle subit de nombreuses entorses pour ameliorer l'usage des chiffres disponibles.
+Voici la liste des codes pays ou systeme :
+
+
+
+EN
+==
+Meaning of the numbers.
+
+- 2 digits for the country code or system code
+- 5 digits for the company identifier
+- 5 digits for item identifier
+- 1 digit for checksum
+
+This rule has been twisted many times to improve the use of the available numbers.
+Here is the list of country codes or system:
+
+
+
+List
+====
+
+00 <20> 13 UCC (Etats-Unis et Canada)
+20 <20> 29 Codification interne en magasin
+30 <20> 37 GENCOD-EAN France
+380 BCCI (Bulgarie)
+383 SANA (Slovenie)
+385 CRO-EAN (Croatie)
+387 EAN-BIH (Bosnie-Herzegovine)
+400 <20> 440 CCG (Allemagne)
+45 + 49 Distribution Code Center <20> DCC (Japon)
+460 <20> 469 UNISCAN - EAN Russie (Federation de Russie)
+471 CAN (Taiwan)
+474 EAN Estonie
+475 EAN Lettonie
+476 EAN Azerba<62> djan
+477 EAN Lituanie
+478 EAN Ouzbekistan
+479 EAN Sri Lanka
+480 PANC (Philippines)
+481 EAN Bielorussie
+482 EAN Ukraine
+484 EAN Moldavie
+485 EAN Armenie
+486 EAN Georgie
+487 EAN Kazakhstan
+489 HKANA (Hong Kong)
+50 E Centre UK
+520 HELLCAN-EAN HELLAS (Grece)
+528 EAN Liban
+529 EAN Chypre
+531 EAN-MAC (FYR Mac<61>donie)
+535 EAN Malte
+539 EAN Irlande
+54 ICODIF/EAN Belgique. Luxembourg
+560 CODIPOR (Portugal)
+569 EAN Islande
+57 EAN Danemark
+590 EAN Pologne
+594 EAN Roumanie
+599 H.A.P.M.H. (Hongrie)
+600 - 601 EAN Afrique du Sud
+609 EAN Ile Maurice
+611 EAN Maroc
+613 EAN Algerie
+619 Tunicode (Tunisie)
+621 EAN Syrie
+622 EAN Egypte
+625 EAN Jordanie
+626 EAN Iran
+628 EAN Arabie Saoudite
+64 EAN Finlande
+690 - 693 Article Numbering Centre of China - ANCC (Chine)
+70 EAN Norge (Norvege)
+729 Israeli Bar Code Association <20> EAN Israel
+73 EAN Suede
+740 EAN Guatemala
+741 EAN El Salvador
+742 ICCC (Honduras)
+743 EAN Nicaragua
+744 EAN Costa Rica Panama
+746 746 EAN Republique Dominicaine
+750 AMECE (Mexique)
+759 EAN Venezuela
+76 EAN (Schweiz, Suisse, Svizzera)
+770 IAC (Colombie)
+773 EAN Uruguay
+775 APC - EAN Peru (Perou)
+777 EAN Bolivie
+779 CODIGO - EAN Argentine
+780 EAN Chili
+784 EAN Paraguay
+786 ECOP (Equateur)
+789 EAN Bresil
+80 <20> 83 INDICOD (Italie)
+84 AECOC (Espagne)
+850 Camera de Comercio de la Republica de Cuba (Cuba)
+858 EAN Slovaquie
+859 EAN Republique Tcheque
+860 EAN YU (Yougoslavie)
+867 EAN DPR Korea (Coree du Nord)
+869 Union of Chambers of Commerce of Turkey (Turquie)
+87 EAN Nederland (Hollande)
+880 EAN Korea (Coree du Sud)
+885 EAN Thailande
+888 SANC (Singapour)
+890 EAN Inde
+893 EAN Vietnam
+899 EAN Indonesie
+90 - 91 EAN Autriche
+93 EAN Australie
+94 EAN Nouvelle Zelande
+955 Malaysian Article Numbering Council (MANC) - Malaisie
+977 Publications sirielles (ISSN)
+978 - 979 Livres (ISBN)
+980 Refus de remboursement
+981 - 982 Coupons (monnaie courante)
+99 Coupons

dev/resources/iso-normes/currencies_iso-4217.txt

@@ -1,12 +1,8 @@
 # File of all ISO-4217 currencies codes
+# http://en.wikipedia.org/wiki/ISO_4217
+# http://fx.sauder.ubc.ca/currency_table.html for symbols for 2 letter code
 #
-# https://en.wikipedia.org/wiki/ISO_4217
-# https://en.wikipedia.org/wiki/Currency_symbol   for symbols for 2 letter code
-#
-
-
-# Code, Currency Name, Nb decimals
-
+# Code,Name,Nb decimals
 AED,UAE Dirham,2
 AFN,Afghanistan Afghani,2
 ALL,Albanian Lek,2

dev/resources/iso-normes/locales.txt

@@ -1,5 +1,3 @@
-Date and number format
-----------------------
 
 For languages:
 https://icu4c-demos.unicode.org/icu-bin/icudemos - Locale Explorer -> Error 404

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

@@ -1,29 +0,0 @@
-QR-Code = Quick Response Code   -  is a two-dimensional / 2D- / Matrix-Barcode
-
-ISO/IEC 18004
-
-
-List of QR Code format we found on some invoices
-------------------------------------------------
-
-
-* For SEPA QR payment Code format (Europe)
-------------------------------------------
-https://en.wikipedia.org/wiki/EPC_QR_code#Generators
-
-
-
-* For ZATCA QR Code format (Saudi Arabia). Used when INVOICE_ADD_ZATCA_QR_CODE is set
--------------------------------------------------------------------------------------
-https://www.pwc.com/m1/en/services/tax/me-tax-legal-news/2021/saudi-arabia-guide-to-develop-compliant-qr-code-for-simplified-einvoices.html
-
-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 
-
-
-* FOR QR-Bill in switzerland
-----------------------------
-Syntax of QR Code https://www.swiss-qr-invoice.org/fr/
-Syntax of complentary 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/

dev/resources/iso-normes/qr-bar-codes/barcode_EAN13.txt

@@ -1,129 +0,0 @@
-Barcode EAN 13
-
-FR
-==
-Signification des chiffres.
-
-- 2 chiffres pour le code pays ou code systeme
-- 5 chiffres pour l'identificateur de societe
-- 5 chiffres pour l'identificateur d'article
-- 1 chiffre pour la somme de controle
-
-Cette regle subit de nombreuses entorses pour ameliorer l'usage des chiffres disponibles.
-Voici la liste des codes pays ou systeme :
-
-
-
-EN
-==
-Meaning of the numbers:
-
-- first 2-3 digits for the country code or system code
-- 5 digits for the company identifier
-- 5 digits for item identifier
-- 1 digit for checksum
-
-This rule has been twisted many times to improve the use of the available numbers.
-
-Here is the list of country codes or system:
-
-
-List
-====
-
-00 - 13  UCC  (U.S.A / États-Unis & Canada)
-20 - 29  Flag for internal numbering / Codification interne en magasin
-30 - 37  GENCOD-EAN  France
-380      BCCI  (Bulgaria)
-383      SANA  (Slovenia)
-385      CRO-EAN  (Croatia)
-387      EAN-BIH  (Bosnia-Herzegovina)
-400-440  CCG  (DE/Germany/Allemagne)
-45 + 49  Distribution Code Center - DCC  (Japan)
-460-469  UNISCAN - EAN Russia  (Federation de Russie)
-471      CAN  Taiwan
-474      EAN  Estonia
-475      EAN  Latvia
-476      EAN  Azerbaijan
-477      EAN  Lithuania
-478      EAN  Uzbekistan
-479      EAN  Sri Lanka
-480      PANC Philippines
-481      EAN  Belarus
-482      EAN  Ukraine
-484      EAN  Moldova 
-485      EAN  Armenia
-486      EAN  Georgia
-487      EAN  Kazakhstan
-489      HKANA Hong Kong
-50       E Centre UK - United Kingdom 
-520      HELLCAN-EAN HELLAS - Greece
-528      EAN  Lebanon
-529      EAN  Cyprus
-531      EAN-MAC (FYR Macedonia)
-535      EAN  Malta
-539      EAN  Ireland
-54       ICODIF/EAN  Belgium & Luxembourg
-560      CODIPOR (Portugal)
-569      EAN  Iceland/Islande
-57       EAN  Denmark
-590      EAN  Poland
-594      EAN  Romania
-599      H.A.P.M.H. (Hungary)
-600-601  EAN  South Africa
-609      EAN  Mauritius Island
-611      EAN  Morocco
-613      EAN  Algeria
-619      Tunicode (Tunisia)
-621      EAN  Syria
-622      EAN  Egypt
-625      EAN  Jordan/Jordanie
-626      EAN  Iran
-628      EAN  Saudi Arabia
-64       EAN  Finland
-690-693  ANCC - Article Numbering Centre of China
-70  EAN Norge (Norvege)
-729 Israeli Bar Code Association - EAN Israel
-73  EAN Suede
-740 EAN Guatemala
-741 EAN El Salvador
-742 ICCC (Honduras)
-743 EAN Nicaragua
-744 EAN Costa Rica Panama
-746 746 EAN Republique Dominicaine
-750 AMECE (Mexique)
-759 EAN Venezuela
-76  EAN (Schweiz, Suisse, Svizzera)
-770 IAC (Colombie)
-773 EAN Uruguay
-775 APC - EAN Peru (Perou)
-777 EAN Bolivie
-779 CODIGO - EAN Argentine
-780 EAN Chili
-784 EAN Paraguay
-786 ECOP (Equateur)
-789 EAN Bresil
-80 - 83 INDICOD (Italy)
-84  AECOC (Espagne)
-850 Camera de Comercio de la Republica de Cuba (Cuba)
-858 EAN Slovaquie
-859 EAN Republique Tcheque
-860 EAN YU (Yougoslavie)
-867 EAN DPR Korea (Coree du Nord)
-869 Union of Chambers of Commerce of Turkey (Turquie)
-87  EAN Nederland (Hollande)
-880 EAN Korea (Coree du Sud)
-885 EAN Thailande
-888 SANC (Singapour)
-890 EAN Inde
-893 EAN Vietnam
-899 EAN Indonesie
-90 - 91 EAN Autriche
-93  EAN Australie
-94  EAN Nouvelle Zelande
-955 Malaysian Article Numbering Council (MANC) - Malaisie
-977 Publications sirielles (ISSN)
-978 - 979 Livres (ISBN)
-980 Refus de remboursement
-981 - 982 Coupons (monnaie courante)
-99  Coupons

dev/resources/iso-normes/world_tax_rates.txt

@@ -1,6 +1,3 @@
-VAT Rates
----------
-
 http://www.taxrates.cc/index.html
 https://en.wikipedia.org/wiki/List_of_countries_by_tax_rates
 

dev/setup/apache/virtualhost

@@ -1,93 +1,62 @@
 <VirtualHost *:80>
-	#php_admin_value sendmail_path "/usr/sbin/sendmail -t -i"
-	#php_admin_value mail.force_extra_parameters "-f postmaster@mydomain.com"
-	php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f postmaster@mydomain.com"
-	php_admin_value open_basedir /tmp/:/home/.../htdocs:/home/.../dolibarr_documents:
-	
-	ServerName myvirtualalias
-	ServerAlias myvirtualalias
-	
-	UseCanonicalName On
-	
-	KeepAlive On
-	KeepAliveTimeout 5
-	MaxKeepAliveRequests 20
-	
-	AddDefaultCharset UTF-8
-	
-	DocumentRoot "/home/.../htdocs"
-	
-	<Directory /home/.../htdocs/>
-	   	AllowOverride None
-	   	Options       -Indexes -MultiViews +FollowSymLinks -ExecCGI
-	   	Require all granted
+#php_admin_value sendmail_path "/usr/sbin/sendmail -t -i"
+#php_admin_value mail.force_extra_parameters "-f postmaster@mydomain.com"
+php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f postmaster@mydomain.com"
+php_admin_value open_basedir /tmp/:/home/../htdocs
 
-		# To restrict access by a HTTP basic auth	   
-	   	#AuthType Basic
-       	#AuthName "Authenticate to backoffice"
-       	#AuthUserFile /etc/apache2/.htpasswd
-       	#require valid-user
-	</Directory>
-	
-	# Leaving /public and /api, /dav, .well_known but also wrappers for document and viewimage accessible to everyone
-    <Directory /home/admin/wwwroot/dolibarr/htdocs/public/>
-        AuthType None
-        Require all granted
-        Satisfy any
-    </Directory>
-    <Directory /home/admin/wwwroot/dolibarr/htdocs/api/>
-        AuthType None
-        Require all granted
-        Satisfy any
-    </Directory>
-    <Directory /home/admin/wwwroot/dolibarr/htdocs/dav/>
-        AuthType None
-        Require all granted
-        Satisfy any
-    </Directory>
-    <Directory /home/admin/wwwroot/dolibarr/htdocs/.well-known/>
-        AuthType None
-        Require all granted
-        Satisfy any
-    </Directory>
-    <Files ~ "(document\.php|viewimage\.php|\.js\.php|\.json\.php|\.js|\.css\.php|\.css|\.gif|\.png|\.svg|\.woff2|favicon\.ico)$">
-        AuthType None
-        Require all granted
-        Satisfy any
-    </Files>
+ServerName myvirtualalias
+ServerAlias myvirtualalias
 
-        
-	ErrorLog /var/log/apache2/myvirtualalias_error_log
-	TransferLog /var/log/apache2/myvirtualalias_access_log
-	
-	# Compress returned resources of type php pages, text file export, css and javascript
-	AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript application/x-javascript
-	
-	AddType text/javascript .jgz
-	AddEncoding gzip .jgz
-	ExpiresActive On
-	ExpiresByType image/x-icon A2592000
-	ExpiresByType image/gif A2592000
-	ExpiresByType image/png A2592000
-	ExpiresByType image/jpeg A2592000
-	ExpiresByType text/css A2592000
-	ExpiresByType text/javascript A2592000
-	ExpiresByType application/x-javascript A2592000
-	ExpiresByType application/javascript A2592000
-	
-	SSLEngine On
-	
-	#   A self-signed (snakeoil) certificate can be created by installing
-	#   the ssl-cert package. See
-	#   /usr/share/doc/apache2.2-common/README.Debian.gz for more info.
-	#   If both key and certificate are stored in the same file, only the
-	#   SSLCertificateFile directive is needed.
-	SSLCertificateFile    /etc/letsencrypt/live/www.mydomain.com/cert.pem
-	SSLCertificateKeyFile /etc/letsencrypt/live/www.mydomain.com/privkey.pem
-	SSLCertificateChainFile /etc/letsencrypt/live/www.mydomain.com/chain.pem
-	
-	#RewriteEngine   on
-	#RewriteCond     %{SERVER_PORT} ^80$
-	#RewriteRule     ^(.*)$ https://%{SERVER_NAME}$1 [L,R]
+UseCanonicalName On
+
+AddDefaultCharset UTF-8
+
+DocumentRoot "/home/.../htdocs"
+
+<Directory /home/.../htdocs/>
+   AllowOverride None
+   Options       -Indexes -MultiViews +FollowSymLinks -ExecCGI
+   Require all granted
+</Directory>
+
+<Directory "/home/../htdocs/cache">
+   Deny from all
+   RemoveHandler .phtml .php .php3 .php4 .php5 .php6 .phps .cgi .exe .pl .asp .aspx .shtml .shtm .fcgi .fpl .jsp .htm .html .wml
+   AddType application/x-httpd-php-source .phtml .php .php3 .php4 .php5 .php6 .phps .cgi .exe .pl .asp .aspx .shtml .shtm .fcgi .fpl .jsp .htm .html .wml
+</Directory>
+
+
+ErrorLog /var/log/apache2/myvirtualalias_error_log
+TransferLog /var/log/apache2/myvirtualalias_access_log
+
+# Compress returned resources of type php pages, text file export, css and javascript
+AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript application/x-javascript
+
+AddType text/javascript .jgz
+AddEncoding gzip .jgz
+ExpiresActive On
+ExpiresByType image/x-icon A2592000
+ExpiresByType image/gif A2592000
+ExpiresByType image/png A2592000
+ExpiresByType image/jpeg A2592000
+ExpiresByType text/css A2592000
+ExpiresByType text/javascript A2592000
+ExpiresByType application/x-javascript A2592000
+ExpiresByType application/javascript A2592000
+
+SSLEngine On
+
+#   A self-signed (snakeoil) certificate can be created by installing
+#   the ssl-cert package. See
+#   /usr/share/doc/apache2.2-common/README.Debian.gz for more info.
+#   If both key and certificate are stored in the same file, only the
+#   SSLCertificateFile directive is needed.
+SSLCertificateFile    /etc/letsencrypt/live/www.mydomain.com/cert.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/www.mydomain.com/privkey.pem
+SSLCertificateChainFile /etc/letsencrypt/live/www.mydomain.com/chain.pem
+
+#RewriteEngine   on
+#RewriteCond     %{SERVER_PORT} ^80$
+#RewriteRule     ^(.*)$ https://%{SERVER_NAME}$1 [L,R]
 
 </VirtualHost>

dev/setup/git/hooks/pre-commit

@@ -7,7 +7,7 @@
 # To run the fix manually: cd ~/git/dolibarr; phpcbf -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true "fileordir"
 
 PROJECT=`php -r "echo dirname(dirname(dirname(realpath('$0'))));"`
-STAGED_FILES_CMD=`git diff --cached --name-only --diff-filter=ACMR HEAD | grep -v '/includes/'| grep \\\\.php`
+STAGED_FILES_CMD=`git diff --cached --name-only --diff-filter=ACMR HEAD | grep \\\\.php`
 DIRPHPCS=""
 AUTOFIX=1
 

dev/tools/detectnotabfiles.sh

@@ -10,7 +10,6 @@
 # Syntax
 if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
 then
-	echo "Detect .sh and .spec files that does not contains any tab inside"
 	echo "Usage: fixnotabfiles.sh [list|fix]"
 fi
 

dev/tools/fixaltlanguages.sh

@@ -50,10 +50,6 @@ then
         then
         	aaupper="SA"
         fi        
-        if [ $bb = "IQ" ]
-        then
-        	aaupper="SA"
-        fi        
 
     	bblower=`echo $dirshort | nawk -F"_" '{ print tolower($2) }'`
 
@@ -61,29 +57,23 @@ then
     	if [ "$aa" != "$bblower" -a "$dirshort" != "en_US" ]
     	then
     	    reflang="htdocs/langs/"$aa"_"$aaupper
-    	    echo $reflang" "$aa"_"$bb != $aa"_"$aaupper
-    	    
-    	    # If $reflang is a main language to use to sanitize the alternative file 
-    	    if [ -d $reflang ]
+    	    if [ -d $reflang -a $aa"_"$bb != $aa"_"$aaupper ]
     	    then
-    	    	if [ $aa"_"$bb != $aa"_"$aaupper ]
-    	    	then
-			    	echo "***** Search original into "$reflang
-	    			echo $dirshort is an alternative language of $reflang
-	    			echo ./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2
-	    			./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2
-	    			for fic in `ls htdocs/langs/${aa}_${bb}/*.delta`; do f=`echo $fic | sed -e 's/\.delta//'`; echo $f; mv $f.delta $f; done 
-	    			for fic in `ls htdocs/langs/${aa}_${bb}/*.lang`; 
-	    			do f=`cat $fic | wc -l`; 
-	    			    #echo $f lines into file $fic; 
-	    			    if [ $f = 1 ] 
-	    			    then 
-	    			        echo Only one line remainging into file $fic, we delete it;
-	    			        rm $fic 
-	    			    fi;
-	    			done
-	    		fi
-	    	fi
+		    	echo "***** Search original into "$reflang
+    			echo $dirshort is an alternative language of $reflang
+    			echo ./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2
+    			./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2
+    			for fic in `ls htdocs/langs/${aa}_${bb}/*.delta`; do f=`echo $fic | sed -e 's/\.delta//'`; echo $f; mv $f.delta $f; done 
+    			for fic in `ls htdocs/langs/${aa}_${bb}/*.lang`; 
+    			do f=`cat $fic | wc -l`; 
+    			    #echo $f lines into file $fic; 
+    			    if [ $f = 1 ] 
+    			    then 
+    			        echo Only one line remainging into file $fic, we delete it;
+    			        rm $fic 
+    			    fi;
+    			done
+    		fi
     	fi
     done;
 fi

dev/tools/fixdosfiles.sh

@@ -17,14 +17,14 @@ fi
 # To detec
 if [ "x$1" = "xlist" ]
 then
-	find . \( -iname "functions" -o -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" -o -iname "*.pml" \) -exec file "{}" + | grep -v "CRLF" | grep -v 'custom\/' | grep -v 'documents\/website' | grep -v 'documents\/medias' | grep -v 'documents\/sellyoursaas' | grep CRLF
-#	find . \( -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" \) -exec file "{}" + | grep -v "CRLF" | grep -v 'custom\/' | grep -v 'documents\/website' | grep -v 'documents\/medias' | grep -v 'documents\/sellyoursaas' | grep -v 'htdocs\/includes' | grep CRLF
+	find . \( -iname "functions" -o -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" -o -iname "*.pml" \) -exec file "{}" + | grep -v 'documents\/website' | grep -v 'documents\/mdedias' | grep CRLF
+#	find . \( -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" \) -exec file "{}" + | grep -v 'documents\/website' | grep -v 'documents\/mdedias' | grep -v 'htdocs\/includes' | grep CRLF
 fi
 
 # To convert
 if [ "x$1" = "xfix" ]
 then
-	for fic in `find . \( -iname "functions" -o -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" -o -iname "*.pml" \) -exec file "{}" + | grep -v "CRLF" | grep -v 'custom\/' | grep -v 'documents\/website' | grep -v 'documents\/medias' | grep -v 'documents\/sellyoursaas' | grep CRLF | awk -F':' '{ print $1 }' `
+	for fic in `find . \( -iname "functions" -o -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" -o -iname "*.pml" \) -exec file "{}" + | grep -v 'documents\/website' | grep -v 'documents\/mdedias' | grep CRLF | awk -F':' '{ print $1 }' `
 	do
 		echo "Fix file $fic"
 		dos2unix "$fic"

dev/tools/fixperms.sh

@@ -24,7 +24,6 @@ fi
 if [ "x$1" = "xfix" ]
 then
 	find ./htdocs -type f -iname "*.php" -exec chmod a-x {} \; 
-	find ./htdocs/install/ -type d -exec chmod ug+rw {} \; 
 	chmod a+x ./scripts/*/*.php
 	chmod a+x ./scripts/*/*.sh
 	chmod g-w ./scripts/*/*.php

dev/tools/optimize_images.sh

@@ -14,8 +14,7 @@ max_output_size=0
 usage()
 {
   cat <<EO
-Usage:   $PROGNAME (list|fix) [options]
-Example: optimize_images.sh (list|fix) -i dirtoscan
+Usage: $PROGNAME [options]
 
 Script to optimize JPG and PNG images in a directory.
 
@@ -39,14 +38,13 @@ optimize_image()
 	max_input_size=$(expr $max_input_size + $input_file_size)
 
 	if [ "${1##*.}" = "png" ]; then
-		#optipng -o1 -clobber -quiet "$1" -out "$2.firstpass"
-		echo optipng -o1 -quiet "$1" -out "$2.firstpass"
-		optipng -o1 -quiet "$1" -out "$2.firstpass"
-		pngcrush -q -rem alla -reduce "$2.firstpass" "$2" >/dev/null
-		rm -fr "$2.firstpass"
+		#optipng -o1 -clobber -quiet $1 -out $2.firstpass
+		optipng -o1 -quiet $1 -out $2.firstpass
+		pngcrush -q -rem alla -reduce $2.firstpass $2 >/dev/null
+		rm -fr $2.firstpass
 	fi
 	if [ "${1##*.}" = "jpg" -o "${1##*.}" = "jpeg" ]; then
-		jpegtran -copy none -progressive "$1" > $2
+		jpegtran -copy none -progressive $1 > $2
 	fi
 
 	output_file_size=$(stat -c%s "$2")
@@ -121,8 +119,8 @@ main()
 
 	# Search of all jpg/jpeg/png in $INPUT
 	# We remove images from $OUTPUT if $OUTPUT is a subdirectory of $INPUT
-	echo "Scan $INPUT to find images with find $INPUT -regextype posix-extended -regex '.*\.(jpg|jpeg|png)' | grep -v '/gource/' | grep -v '/includes/' | grep -v '/custom/' | grep -v $OUTPUT"
-	IMAGES=$(find $INPUT -regextype posix-extended -regex '.*\.(jpg|jpeg|png)' | grep -v '/gource/' | grep -v '/includes/' | grep -v '/custom/' | grep -v '/documents/' | grep -v $OUTPUT)
+	echo "Scan $INPUT to find images"
+	IMAGES=$(find $INPUT -regextype posix-extended -regex '.*\.(jpg|jpeg|png)' | grep -v $OUTPUT)
 
 	if [ "$QUIET" == "0" ]; then
 		echo --- Optimizing $INPUT ---
@@ -136,11 +134,11 @@ main()
 			printf '%*.*s' 0 $((linelength - ${#filename} - ${#sDone} )) "$pad"
 		fi
 
-		optimize_image "$CURRENT_IMAGE" "$OUTPUT/$filename"
+		optimize_image $CURRENT_IMAGE $OUTPUT/$filename
 
 		# Replace file
 		if [[ "$INPLACE" == "1" ]]; then
-			mv "$OUTPUT/$filename" "$CURRENT_IMAGE"
+			mv $OUTPUT/$filename $CURRENT_IMAGE
 		fi
 
 		if [ "$QUIET" == "0" ]; then
@@ -185,8 +183,8 @@ ARGS=$(getopt -s bash --options $SHORTOPTS --longoptions $LONGOPTS --name $PROGN
 # Syntax
 if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
 then
-	usage
-	exit 0
+	echo "Usage: optimize_images.sh (list|fix) -i dirtoscan"
+	exit
 fi
 
 eval set -- "$ARGS"

dev/tools/spider.php

@@ -1,145 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- * \file 	dev/tools/spider.php
- * \brief 	Script to spider Dolibarr app.
- *
- * To use it:
- * - Disable module "bookmark"
- * - Exclude param  optioncss, token, sortfield, sortorder
- */
-
-$crawledLinks=array();
-const MAX_DEPTH=2;
-
-
-/**
- * @param string $url	URL
- * @param string $depth	Depth
- * @return string		String
- */
-function followLink($url, $depth = 0)
-{
-	global $crawledLinks;
-	$crawling=array();
-	if ($depth>MAX_DEPTH) {
-		echo "<div style='color:red;'>The Crawler is giving up!</div>";
-		return;
-	}
-	$options=array(
-		'http'=>array(
-			'method'=>"GET",
-			'user-agent'=>"gfgBot/0.1\n"
-		)
-	);
-	$context=stream_context_create($options);
-	$doc=new DomDocument();
-	@$doc->loadHTML(file_get_contents($url, false, $context));
-	$links=$doc->getElementsByTagName('a');
-	$pageTitle=getDocTitle($doc, $url);
-	$metaData=getDocMetaData($doc);
-	foreach ($links as $i) {
-		$link=$i->getAttribute('href');
-		if (ignoreLink($link)) continue;
-		$link=convertLink($url, $link);
-		if (!in_array($link, $crawledLinks)) {
-			$crawledLinks[]=$link;
-			$crawling[]=$link;
-			insertIntoDatabase($link, $pageTitle, $metaData, $depth);
-		}
-	}
-	foreach ($crawling as $crawlURL)
-		followLink($crawlURL, $depth+1);
-}
-
-/**
- * @param string $site	Site
- * @param string $path	Path
- * @return string		String
- */
-function convertLink($site, $path)
-{
-	if (substr_compare($path, "//", 0, 2)==0)
-		return parse_url($site)['scheme'].$path;
-	elseif (substr_compare($path, "http://", 0, 7)==0 or
-		substr_compare($path, "https://", 0, 8)==0 or
-		substr_compare($path, "www.", 0, 4)==0)
-		return $path;
-	else return $site.'/'.$path;
-}
-
-/**
- * @param string $url	URL
- * @return boolean
- */
-function ignoreLink($url)
-{
-	return $url[0]=="#" or substr($url, 0, 11) == "javascript:";
-}
-
-/**
- * @param string 	$link		URL
- * @param string	$title		Title
- * @param string 	$metaData	Array
- * @param int 		$depth		Depth
- * @return void
- */
-function insertIntoDatabase($link, $title, &$metaData, $depth)
-{
-	//global $crawledLinks;
-
-	echo "Inserting new record {URL= ".$link.", Title = '$title', Description = '".$metaData['description']."', Keywords = ' ".$metaData['keywords']."'}<br/><br/><br/>";
-
-	//²$crawledLinks[]=$link;
-}
-
-/**
- * @param string 	$doc		Doc
- * @param string	$url		URL
- * @return string				URL/Title
- */
-function getDocTitle(&$doc, $url)
-{
-	$titleNodes=$doc->getElementsByTagName('title');
-	if (count($titleNodes)==0 or !isset($titleNodes[0]->nodeValue))
-		return $url;
-	$title=str_replace('', '\n', $titleNodes[0]->nodeValue);
-	return (strlen($title)<1)?$url:$title;
-}
-
-/**
- * @param string 	$doc		Doc
- * @return array				Array
- */
-function getDocMetaData(&$doc)
-{
-	$metaData=array();
-	$metaNodes=$doc->getElementsByTagName('meta');
-	foreach ($metaNodes as $node)
-		$metaData[$node->getAttribute("name")] = $node->getAttribute("content");
-	if (!isset($metaData['description']))
-		$metaData['description']='No Description Available';
-	if (!isset($metaData['keywords'])) $metaData['keywords']='';
-	return array(
-		'keywords'=>str_replace('', '\n', $metaData['keywords']),
-		'description'=>str_replace('', '\n', $metaData['description'])
-	);
-}
-
-
-followLink("http://localhost/dolibarr_dev/htdocs");

dev/tools/test/namespacemig/main.inc.php

@@ -1,7 +1,7 @@
 <?php
 
 /*spl_autoload_register(function ($class_name) {
-	//var_dump('class='.$class_name);
+	var_dump('class='.$class_name);
 	require $class_name;
 });
 */

dev/translation/sanity_check_en_langfiles.php

@@ -6,7 +6,7 @@
  *
  * 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
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,

dev/translation/strip_language_file.php

@@ -5,7 +5,7 @@
  *
  * 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
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -177,7 +177,7 @@ foreach ($filesToProcess as $fileToProcess) {
 
 
 	// Start reading and parsing English
-	$aEnglish = array();
+
 	if ($handle = fopen($lEnglishFile, 'r')) {
 		print "Read English File $lEnglishFile:\n";
 		$cnt = 0;
@@ -246,9 +246,6 @@ foreach ($filesToProcess as $fileToProcess) {
 
 		fwrite($oh, "# Dolibarr language file - Source file is en_US - ".(preg_replace('/\.lang$/', '', $fileToProcess))."\n");
 
-		$fileFirstFound = array();
-		$lineFirstFound = array();
-
 		$cnt = 0;
 		while (($line = fgets($handle)) !== false) {
 			$cnt++;
@@ -302,7 +299,6 @@ foreach ($filesToProcess as $fileToProcess) {
 			}
 
 			// String exists in both files and value into alternative language differs from main language but also from english files
-			// so we keep it.
 			if ((! empty($aSecondary[$key]) && $aSecondary[$key] != $aPrimary[$key]
 				&& ! empty($aEnglish[$key]) && $aSecondary[$key] != $aEnglish[$key])
 				|| in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/', $key) || preg_match('/^FormatHour/', $key)

htdocs/accountancy/admin/account.php

@@ -38,7 +38,6 @@ $cancel = GETPOST('cancel', 'alpha');
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
 $massaction = GETPOST('massaction', 'aZ09');
-$optioncss = GETPOST('optioncss', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'accountingaccountlist'; // To manage different context of search
 
 $search_account = GETPOST('search_account', 'alpha');
@@ -52,14 +51,14 @@ $confirm = GETPOST('confirm', 'alpha');
 
 $chartofaccounts = GETPOST('chartofaccounts', 'int');
 
-$permissiontoadd = !empty($user->rights->accounting->chartofaccount);
-$permissiontodelete = !empty($user->rights->accounting->chartofaccount);
+$permissiontoadd = $user->rights->accounting->chartofaccount;
+$permissiontodelete = $user->rights->accounting->chartofaccount;
 
 // Security check
 if ($user->socid > 0) {
 	accessforbidden();
 }
-if (empty($user->rights->accounting->chartofaccount)) {
+if (!$user->rights->accounting->chartofaccount) {
 	accessforbidden();
 }
 
@@ -196,7 +195,7 @@ if (empty($reshook)) {
 	} elseif ($action == 'enable' && $permissiontoadd) {
 		if ($accounting->fetch($id)) {
 			$mode = GETPOST('mode', 'int');
-			$result = $accounting->accountActivate($id, $mode);
+			$result = $accounting->account_activate($id, $mode);
 		}
 		$action = 'update';
 		if ($result < 0) {
@@ -350,8 +349,6 @@ if ($resql) {
 	    	</script>';
 	}
 
-	$newcardbutton = '';
-
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 	if ($optioncss != '') {
 		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -365,7 +362,7 @@ if ($resql) {
 
 	$newcardbutton .= dolGetButtonTitle($langs->trans("New"), $langs->trans("Addanaccount"), 'fa fa-plus-circle', './card.php?action=create');
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
-	print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'accounting_account', 0, $newcardbutton, '', $limit, 0, 0, 1);
+	print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	// Box to select active chart of account
 	print $langs->trans("Selectchartofaccounts")." : ";
@@ -395,7 +392,7 @@ if ($resql) {
 	}
 	print "</select>";
 	print ajax_combobox("chartofaccounts");
-	print '<input type="'.(empty($conf->use_javascript_ajax) ? 'submit' : 'button').'" class="button button-edit" name="change_chart" id="change_chart" value="'.dol_escape_htmltag($langs->trans("ChangeAndLoad")).'">';
+	print '<input type="'.(empty($conf->use_javascript_ajax) ? 'submit' : 'button').'" class="button" name="change_chart" id="change_chart" value="'.dol_escape_htmltag($langs->trans("ChangeAndLoad")).'">';
 
 	print '<br>';
 	print '<br>';
@@ -406,11 +403,6 @@ if ($resql) {
 
 	$moreforfilter = '';
 
-	$accountstatic = new AccountingAccount($db);
-	$accountparent = new AccountingAccount($db);
-	$totalarray = array();
-	$totalarray['nbfield'] = 0;
-
 	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
@@ -446,33 +438,44 @@ if ($resql) {
 	print $searchpicto;
 	print '</td>';
 	print '</tr>';
+	$totalarray = array();
 	print '<tr class="liste_titre">';
 	if (!empty($arrayfields['aa.account_number']['checked'])) {
 		print_liste_field_titre($arrayfields['aa.account_number']['label'], $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
+		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['aa.label']['checked'])) {
 		print_liste_field_titre($arrayfields['aa.label']['label'], $_SERVER["PHP_SELF"], "aa.label", "", $param, '', $sortfield, $sortorder);
+		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['aa.labelshort']['checked'])) {
 		print_liste_field_titre($arrayfields['aa.labelshort']['label'], $_SERVER["PHP_SELF"], "aa.labelshort", "", $param, '', $sortfield, $sortorder);
+		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['aa.account_parent']['checked'])) {
 		print_liste_field_titre($arrayfields['aa.account_parent']['label'], $_SERVER["PHP_SELF"], "aa.account_parent", "", $param, '', $sortfield, $sortorder, 'left ');
+		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['aa.pcg_type']['checked'])) {
 		print_liste_field_titre($arrayfields['aa.pcg_type']['label'], $_SERVER["PHP_SELF"], 'aa.pcg_type,aa.account_number', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.pcg_type']['help'], 1);
+		$totalarray['nbfield']++;
 	}
 	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 		if (!empty($arrayfields['aa.reconcilable']['checked'])) {
 			print_liste_field_titre($arrayfields['aa.reconcilable']['label'], $_SERVER["PHP_SELF"], 'aa.reconcilable', '', $param, '', $sortfield, $sortorder);
+			$totalarray['nbfield']++;
 		}
 	}
 	if (!empty($arrayfields['aa.active']['checked'])) {
 		print_liste_field_titre($arrayfields['aa.active']['label'], $_SERVER["PHP_SELF"], 'aa.active', '', $param, '', $sortfield, $sortorder);
+		$totalarray['nbfield']++;
 	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";
 
+	$accountstatic = new AccountingAccount($db);
+	$accountparent = new AccountingAccount($db);
+
 	$i = 0;
 	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
@@ -617,13 +620,8 @@ if ($resql) {
 	}
 
 	if ($num == 0) {
-		$colspan = 1;
-		foreach ($arrayfields as $key => $val) {
-			if (!empty($val['checked'])) {
-				$colspan++;
-			}
-		}
-		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+		$totalarray['nbfield']++;
+		print '<tr><td colspan="'.$totalarray['nbfield'].'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 	}
 
 	print "</table>";

htdocs/accountancy/admin/accountmodel.php

@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-if (isModEnabled('accounting')) {
+if (!empty($conf->accounting->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 }
 
@@ -78,7 +78,7 @@ $search_country_id = GETPOST('search_country_id', 'int');
 if ($user->socid > 0) {
 	accessforbidden();
 }
-if (empty($user->rights->accounting->chartofaccount)) {
+if (!$user->rights->accounting->chartofaccount) {
 	accessforbidden();
 }
 
@@ -126,7 +126,7 @@ $tabrowid[31] = "";
 
 // Condition to show dictionary in setup page
 $tabcond = array();
-$tabcond[31] = isModEnabled('accounting');
+$tabcond[31] = !empty($conf->accounting->enabled);
 
 // List of help for fields
 $tabhelp = array();
@@ -185,6 +185,11 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 			$ok = 0;
 			setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
 		}
+		/*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
+		{
+			$ok = 0;
+			$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br>';
+		}*/
 	}
 	if (GETPOSTISSET("country") && (GETPOST("country") == '0') && ($id != 2)) {
 		$ok = 0;
@@ -223,17 +228,17 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		$i = 0;
 		foreach ($listfieldinsert as $f => $value) {
 			if ($value == 'price' || preg_match('/^amount/i', $value) || $value == 'taux') {
-				$_POST[$listfieldvalue[$i]] = price2num(GETPOST($listfieldvalue[$i]), 'MU');
+				$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]], 'MU');
 			} elseif ($value == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
 			if ($i) {
 				$sql .= ",";
 			}
-			if (GETPOST($listfieldvalue[$i]) == '') {
+			if ($_POST[$listfieldvalue[$i]] == '') {
 				$sql .= "null";
 			} else {
-				$sql .= "'".$db->escape(GETPOST($listfieldvalue[$i]))."'";
+				$sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
 			}
 			$i++;
 		}
@@ -271,7 +276,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		$i = 0;
 		foreach ($listfieldmodify as $field) {
 			if ($field == 'price' || preg_match('/^amount/i', $field) || $field == 'taux') {
-				$_POST[$listfieldvalue[$i]] = price2num(GETPOST($listfieldvalue[$i]), 'MU');
+				$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]], 'MU');
 			} elseif ($field == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
@@ -279,10 +284,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 				$sql .= ",";
 			}
 			$sql .= $field."=";
-			if (GETPOST($listfieldvalue[$i]) == '') {
+			if ($_POST[$listfieldvalue[$i]] == '') {
 				$sql .= "null";
 			} else {
-				$sql .= "'".$db->escape(GETPOST($listfieldvalue[$i]))."'";
+				$sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
 			}
 			$i++;
 		}
@@ -490,7 +495,7 @@ if ($id) {
 			if ($valuetoshow != '') {
 				print '<td class="'.$class.'">';
 				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
-					print '<a href="'.$tabhelp[$id][$value].'">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+					print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
 				} elseif (!empty($tabhelp[$id][$value])) {
 					print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
 				} else {
@@ -530,7 +535,7 @@ if ($id) {
 		}
 
 		print '<td colspan="3" class="right">';
-		print '<input type="submit" class="button button-add" name="actionadd" value="'.$langs->trans("Add").'">';
+		print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
 		print '</td>';
 		print "</tr>";
 
@@ -548,16 +553,16 @@ if ($id) {
 		$num = $db->num_rows($resql);
 		$i = 0;
 
-		$param = '&id='.urlencode($id);
+		$param = '&id='.$id;
 		if ($search_country_id > 0) {
-			$param .= '&search_country_id='.urlencode($search_country_id);
+			$param .= '&search_country_id='.$search_country_id;
 		}
 		$paramwithsearch = $param;
 		if ($sortorder) {
-			$paramwithsearch .= '&sortorder='.urlencode($sortorder);
+			$paramwithsearch .= '&sortorder='.$sortorder;
 		}
 		if ($sortfield) {
-			$paramwithsearch .= '&sortfield='.urlencode($sortfield);
+			$paramwithsearch .= '&sortfield='.$sortfield;
 		}
 
 		// There is several pages
@@ -626,7 +631,7 @@ if ($id) {
 						fieldListAccountModel($fieldlist, $obj, $tabname[$id], 'edit');
 					}
 
-					print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button button-edit" name="actionmodify" value="'.$langs->trans("Modify").'">';
+					print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
 					print '&nbsp;<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
 				} else {
 					$tmpaction = 'view';

htdocs/accountancy/admin/card.php

@@ -48,7 +48,7 @@ $label = GETPOST('label', 'alpha');
 if ($user->socid > 0) {
 	accessforbidden();
 }
-if (empty($user->rights->accounting->chartofaccount)) {
+if (!$user->rights->accounting->chartofaccount) {
 	accessforbidden();
 }
 
@@ -61,7 +61,7 @@ $object = new AccountingAccount($db);
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$urltogo = $backtopage ? $backtopage : DOL_URL_ROOT.'/accountancy/admin/account.php';
+	$urltogo = $backtopage ? $backtopage : dol_buildpath('/accountancy/admin/account.php', 1);
 	header("Location: ".$urltogo);
 	exit;
 }
@@ -75,7 +75,7 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 			$action = 'create';
 		} else {
-			$sql = "SELECT pcg_version FROM " . MAIN_DB_PREFIX . "accounting_system WHERE rowid = ".((int) $conf->global->CHARTOFACCOUNTS);
+			$sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid='.((int) $conf->global->CHARTOFACCOUNTS);
 
 			dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
 			$result = $db->query($sql);
@@ -121,7 +121,7 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount) {
 			}
 			if (!$error) {
 				setEventMessages("RecordCreatedSuccessfully", null, 'mesgs');
-				$urltogo = $backtopage ? $backtopage : DOL_URL_ROOT.'/accountancy/admin/account.php';
+				$urltogo = $backtopage ? $backtopage : dol_buildpath('/accountancy/admin/account.php', 1);
 				header("Location: " . $urltogo);
 				exit;
 			}
@@ -138,7 +138,7 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount) {
 		} else {
 			$result = $object->fetch($id);
 
-			$sql = "SELECT pcg_version FROM ".MAIN_DB_PREFIX."accounting_system WHERE rowid=".((int) $conf->global->CHARTOFACCOUNTS);
+			$sql = 'SELECT pcg_version FROM '.MAIN_DB_PREFIX.'accounting_system WHERE rowid='.((int) $conf->global->CHARTOFACCOUNTS);
 
 			dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
 			$result2 = $db->query($sql);
@@ -168,13 +168,10 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount) {
 			$object->labelshort = GETPOST('labelshort', 'alpha');
 
 			$result = $object->update($user);
-
 			if ($result > 0) {
 				$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"] . "?id=" . $id);
 				header("Location: " . $urltogo);
 				exit();
-			} elseif ($result == -2) {
-				setEventMessages($langs->trans("ErrorAccountNumberAlreadyExists", $object->account_number), null, 'errors');
 			} else {
 				setEventMessages($object->error, null, 'errors');
 			}
@@ -260,20 +257,7 @@ if ($action == 'create') {
 	print $form->textwithpicto($langs->trans("Pcgtype"), $langs->transnoentitiesnoconv("PcgtypeDesc"));
 	print '</td>';
 	print '<td>';
-	print '<input type="text" name="pcg_type" list="pcg_type_datalist" value="'.dol_escape_htmltag(GETPOSTISSET('pcg_type') ? GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">';
-	// autosuggest from existing account types if found
-	print '<datalist id="pcg_type_datalist">';
-	$sql = "SELECT DISTINCT pcg_type FROM " . MAIN_DB_PREFIX . "accounting_account";
-	$sql .= " WHERE fk_pcg_version = '" . $db->escape($accountsystem->ref) . "'";
-	$sql .= ' AND entity in ('.getEntity('accounting_account', 0).')';		// Always limit to current entity. No sharing in accountancy.
-	$sql .= ' LIMIT 50000'; // just as a sanity check
-	$resql = $db->query($sql);
-	if ($resql) {
-		while ($obj = $db->fetch_object($resql)) {
-			print '<option value="' . dol_escape_htmltag($obj->pcg_type) . '">';
-		}
-	}
-	print '</datalist>';
+	print '<input type="text" name="pcg_type" value="'.dol_escape_htmltag(GETPOSTISSET('pcg_type') ? GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">';
 	print '</td></tr>';
 
 	// Category
@@ -303,7 +287,7 @@ if ($action == 'create') {
 
 		// Edit mode
 		if ($action == 'update') {
-			print dol_get_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'accounting_account');
+			print dol_get_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'billr');
 
 			print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -336,20 +320,7 @@ if ($action == 'create') {
 			print $form->textwithpicto($langs->trans("Pcgtype"), $langs->transnoentitiesnoconv("PcgtypeDesc"));
 			print '</td>';
 			print '<td>';
-			print '<input type="text" name="pcg_type" list="pcg_type_datalist" value="'.dol_escape_htmltag(GETPOSTISSET('pcg_type') ? GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">';
-			// autosuggest from existing account types if found
-			print '<datalist id="pcg_type_datalist">';
-			$sql = 'SELECT DISTINCT pcg_type FROM ' . MAIN_DB_PREFIX . 'accounting_account';
-			$sql .= " WHERE fk_pcg_version = '" . $db->escape($accountsystem->ref) . "'";
-			$sql .= ' AND entity in ('.getEntity('accounting_account', 0).')';		// Always limit to current entity. No sharing in accountancy.
-			$sql .= ' LIMIT 50000'; // just as a sanity check
-			$resql = $db->query($sql);
-			if ($resql) {
-				while ($obj = $db->fetch_object($resql)) {
-					print '<option value="' . dol_escape_htmltag($obj->pcg_type) . '">';
-				}
-			}
-			print '</datalist>';
+			print '<input type="text" name="pcg_type" value="'.dol_escape_htmltag(GETPOSTISSET('pcg_type') ? GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">';
 			print '</td></tr>';
 
 			// Category
@@ -364,14 +335,18 @@ if ($action == 'create') {
 
 			print dol_get_fiche_end();
 
-			print $form->buttonsSaveCancel();
+			print '<div class="center">';
+			print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
+			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+			print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
+			print '</div>';
 
 			print '</form>';
 		} else {
 			// View mode
 			$linkback = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/account.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-			print dol_get_fiche_head($head, 'card', $langs->trans('AccountAccounting'), -1, 'accounting_account');
+			print dol_get_fiche_head($head, 'card', $langs->trans('AccountAccounting'), -1, 'billr');
 
 			dol_banner_tab($object, 'ref', $linkback, 1, 'account_number', 'ref');
 
@@ -420,13 +395,13 @@ if ($action == 'create') {
 			print '<div class="tabsAction">';
 
 			if (!empty($user->rights->accounting->chartofaccount)) {
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=update&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Modify').'</a>';
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=update&token='.newToken().'&id='.$id.'">'.$langs->trans('Modify').'</a>';
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Modify').'</a>';
 			}
 
 			if (!empty($user->rights->accounting->chartofaccount)) {
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Delete').'</a>';
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$id.'">'.$langs->trans('Delete').'</a>';
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Delete').'</a>';
 			}

htdocs/accountancy/admin/categories.php

@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2016       Jamal Elbaz         <jamelbaz@gmail.pro>
- * Copyright (C) 2017-2022  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+/* Copyright (C) 2016		Jamal Elbaz			<jamelbaz@gmail.pro>
+ * Copyright (C) 2017		Alexandre Spangaro	<aspangaro@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -110,7 +110,7 @@ print '<table class="border centpercent">';
 print '<tr><td class="titlefield">'.$langs->trans("AccountingCategory").'</td>';
 print '<td>';
 $formaccounting->select_accounting_category($cat_id, 'account_category', 1, 0, 0, 1);
-print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
+print '<input class="button" type="submit" value="'.$langs->trans("Select").'">';
 print '</td></tr>';
 
 // Select the accounts
@@ -124,8 +124,7 @@ if (!empty($cat_id)) {
 
 	$arraykeyvalue = array();
 	foreach ($accountingcategory->lines_cptbk as $key => $val) {
-		$doc_ref = !empty($val->doc_ref) ? $val->doc_ref : '';
-		$arraykeyvalue[length_accountg($val->numero_compte)] = length_accountg($val->numero_compte) . ' - ' . $val->label_compte . ($doc_ref ? ' '.$doc_ref : '');
+		$arraykeyvalue[length_accountg($val->numero_compte)] = length_accountg($val->numero_compte).' ('.$val->label_compte.($val->doc_ref ? ' '.$val->doc_ref : '').')';
 	}
 
 	if (is_array($accountingcategory->lines_cptbk) && count($accountingcategory->lines_cptbk) > 0) {
@@ -138,7 +137,7 @@ if (!empty($cat_id)) {
 		print '</select><br>';
 		print ajax_combobox('cpt_bk');
 		*/
-		print '<input type="submit" class="button button-add" id="" class="action-delete" value="'.$langs->trans("Add").'"> ';
+		print '<input class="button" type="submit" id="" class="action-delete" value="'.$langs->trans("Add").'"> ';
 	}
 	print '</td></tr>';
 }

htdocs/accountancy/admin/categories_list.php

@@ -111,7 +111,7 @@ $tabrowid[32] = "";
 
 // Condition to show dictionary in setup page
 $tabcond = array();
-$tabcond[32] = isModEnabled('accounting');
+$tabcond[32] = !empty($conf->accounting->enabled);
 
 // List of help for fields
 $tabhelp = array();
@@ -148,10 +148,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		if ($value == 'formula' && !GETPOST('formula')) {
 			continue;
 		}
-		if ($value == 'range_account' && !GETPOST('range_account')) {
+		if ($value == 'range_account' && empty($_POST['range_account'])) {
 			continue;
 		}
-		if (($value == 'country' || $value == 'country_id') && GETPOST('country_id')) {
+		if (($value == 'country' || $value == 'country_id') && (!empty($_POST['country_id']))) {
 			continue;
 		}
 		if (!GETPOSTISSET($value) || GETPOST($value) == '') {
@@ -195,6 +195,17 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		setEventMessages($langs->transnoentities('ErrorFieldMustBeANumeric', $langs->transnoentities("Position")), null, 'errors');
 	}
 
+	// Clean some parameters
+	if ($_POST["accountancy_code"] <= 0) {
+		$_POST["accountancy_code"] = ''; // If empty, we force to null
+	}
+	if ($_POST["accountancy_code_sell"] <= 0) {
+		$_POST["accountancy_code_sell"] = ''; // If empty, we force to null
+	}
+	if ($_POST["accountancy_code_buy"] <= 0) {
+		$_POST["accountancy_code_buy"] = ''; // If empty, we force to null
+	}
+
 	// Si verif ok et action add, on ajoute la ligne
 	if ($ok && GETPOST('actionadd', 'alpha')) {
 		if ($tabrowid[$id]) {
@@ -232,7 +243,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 			if ($i) {
 				$sql .= ",";
 			}
-			if (GETPOST($listfieldvalue[$i]) == '' && !$listfieldvalue[$i] == 'formula') {
+			if ($_POST[$listfieldvalue[$i]] == '' && !$listfieldvalue[$i] == 'formula') {
 				$sql .= "null"; // For vat, we want/accept code = ''
 			} else {
 				$sql .= "'".$db->escape(GETPOST($listfieldvalue[$i]))."'";
@@ -272,8 +283,8 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		}
 		$i = 0;
 		foreach ($listfieldmodify as $field) {
-			if ($field == 'fk_country' && GETPOST('country') > 0) {
-				$_POST[$listfieldvalue[$i]] = GETPOST('country');
+			if ($field == 'fk_country' && $_POST['country'] > 0) {
+				$_POST[$listfieldvalue[$i]] = $_POST['country'];
 			} elseif ($field == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
@@ -281,10 +292,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 				$sql .= ",";
 			}
 			$sql .= $field."=";
-			if (GETPOST($listfieldvalue[$i]) == '' && !$listfieldvalue[$i] == 'range_account') {
+			if ($_POST[$listfieldvalue[$i]] == '' && !$listfieldvalue[$i] == 'range_account') {
 				$sql .= "null"; // For range_account, we want/accept code = ''
 			} else {
-				$sql .= "'".$db->escape(GETPOST($listfieldvalue[$i]))."'";
+				$sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
 			}
 			$i++;
 		}
@@ -509,7 +520,7 @@ if ($tabname[$id]) {
 		if ($valuetoshow != '') {
 			print '<td class="'.$class.'">';
 			if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
-				print '<a href="'.$tabhelp[$id][$value].'">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+				print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
 			} elseif (!empty($tabhelp[$id][$value])) {
 				print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
 			} else {
@@ -550,7 +561,7 @@ if ($tabname[$id]) {
 	}
 
 	print '<td colspan="4" class="right">';
-	print '<input type="submit" class="button button-add" name="actionadd" value="'.$langs->trans("Add").'">';
+	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
 	print '</td>';
 	print "</tr>";
 
@@ -572,7 +583,7 @@ if ($resql) {
 
 	$param = '&id='.$id;
 	if ($search_country_id > 0) {
-		$param .= '&search_country_id='.urlencode($search_country_id);
+		$param .= '&search_country_id='.$search_country_id;
 	}
 	$paramwithsearch = $param;
 	if ($sortorder) {
@@ -726,14 +737,14 @@ if ($resql) {
 				print '<td class="center">';
 				print '<input type="hidden" name="page" value="'.$page.'">';
 				print '<input type="hidden" name="rowid" value="'.$rowid.'">';
-				print '<input type="submit" class="button button-edit" name="actionmodify" value="'.$langs->trans("Modify").'">';
+				print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
 				print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
 				print '<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'">';
 				print '</td>';
 				print '<td></td>';
 			} else {
 				$tmpaction = 'view';
-				$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+				$parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
 				$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
 				$error = $hookmanager->error; $errors = $hookmanager->errors;
@@ -803,7 +814,7 @@ if ($resql) {
 
 				// Modify link
 				if ($canbemodified) {
-					print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
+					print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit">'.img_edit().'</a></td>';
 				} else {
 					print '<td>&nbsp;</td>';
 				}
@@ -812,7 +823,7 @@ if ($resql) {
 				if ($iserasable) {
 					print '<td class="center">';
 					if ($user->admin) {
-						print '<a href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a>';
+						print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
 					}
 					//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
 					print '</td>';
@@ -875,7 +886,7 @@ function fieldListAccountingCategories($fieldlist, $obj = '', $tabname = '', $co
 
 	$formadmin = new FormAdmin($db);
 	$formcompany = new FormCompany($db);
-	if (isModEnabled('accounting')) {
+	if (!empty($conf->accounting->enabled)) {
 		$formaccounting = new FormAccounting($db);
 	}