Merge pull request #21013 from atm-greg/FIX_12.0_get_batch_only_for_same_fk_product

fix sql to avoid getting product_stock of another product with same batch

.github/CONTRIBUTING.md

@@ -4,14 +4,13 @@ How to contribute to Dolibarr
 Bug reports and feature requests
 --------------------------------
 
-<a name="not-a-support-forum"></a>*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](https://www.dolibarr.org/forum.php). Forums exist in different languages.
+<a name="not-a-support-forum"></a>*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](https://www.dolibarr.org/forum).
 
-Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues). 
-Default language here is english. So please prepare your contributions in english.
+Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues).
 
 1. Please [use the search engine](https://help.github.com/articles/searching-issues) to check if nobody's already reported your problem.
 2. [Create an issue](https://help.github.com/articles/creating-an-issue). Choose an appropriate title. Prepend appropriately with Bug or Feature Request.
-4. Tell us the version you are using!   (look at  /htdocs/admin/system/dolibarr.php?  and check if you are using the latest version) 
+4. Tell us the version you are using!
 3. Write a report with as much detail as possible (Use [screenshots](https://help.github.com/articles/issue-attachments) or even screencasts and provide logging and debugging informations whenever possible).
 
 
@@ -27,8 +26,7 @@ Default language here is english. So please prepare your contributions in englis
 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
+### <a name="branches"></a>Branches
 
 Unless you're fixing a bug, all pull requests should be made against the *develop* branch.
 
@@ -58,7 +56,7 @@ You can add it to your git configuration using:
 git config --local commit.template .gitmessage
 ```
 
-where
+where 
 
 #### Keyword
 In uppercase if you want to have the log comment appears into the generated ChangeLog file.
@@ -103,7 +101,7 @@ Long description (Can span accross multiple lines).
 </pre>
 
 ### Pull Requests
-Pull Request (PR) process is the process to submit a change (enhancement, bug fix, ...) into the code of the project. There is some rules to know and
+Pull Request (PR) process is the process to submit a change (enhancement, bug fix, ...) into the code of the project. There is some rules to know and 
 a process to follow to optimize the chance to have PRs merged efficiently...
 
 * A PR must be atomic. It means it must contains the lower possible changes for 1 need (1 bug fix or 1 new feature) without breaking usability of code. If a PR can be split into several PRs, it often means your PR is not atomic.
@@ -122,7 +120,7 @@ Once a PR has been submitted, you may need to wait for its integration. It is co
 
 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.
+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. 
 
 If the PR is valid, and is kept open for a long time, a tag will also be added on the PR to describe the status of your PR and why the PR is kept open. By putting your mouse on the tag, you will get a full explanation of the tag/status that explain why your PR has not been integrated yet.
 In most cases, it gives you information of things you have to do to have the PR taken into consideration (for example a change is requested, a conflict is expected to be solved, some questions were asked). If you have a yellow, red flag of purple flag, don't expect to have your PR validated. You must first provide the answer the tag ask you. The majority of open PR are waiting an action of the author of the PR.
@@ -143,7 +141,7 @@ Translations done on transifex are available in the next major release.
 
 Note: Sometimes, the source text (english) is modified. In such a case, the translation is reset. Transifex assume that if the original source
 has changed, the translation is surely no more correct so must be done again. But old translation is not lost and you can use the tab "History"
-to retrieve all old translation of a source text, and restore the translation in one click with no need to retranslate it if there is no need to.
+to retreive all old translation of a source text, and restore the translation in one click with no need to retranslate it if there is no need to. 
 
 
 ### Resources

.github/workflows/exakat.yml

@@ -1,17 +0,0 @@
-# See syntax file on https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
-name: "Exakat analysis"
-
-on:
-  schedule:
-  - cron: "0 20 * * *"
-
-jobs:
-  exakat:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Exakat
-      uses: docker://exakat/exakat-ga
-      with:
-        ignore_rules: 'Classes/UseInstanceof,Performances/PrePostIncrement,Functions/UndefinedFunctions,Functions/WrongNumberOfArguments,Functions/WrongTypeWithCall,Variables/UndefinedVariable,Classes/DontUnsetProperties,Classes/NonPpp,Classes/StaticMethodsCalledFromObject,Classes/UseClassOperator,Functions/UsesDefaultArguments,Php/NoClassInGlobal,Php/ShouldUseCoalesce,Php/WrongTypeForNativeFunction,Structures/AddZero,Structures/DropElseAfterReturn,Structures/IfWithSameConditions,Structures/MergeIfThen,Structures/ElseIfElseif,Structures/ExitUsage,Structures/RepeatedPrint,Structures/RepeatedRegex,Structures/SameConditions,Structures/SwitchWithoutDefault,Structures/ShouldMakeTernary,Structures/UselessParenthesis,Structures/UseConstant' 
-        ignore_dirs: '/htdocs/includes,/build,/dev,/doc,/scripts,/test'        

.github/workflows/stale-issues-safe.yml

@@ -14,11 +14,11 @@ jobs:
     - uses: Dolibarr/stale@staleunstale
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-message: 'This issue is stale because it has been open 1 year with no activity. If this is a bug, please comment to confirm it is still present on latest stable version. if this is a feature request, please comment to notify the request is still relevant and not yet covered by latest stable version. This issue may be closed automatically by stale bot in 10 days (you should still be able to re-open it if required).'
+        stale-message: 'This issue is stale because it has been open 1 year with no activity. If this is a bug, please comment to confirm it is still present on latest stable version. if this is a feature request, please comment to notify the request is still relevant and not yet covered by latest stable version. This issue may be closed automatically by stale bot in 15 days (you should still be able to re-open it if required).'
         stale-label: 'Issue Stale (automatic label)'
-        exempt-labels: 'Priority High / Blocking,Priority Top Strategic,Priority Medium,hacktoberfest,hacktoberfest-accepted,good first issue,Bug Security (CVE),Analysis of PR in progress'
+        exempt-labels: 'Priority High / Blocking,Priority Top Strategic,Priority Medium,Hacktoberfest,good first issue,Bug Security (CVE),Analysis of PR in progres'
         days-before-stale: 365
-        days-before-close: 10
+        days-before-close: 15
         operations-per-run: 100
         dry-run: false
         

.gitignore

@@ -37,21 +37,8 @@ htdocs/includes/jakub-onderka/
 htdocs/includes/phpdocumentor/
 htdocs/includes/phpspec/
 htdocs/includes/phpunit/
-htdocs/includes/php-parallel-lint/
 htdocs/includes/sebastian/
 htdocs/includes/squizlabs/
+htdocs/includes/symfony/
 htdocs/includes/webmozart/
 htdocs/.well-known/apple-developer-merchantid-domain-association
-
-# Node Modules
-build/yarn-error.log
-build/node_modules/
-node_modules/
-
-#yarn
-yarn.lock
-
-#package-lock
-package-lock.json
-
-doc/install.lock

.scrutinizer.yml

@@ -17,10 +17,8 @@ filter:
         - build/*
         - dev/*
         - doc/*
-        - documents/*
-        - htdocs/includes/*
-        - node_modules/*
         - test/*
+        - htdocs/includes/*
     paths: 
         - htdocs/*
         - scripts/*

.travis.yml

@@ -50,9 +50,6 @@ jobs:
     - if: type = push AND branch = develop
       php: nightly 
       env: DB=mysql
-    - if: type = push AND branch = 13.0
-      php: nightly 
-      env: DB=mysql
 
 notifications:
   email:
@@ -93,32 +90,26 @@ install:
   echo
 
 - |
-  echo "Installing Composer dependencies - PHP Unit, Parallel Lint, PHP CodeSniffer - for $TRAVIS_PHP_VERSION"
-  if [ "$TRAVIS_PHP_VERSION" = '5.6' ]; then
+  echo "Installing Composer dependencies (PHP Unit, Parallel Lint & PHP CodeSniffer"
+  if [ "$TRAVIS_PHP_VERSION" = '5.4' ] || [ "$TRAVIS_PHP_VERSION" = '5.5' ]; then
+    composer -n require phpunit/phpunit ^4 \
+                        jakub-onderka/php-parallel-lint ^0 \
+                        jakub-onderka/php-console-highlighter ^0 \
+                        squizlabs/php_codesniffer ^3
+  fi
+  if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] \
+     [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ]; then
     composer -n require phpunit/phpunit ^5 \
-                        php-parallel-lint/php-parallel-lint ^1 \
-                        php-parallel-lint/php-console-highlighter ^0 \
+                        jakub-onderka/php-parallel-lint ^0 \
+                        jakub-onderka/php-console-highlighter ^0 \
                         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 \
-                        squizlabs/php_codesniffer ^3
-  fi
-  if [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ]; then
-    composer -n require phpunit/phpunit ^7 \
-                        php-parallel-lint/php-parallel-lint ^1.2 \
-                        php-parallel-lint/php-console-highlighter ^0 \
-                        squizlabs/php_codesniffer ^3
-  fi
-  # phpunit 9 is required for php 8
   if [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
-      composer -n require --ignore-platform-reqs phpunit/phpunit ^7 \
-                                                 php-parallel-lint/php-parallel-lint ^1.2 \
-                                                 php-parallel-lint/php-console-highlighter ^0 \
+      composer -n require --ignore-platform-reqs phpunit/phpunit ^5 \
+                                                 jakub-onderka/php-parallel-lint ^0 \
+                                                 jakub-onderka/php-console-highlighter ^0 \
                                                  squizlabs/php_codesniffer ^3
-  fi
+    fi
   echo
 
 - |
@@ -271,11 +262,7 @@ script:
   # Ensure we catch errors
   set -e
   #parallel-lint --exclude htdocs/includes --blame .
-  parallel-lint --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
-  	--exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
-  	--exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
-  	--exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
-  	--exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --blame .
+  parallel-lint --exclude dev/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/webmozart --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian --exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/phpunit/ --exclude htdocs/includes/composer/autoload_static.php --blame .
   set +e
   echo
 
@@ -398,14 +385,9 @@ script:
   php upgrade.php 11.0.0 12.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade11001200.log
   php upgrade2.php 11.0.0 12.0.0 > $TRAVIS_BUILD_DIR/upgrade11001200-2.log
   php step5.php 11.0.0 12.0.0 > $TRAVIS_BUILD_DIR/upgrade11001200-3.log
-  php upgrade.php 12.0.0 13.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade12001300.log
-  php upgrade2.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-2.log
-  php step5.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-3.log
 
   # Enable modules not enabled into original dump
-  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_PRODUCTBATCH,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_STRIPE > $TRAVIS_BUILD_DIR/enablemodule.log
-  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP >> $TRAVIS_BUILD_DIR/enablemodule.log
-  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT >> $TRAVIS_BUILD_DIR/enablemodule.log
+  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKETSUP,MAIN_MODULE_ACCOUNTING > $TRAVIS_BUILD_DIR/enablemodule.log
   echo $?
   cd -
   set +e

.tx/config

@@ -164,12 +164,6 @@ 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
@@ -332,12 +326,6 @@ source_file = htdocs/langs/en_US/receptions.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.recruitment]
-file_filter = htdocs/langs/<lang>/recruitment.lang
-source_file = htdocs/langs/en_US/recruitment.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.resource]
 file_filter = htdocs/langs/<lang>/resource.lang
 source_file = htdocs/langs/en_US/resource.lang

COPYRIGHT

@@ -21,15 +21,15 @@ Mobiledetect           2.8.34        MIT License                 Yes
 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
+PHPDebugBar            1.15.0        MIT License	             Yes             Used only by the module "debugbar" for developers
+PHPExcel               1.8.1         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
 PHPSpreadSheet         ?             LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
 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										                 Library for logs (used by DebugBar)
 PSR/simple-cache	   ?										                 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)
+Restler                3.0.0RC6      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
 Stripe                 6.43.1        MIT licence                 Yes             Library for Stripe module
@@ -38,8 +38,8 @@ TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes
 
 JS libraries:
 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
+ChartJS				   2.9.3         MIT License                 Yes             JS library for graph
+jQuery                 3.4.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)
@@ -52,7 +52,7 @@ jQuery jqueryFileTree  1.0.1         GPL and MIT License         Yes
 jQuery jquerytreeview  1.4.1         MIT License                 Yes             JS library for filetree
 jQuery TableDnD        0.6           GPL and MIT License         Yes             JS library plugin TableDnD (to reorder table rows)
 jQuery Timepicker      1.1.0         GPL and MIT License         Yes             JS library Timepicker addon for Datepicker
-jsGanttImproved        2.7.3         BSD License                 Yes             JS library (to build Gantt reports)
+jsGanttImproved        1.7.5.4       BSD License                 Yes             JS library (to build Gantt reports)
 JsTimezoneDetect       1.0.6         MIT License                 Yes             JS library to detect user timezone
 SwaggerUI			   2.0.24		 GPL-2+                      Yes             JS library to offer the REST API explorer
 

ChangeLog

@@ -3,361 +3,6 @@ English Dolibarr ChangeLog
 --------------------------------------------------------------
 
 
-***** ChangeLog for 13.0.2 compared to 13.0.1 *****
-
-FIX: 11.0 - $this->socid injected in query without checking for empty value
-FIX: #16096 #16085 Any call of ajax pages must provide the token
-FIX: #16296
-FIX: #16325
-FIX: #16341 : Fetch the Product ExtraFields in Shippment lines
-FIX: #16366
-FIX: #16393 Do not sanitize <!DOCTYPE html>
-FIX: #16420 #16423 #16488 #16477
-FIX: #16431
-FIX: #16465
-FIX: #16480
-FIX: #16485
-FIX: #16487
-FIX: #16503
-FIX: #16530
-FIX: #16533
-FIX: #16629
-FIX: #16671 Can not generate zip file of documents in backup tool
-FIX: Add "Now" link on social charges creation card
-FIX: avoid undefined url and missing token
-FIX: Bad project filter in ticket list
-FIX: Buttons to disable bindings not working
-FIX: class not found when creating recuring invoice from invoice+discount
-FIX: File attachment on lots
-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: 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
-FIX: Rounding amount on social charges card updating
-FIX: select list dependencies now work for ModuleBuilder sellist field
-FIX: Status in popup of member in widget
-FIX: status on tooltip on widgets
-FIX: Timezone management for datetime on list of events
-FIX: Timezone management for datetime with modulebuilder and extrafields
-FIX: Total_ht not show in contract link element
-FIX: use post instead get
-FIX: use var "saved_url" instead global var "$url"
-FIX: Various payment - Missing fields for check transmitter & bank name
-FIX: warning if setup of chart of account is not yet done.
-FIX: wrong extension
-
-
-***** ChangeLog for 13.0.1 compared to 13.0.0 *****
-
-FIX: 10.0 before crediting a withdrawal receipt, check whether it has been credited already.
-FIX: 11.0 when a mandatory extrafield of type sellist contains '0' it should be considered empty and trigger an error message upon insertion
-FIX: 11.0 when a new intervention is created from an object, a new $extrafields object is instantiated but not initialized
-FIX: create MO, Column 'tms' cannot be null
-FIX: #14290 #15900
-FIX: #16076  patch user/list.php for extrafields
-FIX: #16077  patch wrong timezone
-FIX: #16079  error of service date at duplicated invoice
-FIX: #16080  mailing list title
-FIX: #16084  DB error at projects
-FIX: #16107
-FIX: #16118  Timezone problem on some fields
-FIX: #16131
-FIX: #16135
-FIX: #16143
-FIX: #16156
-FIX: #16160
-FIX: #16165 Create customer discount without vat
-FIX: #16185
-FIX: #16189, fix download/see check deposit PDF
-FIX: #16215
-FIX: Accountancy - label_operation is used instead of label_compte
-FIX: Add critical price patch
-FIX: Assignement of actors on tasks
-FIX: Bad dates on info tabs
-FIX: cash fence for takepos with multientity
-FIX: CSRF errors on margin forms
-FIX: encoding status in graph of vendor proposals
-FIX: Fix detect dispached product and set to received completely when the supplier order have services (support STOCK_SUPPORTS_SERVICES)
-FIX: Hide/Unhide external ICSS calendars
-FIX: link to create event when task is in a project with a thirdparty
-FIX: Localtax must be converted with price2num
-FIX: manage price min for PRODUIT_CUSTOMER_PRICES
-FIX: Missing language ico
-FIX: Must not be able to edit vat of all lines if not draft
-FIX: Bad "htdocs" found into a path
-FIX: removed no more used proc update_modified_column_date_m on pgsql (its presence triggered errors)
-FIX: Vulnerability report by Ricardo Matias
-FIX: select default mail template
-FIX: Select transport mode function when creating a supplier invoice and add unique key to the table llx_c_transport_mode in migrate sql
-FIX: Merge of thirdparties : "unknow column fk_soc" + "Delivery" label
-FIX: SQL Error in group by with postgres or mysql strict mode
-FIX: TakePOS : load date function
-FIX: Timeout during import
-FIX: Trigger on expense report was not fired
-FIX: User creation of expense report not visible
-FIX: warning when adding a line if $remise_percent is an empty string
-FIX: status late on purchase orders
-FIX: ODT generation very slow
-FIX: amount in summary of report
-FIX: vat value when code contains number
-FIX: payment term label on PDF
-FIX: date selector when using reduced year (like on smartphone)
-
-
-***** ChangeLog for 13.0.0 compared to 12.0.0 *****
-
-For users:
-----------
-NEW: Add module "Credit transfer SEPA" to manage payment of vendors using bank credit transfer SEPA files.
-NEW: Module Reception (for a more accurate management of your receptions) moved from experimental to stable.
-NEW: Module Recruitment to manage Job position and applications.
-NEW: Several security issues after a private bug bounty campaign. 
-NEW: Accountancy - add chart of sub accounts
-NEW: Accountancy - add options to disable binding on sales, purchases & expense reports independently of the modules
-NEW: Accountancy balance - add a menu entry to show subtotal by group
-NEW: Accountancy - change menu disposition
-NEW: Accountancy - on transfers, select the periodicity by default
-NEW: Accountancy - Add export for Gestinum (v3 & v5) #15180
-NEW: new currency rate editor
-NEW: Solve blocking feature. Can increase stock of a Kit without changing subproduct stock.
-NEW: add a widget to show the customers with outstanding limits reached
-NEW: add 2 rules for emailcollector: Message send/not sent from Dolibarr
-NEW: add a counter of number of words for pages in website module
-NEW: add alert before changing thirdparty in TakePOS
-NEW: add a page to list Stock at a given date in the past
-NEW: add a start date to begin binding in accountancy
-NEW: add a statistics page to list popularity of products on invoices
-NEW: add calendar selection for agenda view
-NEW: Support documents generation for ticket edition (PDF or ODT)
-NEW: add column payment term into list of supplier invoices
-NEW: add column quantity in product margin page
-NEW: add column vat rate in page to define accounting account on product/service
-NEW: add costprice in fields of products list
-NEW: add an import profile for CUSTOMER ORDER, PO, PROPOSAL MODULE, SUPPLIER INVOICE
-NEW: add employee link in expense report binding page
-NEW: add EORI No. as ProfID5
-NEW: add export for various payments
-NEW: add Extrafields labels and values in mail on create ticket
-NEW: add Extrafields support on ECM module
-NEW: add filter rules "is answer" and "is not answer" in email collector
-NEW: add focus when editing on product/stock/product.php Close #14548
-NEW: add free text on each terminal of cash desk
-NEW: add global search for customer payments and vendor payments
-NEW: add global search for miscellaneous payments
-NEW: add helper function for table headers with numbers
-NEW: add link to edit property from the search result of website pages
-NEW: add link to reset qty on supplier dispatch page
-NEW: add MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER const to remove header stored by email collector
-NEW: add Manufacturing Orders attached files into the automatic ECM view
-NEW: add margin info in invoice list
-NEW: add mass action to set category on a list of website pages
-NEW: add mass deletion for events
-NEW: add mass deletion for draft invoices
-NEW: add more filters on monthly statement list
-NEW: add option TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT
-NEW: add option to define a default warehouse at user level
-NEW: add option to include products without alert in replenish
-NEW: add order by lastname and firstname by default in get sales representatives
-NEW: add param to not show links when output tags
-NEW: add PDF document templates for warehouses (list of stock)
-NEW: add a prospect status for the contact with managment of custom icon
-NEW: add public note on products ; this also partially fix the #14342
-NEW: add quick dropdown menu in top right menu (experimental with MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)
-NEW: add region in export companies and contacts
-NEW: add rights on margin info on invoice list
-NEW: add search param for close date on order list
-NEW: add show preview for mail attachement on form mail
-NEW: add State/Province origin for products
-NEW: add the workflow interaction close intervention on closing ticket
-NEW: add third order printer to TakePOS
-NEW: add tracking number in list and search_all items
-NEW: add vcard for adherent and user
-NEW: add week number for month view in agenda
-NEW: Algeria data (VAT and forme_juridique)
-NEW: allow click on all header numbers on commerce area
-NEW: allow to reopen interventions (green button)
-NEW: allow zero quantity on supplier/vendor order line
-NEW: appearance tab in TakePOS with more visual parameters
-NEW: better currency rate editor
-NEW: can build vendor invoice from vendor orders
-NEW: can change a product in lines of a recurring invoice or contract
-NEW: can change size of logo on PDF documents
-NEW: can change VAT rate of all lines of a draft object in one step
-NEW: can define date range of validity of a login during creation
-NEW: can disable, from edit page, the whole web site
-NEW: can edit and set sales representatives directly on thirdparty card
-NEW: can edit the list of sending email profiles
-NEW: can enable/disable users in bulk actions
-NEW: can filter on accounting system ref in export of chart of account
-NEW: can filter on container type, language and tags in the list of web pages
-NEW: can hide eatby, sellby dates with option PRODUCT_DISABLE_SELLBY and PRODUCT_DISABLE_EATBY
-NEW: can import proposals, sales orders, supplier invoices
-NEW: can set a dedicated SMTP config for sending email from public ticket interface
-NEW: can set tags/categories to website pages
-NEW: can set type of price without tax per default for new sale price creation
-NEW: can use desired stock of a given warehouse for replenishment
-NEW: change thirdparty with barcode scan in TakePOS
-NEW: common behavior for monthly leave list view
-NEW: convert all subscription in datetime
-NEW: can create a thirdparty customer from TakePOS
-NEW: date shipment from order accepts hours
-NEW: price level compatibility for variant
-NEW: delayed payment in TakePOS
-NEW: display date range if exist in TakePOS
-NEW: display resiliate status in TakePOS for member
-NEW: display stat for BOM on "object referent"/linked Object product tab
-NEW: Email configuration - allow auto signed certificate when smtp ssl activated
-NEW: enable free emails input with select2
-NEW: Events in agenda for contact
-NEW: filter on progress column in task list
-NEW: filter product list by country and/or state/province
-NEW: format tickets sent by mail in public interface
-NEW: form to add customer/supplier into categories
-NEW: Framework is ready for CSRF token protection on explicit GET URLs
-NEW: helper functions for export with phpspreadsheet
-NEW: hide closed contract lines
-NEW: hide label in PDF for variants
-NEW: if specific help page is available, we change color of icon
-NEW: include the tag editor of page as a popup into website editor
-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: Module Intracomm report
-NEW: more filter for "View change logs"
-NEW: multicurrency total in TakePOS
-NEW: multiselect type and date to date filter
-NEW: Nature of product is now a dictionay
-NEW: new line template: hidden conf to fill service dates from the last service line
-NEW: PDF model storm for delivery
-NEW: possibilty to group payments by mode and show their subtotal
-NEW: Print payment method and change in TakePOS
-NEW: Priority and transparency from external calendar events
-NEW: Products Import/Export 'default warehouse' and 'use batch number' fields
-NEW: Purchase price table: added filterable table columns
-NEW: rate editor for multicurrency
-NEW: ref_ext field for Commande lines, order lines, Attributes and Combinations, Invoice lines, payments, order lines
-NEW: remove new lines in mail on add ticket message
-NEW: restrict thirdparty to customer in TakePOS
-NEW: Rule "email to" accept wildcard *
-NEW: Save filter of the project homepage
-NEW: select-able columns on customer and supplier invoice paymnet list
-NEW: select-able columns on miscellaneous payments + more data columns
-NEW: select-able columns on social taxes list
-NEW: send context and remove new lines on create ticket
-NEW: show available stock in TakePOS
-NEW: show category filter on lists only when user have rights to read categories
-NEW: show header number and make it clickable in warehouse area, payment area, shipment area
-NEW: show image of user in the combo select of users
-NEW: show label on batch card
-NEW: show links for select and multi-select in category extra field
-NEW: show module and permission ids on user/group rights (only admin)
-NEW: show place from events on import calender
-NEW: show references in contract form on interventions
-NEW: show tags and status in search list of website pages
-NEW: show user on external calender events (when found)
-NEW: subject title with company name instead of application title in ticket message
-NEW: Support for Samba4 AD
-NEW: TakePOS connector compatibility with RECEIPT PRINTERS module
-NEW: TakePOS Gift Receipt
-NEW: TakePOS Multicurrency compatibility
-NEW: TakePOS Weighing Scale compatibility with TakePOS connector #14725
-NEW: Third-Party Import new fields: mother company,outstanding debt limit,bank account,incoterms
-NEW: Thirdparty module : box on customer/supplier tab for invoice outsantding amount late
-NEW: ticket classification on create from email collector
-NEW: Ticket message notifications when edited from public interface
-NEW: translate classification labels in ticket
-NEW: VAT rate for Angola #15606
-NEW: VAT and juridical status for Algeria
-NEW: VAT report - Invert constant to show by default zero VAT in reports
-NEW: website page fields selection
-NEW: website - global header of a website can also have dynamic content
-NEW: when creating a user from a member linked to a thirdparty, you can choose to create it as external or internal user
-NEW: add clone button on miscellaneous payment 
-NEW: add option to put the product label in bold in the PDF templates if configured #15065 
-NEW: add option "If the feature to manage kits of module Stock is used, show details of subproducts of a kit on PDF."
-
-
-For developers:
----------------
-NEW: add __MEMBER_TYPE__ and __TYPE__ substitution key
-NEW: add function dolButtonToOpenUrlInDialogPopup() to be able to open page into a popup
-NEW: show line number on intervention card (via MAIN_VIEW_LINE_NUMBER)
-NEW: Add some fields to link website page to an other object
-NEW: fill ECM src object fields in dol_add_file_process
-NEW: conf to allow to show the full tree in warehouse popup
-NEW: can use THEME_DARKMODEENABLED=2 for a preview of theme in dark mode
-NEW: can force the antivirus from conf file or autoprepend ini setup
-NEW: can add event to log into blockedlog module with a constant
-NEW: add property cssview when declaring fields of an object
-NEW: Can use dynamic code into the 'enabled' property of DAO fields
-NEW: allow to edit "demand reason" field though API
-NEW: field ref_ext in llx_commandedet
-NEW: fields ref_ext for Attributes and Combinations
-NEW: OAuth SCOPE for Admin SDK
-NEW: standardizes API thirdparties by email like other object
-NEW: Triggers Attributes and Attributes values
-NEW: added incoterms data into the substitution array
-NEW: add send context for ticket
-NEW: add a message in error_log after detection of SQL or script injection
-NEW: add validation of MX domain for emails
-NEW: calculate the virtual stock in transverse mode ( not on getEntity('commande'), ... but on getEntity('stock') )
-NEW: Graphics can be horizontal bars
-
-APIs
-NEW: API get contacts list of a given order
-NEW: API endpoint getContacts and Clean results
-NEW: API can update a payment
-NEW: API get member by thirdparty
-NEW: API get thirdparty by barcode
-NEW: API get users by email / login
-NEW: fetch contact by email with REST API
-NEW: get state dictionnary by REST API
-NEW: improve Product API for variant products
-NEW: retrieve discount from invoice from API
-NEW: Thirdparty REST API: endpoint to set price level
-NEW: use new category API for project list view
-
-HOOKs
-NEW: Hook on propal card
-NEW: add hooks on newpayment page to allow external payment modules
-NEW: add hooks on stats pages
-NEW: add formConfirm hook on product page
-NEW: add two hooks printFieldListFrom and printFieldSearchParam
-NEW: add hook "loginCheckSecurityAccess"
-
-WARNING:
-
-Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
-* The object "livraison" has been renamed into "delivery" (directory, class, keys, methods with livraison in name ...).
-* All properties ->contactid have been renamed into ->contact_id
-* All properties ->titre have been renamed into ->title
-* Property $paiementid in API 'api_supplier_invoices.php' has been renamed into into $payment_mode_id
-* Property 'num_paiement' has been renamed 'num_payment' everywhere for better code consistency.
-* The deprecated subsitution key __SIGNATURE__ has been removed. Replace it with __USER_SIGNATURE__ if you used the old syntax in your email templates.
-* The hidden option HOLIDAY_MORE_PUBLIC_HOLIDAYS has been removed. Use instead the dictionary table if you need to define custom days of holiday.
-* If you build a class that implement CommonObject to use the incoterm properties or methods (->fk_incoterm, ->label_incoterm, ->location_incoterm),
-  you must now also include declaration of the Trait 'CommonIncoterm' in your class. All incoterm functions were moved into this Trait.
-* The GETPOST(..., 'alpha') has now the same behaviour than GETPOST(..., 'alphanohtml') so no html will be allowed. Use GETPOST(..., 'restricthtml') to accept HTML.
-* If you have links in your code with '&action=add', '&action=update', '&action=delete' as a parameter, you must also add '&token='.newToken() as another parameter to avoid CSRF protection errors.
-* The API addPayment for api_invoice has evolved to accept amount into a foreign currency. You must provide array(amount=>X,mutlicurrency_ammount=>Y) instead of simple amount.
-* The method select_thirdparty(), deprecated since 3.8, into html.form.class.php has been removed.
-* Depreciate all methods with name ->valide(). Use instead methods ->validate().
-* Function showStripePaymentUrl, getStripePaymentUrl, showPaypalPaymentUrl and getPaypalPaymentUrl has been removed. The generic one showOnlinePaymentUrl and getOnlinePaymentUrl are always used.
-* Context for hook showSocinfoOnPrint has been moved from "showsocinfoonprint" to "main"
-* Library htdocs/includes/phpoffice/phpexcel as been removed (replaced with htdocs/includes/phpoffice/PhpSpreadsheet)
-* Database transaction in your triggers must be correctly balanced (one close for one open). If not, an error will be returned by the trigger, even if trigger did return error code.
-* Dolibarr v13 is still compatible with any PHP version between 5.6.0 and 7.4.*; Unit tests are OK with PHP 8.0 but some warnings or troubles may appears with PHP 8.0.
-* All your Ajax services must contains such a line at begin of file:  if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-
-
-
 ***** ChangeLog for 12.0.5 compared to 12.0.4 *****
 FIX: before crediting a withdrawal receipt, check whether it has been credited already
 FIX: mandatory extrafields of type sellist
@@ -534,7 +179,7 @@ FIX: Look and feel v12: First tab must be name of object
 FIX: missing entity check
 FIX: missing param for hook
 FIX: Missing transaction on PO actions
-FIX: MySQL Strict mode
+FIX: MySql Strict mode
 FIX: param entity in html form file
 FIX: Problems on FEC format
 FIX: round stock value on product list
@@ -553,7 +198,6 @@ FIX: Visualization rights correction on last modified contacts box
 FIX: Wrong redirection
 FIX: Yogosha report 4425 (backport)
 
-
 ***** ChangeLog for 12.0.2 compared to 12.0.1 *****
 FIX: computation of the bottom margin of <body> returns NaN because body is not loaded yet
 FIX: DebugBar hides content at page bottom
@@ -642,8 +286,8 @@ FIX: SQL Problem in customer invoice list
 FIX: SQL Problem in social contribution list
 FIX: SQL Problem in supplier invoice list
 FIX: SQL syntax error when editing extrafields
-FIX: SQL type
-FIX: TakePOS 12 hook
+FIX: Sql type
+FIX: takepos 12 hook
 FIX: Update form erased extrafields that were hidden
 FIX: Update of extrafields date
 FIX: Update of extrafiels on draft object
@@ -657,7 +301,7 @@ For users:
 
 NEW: Module MO (Manufacturing Order) is available as stable module.
 NEW: Receipt printer module moved from 'development' to 'experimental'
-NEW: add option MAIN_VIEW_LINE_NUMBER_IN_LIST for some lists
+NEW: Add option MAIN_VIEW_LINE_NUMBER_IN_LIST for some lists.
 NEW: add numbering module for TakePOS module
 NEW: 2 new options when creating an invoice from time spent on a project : by period or by task
 NEW: Accountancy add column thirdparty on binding page
@@ -668,19 +312,19 @@ NEW: Accountancy - Add possibility to manage a short alternative label for accou
 NEW: Accountancy - General ledger - Add an option to search not reconciled lines
 NEW: Add accountancy code of thirdparty in contact and supplier export
 NEW: support webp image format
-NEW: add checkbox "overwrite if exists" into ECM/DMS module
+NEW: Add checkbox "overwrite if exists" into ECM/DMS module
 NEW: add a link to notes in members list
 NEW: add a parameter to group same products in TakePOS
 NEW: add a parameter to sort product by label in TakePOS
-NEW: add a profil to import contact categories
-NEW: add company extrafields into order export
+NEW: Add a profil to import contact categories
+NEW: Add company extrafields into order export
 NEW: add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation
 NEW: add const TAKEPOS_NUMPAD_USE_PAYMENT_ICON to use icons on payment buttons
 NEW: add csv separator setup in module admin
 NEW: add dedicated substitutions keys for extrafields of type date and datetime
 NEW: add default warehouse for dispatch
-NEW: add due date in feature "Export accounting documents"
-NEW: add duration information for fichinter
+NEW: Add due date in feature "Export accounting documents"
+NEW: Add duration information for fichinter
 NEW: Start support of Dark theme into ELDY theme
 NEW: Add field author public alias for blog post on website module
 NEW: Add "finished" field on product list
@@ -865,29 +509,29 @@ Following changes may create regressions for some external modules, but were nec
 * Default mode for GETPOST function is now 'alphanohtml' instead of 'none'. So check when you make POST or GET requests with
   HTML content that you make a GETPOST('myparam', 'restricthtml') or GETPOST('myparam', 'none') if you really need posted content without sanitizing
   the HTML code of content (in such a case, sanitize data later)
-* Removed hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless.
-* Reference of object including a "/" are no more allowed. It is never used by default but to support setup that introduced it, the "/" will be replaced
-  by a "_" automatically when a reference (with a custom numbering mask that use it) is generated.
+* Removed hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless. 
+* Reference of object including a "/" are no more allowed. It is never used by default but to support setup that introduced it, the "/" will be replaced 
+  by a "_" automatically when a reference (with a custom numbering mask that use it) is generated.  
 * Library jflot (replace with chartjs) was removed.
-* Library geoip (replaced with geoip2) was removed.
+* Library geoip (replaced with geoip2) was removed.  
 * Hidden constant COMMANDE_VALID_AFTER_CLOSE_PROPAL was renamed into ORDER_VALID_AFTER_CLOSE_PROPAL.
 * Object field ref_int is deprecated and set to 'not used', method to fetch object by only ref_int is not supported anymore.
 * UserGroup class has been refactored with new architecture. Triggers of class UserGroup are now USERGROUP_CREATE, USERGROUP_MODIFY, USERGROUP_DELETE
 * A new way to navigate between pages in list is available. To use it (not mandatory), you must:
-  - replace line $page = GETPOST('page', 'int') with $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+  - replace line $page = GETPOST('page', 'int') with $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); 
   - remove input field in form '<input type="hidden" name="page" value="'.$page.'">';'
   - add parameter $pagenavastextinput to value 1 when calling print_barre_liste()
 
 WARNING FOR DOLIWAMP USERS ONLY:
 
-Only people that installed Dolibarr using the all-in-one auto-installer for Windows called "DoliWAMP" are concerned by the following warnings:
-
-* DoliWAMP auto-installer for Windows is no more available on 32 bits systems. Use standard package if you need to use such architecture.
-* It is not possible to migrate from an installation done with the old DoliWAMP auto-installer for Windows by using this new one.
-  You must make a backup of your database, make a fresh installation using the new installer and reload your backup.
-  Don't forget that DoliWAMP is a good solution to make a quick test of Dolibarr on your local computer but is not recommended as a production
-  solution on a local desktop since a local desktop computer has often no backup and security policy, or not as good as on a server (when there is one).
-  DoliWAMP remains a solution for fast test or demo purposes. Prefer using standard packages for production.
+Only people that installed Dolibarr using the all-in-one autoinstaller for Windows called "DoliWAMP" are concerned by the following warnings:
+ 
+* DoliWAMP autoinstaller for Windows is not more available on 32bits systems. Use standard package if you need to use such architecture.
+* It is not possible to migrate from an installation done with the old DoliWAMP autoinstaller for Windows by using this new one. You must make a backup 
+  of your database, make a fresh installation using the new installer and reload.
+* Don't forget that DoliWAMP is a good solution to make a quick test of Dolibarr on your local computer but was never recommanded as a production
+  solution on a local desktop since a desktop computer has not a backup and security policy as good as on a server (when there is one). 
+  DoliWAMP remains a solution for fast test or demo purposes.
 
 
 ***** ChangeLog for 11.0.5 compared to 11.0.4 *****
@@ -1050,7 +694,7 @@ FIX: #13118
 FIX: #13124
 FIX: #13131
 FIX: #13135
-FIX: #13146
+FIX: #13146 
 FIX: #13198
 FIX: #13175
 FIX: #13182
@@ -1117,7 +761,7 @@ FIX: Confusion between 'bank reconciled' and 'accounted'. Show both data.
 FIX: Count of Stripe payment mode must take test/live into account
 FIX: Creation of Stripe card from backoffice must return a clean message
 FIX: CVE-2019–17223
-FIX: CVE-2019–17223
+FIX: CVE-2019–17223 
 FIX: CVE-2020-7994
 FIX: CVE Need permission to be able to develop modules
 FIX: #13053
@@ -1317,7 +961,7 @@ NEW: #4301
 
 For Developers or integrators:
 
-NEW: Compatible with PHP 7.4
+NEW: Compatible with PHP 7.4 
 NEW: Code for extrafields uses the new array $extrafields->attributes
 NEW: Can set a filter on object linked in modulebuilder.
 NEW: Can defined a position of numbering submodules for thirdparties
@@ -1384,9 +1028,9 @@ Following changes may create regressions for some external modules, but were nec
 * Removed function dol_micro_time. Use native PHP microtime instead.
 * The trigger BON_PRELEVEMENT_CREATE has been renamed into DIRECT_DEBIT_ORDER_CREATE.
 * The constant INVOICE_SHOW_POS_IN_EXPORT has been renamed into INVOICE_SHOW_POS.
-* If your logo is no more visible on the menu bar, you must upload a new logo into 'Home-Setup-Company/Organization' to have it visible again.
-* All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed into 'labelStatus'.
-* All properties 'labelstatusshort' and 'labelstatut_short' were renamed into 'labelStatusShort'.
+* If your logo is no more visible on the menu bar, you must upload a new logo into 'Home-Setup-Company/Organization' to have it visible again. 
+* All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed into 'labelStatus'. 
+* All properties 'labelstatusshort' and 'labelstatut_short' were renamed into 'labelStatusShort'. 
 * All properties 'type_libelle' were renamed into 'type_label'.
 * Renamed property of thirdparty "statut_commercial" into "status_prospect_label"
 * The jquery plugin/dependency multiselect has been removed. It was not used by Dolibarr core.
@@ -1536,11 +1180,11 @@ FIX: wrong invoice id for fetchObjetctLinked
 
 ***** ChangeLog for 10.0.3 compared to 10.0.2 *****
 IMPORTANT : This version fixes a serious bug in saving the units of weight, size, surface and volume on product card.
-The unit were not saved correctly in database making calculation on shipments wrong.
+The unit were not saved correctly in database making calculation on shipments wrong. 
 Update to this version must be done if you use them and have installed version 10.0.0, 10.0.1 or 10.0.2 and set some products after installing or upgrading to one of this version.
 Once update is done you must then edit (manually) the product that has bad unit to set the correct unit to have features restored.
 
-FIX: #11702
+FIX: #11702 
 FIX: #11861 No consistent code to manage measuring units
 FIX: #11942
 FIX: #12026
@@ -1602,7 +1246,7 @@ FIX: wrong test
 FIX: XSS
 FIX: Payment from POS ware not recorded.
 FIX: Can validate invoice with amount including tax of zero for the case of having a final invoice with
-     VAT that includes a deposit without vat.
+     VAT that includes a deposit without vat. 
 
 ***** ChangeLog for 10.0.2 compared to 10.0.1 *****
 FIX: #10460 compatibility with MariaDB 10.4
@@ -1705,14 +1349,14 @@ FIX: Wrong variable. Must be PROJECT_HIDE_UNSELECTABLES
 
 ***** ChangeLog for 10.0.1 compared to 10.0.0 *****
 FIX: #10930
-FIX: #10984
+FIX: #10984 
 FIX: reposition on "Build backup" button
 FIX: #11400
 FIX: #11412
-FIX: #11460
+FIX: #11460 
 FIX: #11463
 FIX: #11466
-FIX: #11492
+FIX: #11492 
 FIX: #11498
 FIX: #11505
 FIX: #11506
@@ -1721,7 +1365,7 @@ FIX: #11509
 FIX: #11537
 FIX: #11543
 FIX: #11553
-FIX: #11576
+FIX: #11576 
 FIX: #11584
 FIX: #11590
 FIX: accounting mode must be taken from global conf, because there's no way to choose a mode with interface
@@ -1814,14 +1458,14 @@ FIX: wrong path sociales/index.php doesnt exist anymore
 
 ***** ChangeLog for 10.0.1 compared to 10.0.0 *****
 FIX: #10930
-FIX: #10984
+FIX: #10984 
 FIX: reposition on "Build backup" button
 FIX: #11400
 FIX: #11412
-FIX: #11460
+FIX: #11460 
 FIX: #11463
 FIX: #11466
-FIX: #11492
+FIX: #11492 
 FIX: #11498
 FIX: #11505
 FIX: #11506
@@ -1830,7 +1474,7 @@ FIX: #11509
 FIX: #11537
 FIX: #11543
 FIX: #11553
-FIX: #11576
+FIX: #11576 
 FIX: #11584
 FIX: #11590
 FIX: accounting mode must be taken from global conf, because there's no way to choose a mode with interface
@@ -1999,7 +1643,7 @@ NEW: Manage account sell_intra & sell_export in page accoutancy admin default pr
 NEW: Manage loan schedule.
 NEW: Manage status of member types.
 NEW: Mass action "create bills" for validated reception
-NEW: Measuring unit are now defined into an editable dictionary. Add product size/unit into product import.
+NEW: Measuring unit are now defined into an editable dictionary. Add product size/unit into product import. 
 NEW: Template pdf 'canelle_reception' displays linked reception lines.
 NEW: Moral/physic status can be defined at member type level
 NEW: Pagination into list of time spent.
@@ -2062,7 +1706,7 @@ NEW: Enhance management of webhooks
 NEW: Generation of doc by modulebuilder can include README and CHANGELOG
 NEW: massfilesarea feature is possible for external modules
 NEW: Show list of enabled modules in dol_print_error().
-NEW: Simplification of CSS styles of default themes.
+NEW: Simplification of CSS styles of default themes. 
 NEW: Clean code of a lot of deprecated code.
 NEW: Add hidden option to set a search entry to the top
 NEW: add hidden option DISPLAY_DISCOUNTED_SUPPLIER_PRICE
@@ -2082,8 +1726,8 @@ Following changes may create regressions for some external modules, but were nec
 * The PHP extension php-intl is not mandatory and must be installed to have new features working correctly.
 * Method GetUrlTrackingStatus were renamed into getUrlTrackingStatus for consistency with naming rules.
 * API getListOfCivility has been renamed into getListOfCivilities for consistency with naming rules.
-* Deprecated function img_phone as been removed. You can use img_picto(..., 'call|call_out') instead.;
-* Files for variables of themes were renamed from graph-color.php into theme_vars.inc.php to match naming
+* Deprecated function img_phone as been removed. You can use img_picto(..., 'call|call_out') instead.; 
+* Files for variables of themes were renamed from graph-color.php into theme_vars.inc.php to match naming 
   convention of extension .inc.php for files to be included.
 * All methods set_draft() were renamed into setDraft().
 * Signatures of methods createFromClone() has been standardized. All methods requires the object User as first parameter.
@@ -2095,7 +1739,7 @@ Following changes may create regressions for some external modules, but were nec
 * Deprecated property ->fk_departement is now ->state_id everywhere.
 * Removed the method 4 of GETPOST (to get $_COOKIE). It was not used and not recommanded to use in Dolibarr.
 * Column llx_facture.facnumber change to llx_facture.ref
-* Variable $dolibarr_main_cookie_cryptkey is no more created at install (it was not used by Dolibarr). A new variable
+* Variable $dolibarr_main_cookie_cryptkey is no more created at install (it was not used by Dolibarr). A new variable 
   called $dolibarr_main_instance_unique_id is now generated at each installation. It will be used by some future features.
 
 
@@ -3867,7 +3511,7 @@ Following changes may create regression for some external modules, but were nece
   entities and to review completely the rights of the groups and the users.
 * Use getEntity('xxx') instead getEntity('xxx', 1) and use getEntity('xxx', 0) instead getEntity('xxx')
 * Some other change were done in the way we read permission of a user when module multicompany is enabled. You can
-  retrieve the old behavior by adding constant MULTICOMPANY_BACKWARD_COMPATIBILITY to 1.
+  retreive the old behavior by adding constant MULTICOMPANY_BACKWARD_COMPATIBILITY to 1.
 * The hook formObjectOptions was not implemented correctly in previous version. Sometimes, you had to return output
 content by doing a print into function, sometimes by returning content into "resprint". This has been fixed to follow
 hook specifications so you must return output into "resprint".
@@ -6613,7 +6257,7 @@ For users:
 - Fix: [Bug #958] LocalTax2 for Spain fails on Suppliers
 - Fix: [ bug #972 ] Auto completion contact field do not take account the min caract number before search
 - Fix: [ bug #971 ] html.form.class.php select_contact with autocomplete do not exclude id from exclude array
-- Fix: Expedition creation, can retrieve product from other expedition
+- Fix: Expedition creation, can retreive product from other expedition
 
 For translators:
 - Update language files.

INSTALL

@@ -0,0 +1,6 @@
+INSTALL
+-------
+
+English:     See README.md file.
+
+French:      Voir fichier README-FR.md.

README-FR.md

@@ -6,7 +6,7 @@
 Dolibarr ERP & CRM est un logiciel moderne pour gérer votre activité (société, association, auto-entrepreneurs, artisans).
 Il est simple d'utilisation et modulaire, vous permettant de n'activez que les fonctions dont vous avez besoin (contacts, fournisseurs, factures, commandes, stocks, agenda, ...).
 
-![ScreenShot](https://www.dolibarr.org/medias/dolibarr_screenshot1_1920x1080.jpg)
+![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_1920x1080.jpg)
 
 ## LICENCE
 

README.md

@@ -2,20 +2,16 @@
 
 ![Downloads per day](https://img.shields.io/sourceforge/dw/dolibarr.svg)
 ![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)
 
-Dolibarr ERP & CRM is a modern software package that helps manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
+Dolibarr ERP & CRM is a modern software package to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
 
-It's an Open Source Software suite (written in PHP with optional JavaScript enhancements) designed for small, medium or large companies, foundations and freelancers.
+It's an Open Source Software (written in PHP language) designed for small, medium or large companies, foundations and freelancers.
 
-You can freely use, study, modify or distribute it according to its licence.
+You can freely use, study, modify or distribute it according to its Free Software licence.
 
-You can use it as a standalone application or as a web application to access it from the Internet or a LAN.
+You can use it as a standalone application or as a web application to be able to access it from the Internet or a LAN.
 
-Dolibarr has a large community ready to help you, free forums and [officially preferred partners ready to offer commercial support should you need it](https://partners.dolibarr.org)
-
-![ScreenShot](https://www.dolibarr.org/medias/dolibarr_screenshot1_1920x1080.jpg)
+![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_1920x1080.jpg)
 
 ## LICENSE
 
@@ -31,23 +27,19 @@ 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)
-- [DoliDeb for Debian](https://wiki.dolibarr.org/index.php/Dolibarr_for_Ubuntu_or_Debian)
+- [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
 
 Releases can be downloaded from [official website](https://www.dolibarr.org/).
 
 ### Advanced setup
 
-You can use a web server and a supported database (MariaDB, MySQL or PostgreSQL) to install the standard version.
+You can use a Web server and a supported database (MariaDB, MySQL or PostgreSQL) to install the standard version.
 
-On GNU/Linux, first check if your distribution has already packaged Dolibarr.
+- Check that your installed PHP version is supported [see PHP support](https://wiki.dolibarr.org/index.php/Versions).
 
-#### Generic install steps:
-
-- Check that your installed PHP version is supported [see PHP support](https://wiki.dolibarr.org/index.php/Releases).
-
-- Uncompress the downloaded .zip archive to copy the "dolibarr/htdocs" directory and all its files inside your web server root or get the files directly from GitHub (recommanded if you know git as it makes it easier if you want to upgrade later):
+- Uncompress the downloaded .zip archive to copy the "dolibarr/htdocs" directory and all its files inside your web server root or get the files directly from GitHub (recommanded if you known git):
 
   `git clone https://github.com/dolibarr/dolibarr -b x.y`     (where x.y is main version like 3.6, 9.0, ...)
 
@@ -71,7 +63,6 @@ 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). However, this third solution is not free.
@@ -79,20 +70,18 @@ If you don't have time to install it yourself, you can try some commercial 'read
 
 ## UPGRADING
 
-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)
+- 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*").
+- At first next access, Dolibarr will redirect your 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 into the directory used to store generated and uploaded documents, in most cases, it is the directory called "*documents*").
 
+*Note: migration process can be safely done multiple times by calling the `/install/index.php` page*
 
 ## WHAT'S NEW
 
 See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
 
-
 ## FEATURES
 
 ### Main application/modules (all optional)
@@ -142,18 +131,15 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 ### Other general features
 
 - 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)
-
+- Multi-currency
+- Multi-company by adding of an external module
 - Very user friendly and easy to use
 - 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)
-
+- APIs
+- An easy to understand, maintain and develop code (PHP with no heavy framework; trigger and hook architecture)
 - Support a lot of country specific features:
   - Spanish Tax RE and ISPF
   - French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)
@@ -163,53 +149,43 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
   - Compatible with [European directives](http://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...
+- PDF or ODT generation for invoice, proposals, orders...
 - …
 
-
 ### System Environment / Requirements
 
-- Works with PHP 5.6+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite))
-- Compatible with all Cloud solutions that match PHP & MySQL or PostgreSQL prerequisites.
-
+- Works with PHP 5.5+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite))
+- Compatible with all Cloud solutions that match MySQL, PHP or PostgreSQL prerequisites.
 
 ### 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:
 
 - Tasks dependencies in projects
 - Payroll module
-- No native embedded Webmail, but you can send email to contacts in Dolibarr with e.g. offers, invoices, etc.
+- No native embedded Webmail
 - 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).
-
+Administrator, user, developer and translator's documentations are available along with other community resources on the [Wiki](https://wiki.dolibarr.org).
 
 ## CONTRIBUTING
 
-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:
+This project exists thanks to all the people who contribute. [[Contribute](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)]
 
 <a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>
 
-
 ## CREDITS
 
-Dolibarr is the work of many contributors over the years and uses some fine PHP libraries.
+Dolibarr is the work of many contributors over the years and uses some fine libraries.
 
 See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) file.
 
-
 ## NEWS AND SOCIAL NETWORKS
 
 Follow Dolibarr project on:
@@ -220,8 +196,6 @@ Follow Dolibarr project on:
 - [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

@@ -1,103 +1,13 @@
 # Security Policy
 
-This file contains some policies about the security reports on Dolibarr ERP CRM project, one of the most popular Open Source ERP and CRM in the world.
-
-## Supported Versions for security reports
-
-| Version   | Supported          |
-| --------- | ------------------ |
-| <= 12.*   | :x:                |
-| >= 13.*   | :white_check_mark: |
+## Supported Versions
 
+| Version  | Supported          |
+| -------- | ------------------ |
+| <= 8.0.* | :x: |
+| >= 9.0.* | :white_check_mark: |
 
 ## Reporting a Vulnerability
 
-To report a vulnerability, please use GitHub security advisory (alternatively send an email to security@dolibarr.org)
-
-
-## Hunting vulnerabilities on Dolibarr
-
-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) to get access on every side of application.
-
-### User Agent
-
-If you try to find bug on Dolibarr, we recommend to append to your user-agent header the following value: '-securitytest-for-dolibarr'.
-
-### 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
-
-
-## 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):
-
-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 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":
-
-* $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 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, this module is not enabled. This is a developer tool)
-* 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 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 Bug bounty programs
-
-* Remote code execution (RCE)
-* Local files access and manipulation (LFI, RFI, XXE, SSRF, XSPA)
-* Code injections (HTML, JS, SQL, PHP, ...)
-* Cross-Site Scripting (XSS)
-* 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
-* Insecure direct object references
-* CORS with real security impact
-* Horizontal and vertical privilege escalation
-* "HTTP Host Header" XSS
-* Software version disclosure (for non admin users only)
-* Stack traces or path disclosure (for non admin users only)
-
-
-## Non-qualifying vulnerabilities for Bug bounty programs, but qualified for reporting
-
-* "Self" XSS
-* SSL/TLS best practices
-* Denial of Service attacks
-* 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
-* 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)
-* Reports on features flagged as "experimental" or "development"
-* 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".
-
+To report a vulnerability, please send an email to security@dolibarr.org
+In most cases, after fixing the security, we make an answer by email to say the issue has been fixed.

build.xml

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Script build for hudson CI -->
+<project name="dolibarr" default="hudson" basedir=".">
+<!-- Exclude/ignore paths -->
+ <property name="ignorepaths" value="${basedir}/htdocs/conf,${basedir}/htdocs/core/filemanagerdol,${basedir}/htdocs/includes" />
+ <property name="ignoreregexp" value="**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*" />
+ 
+ <target name="clean">
+  <!-- Clean up -->
+  <delete dir="${basedir}/hudson"/>
+  <delete dir="${basedir}/generatedJUnitFiles"/>
+
+  <!-- Create build directories -->
+  <mkdir dir="${basedir}/hudson/doxygen"/>
+  <mkdir dir="${basedir}/hudson/logs"/>
+  <mkdir dir="${basedir}/hudson/coverage"/>
+ </target>
+
+ <!-- Run phpmd, phpcpd, phpcs, doxygen and phploc in parallel -->
+ <target name="parallelTasks">
+  <parallel>
+   <!-- <antcall target="phpmd"/> -->
+   <antcall target="phpcpd"/>
+   <!-- <antcall target="phpcs"/> -->
+   <antcall target="doxygen"/>
+   <antcall target="phploc"/>
+  </parallel>
+ </target>
+
+ <!-- Generate pmd.xml -->
+<!--
+<target name="phpmd">
+  <exec executable="phpmd">
+   <arg line="htdocs xml codesize,unusedcode
+              -\-reportfile '${basedir}/hudson/logs/pmd.xml'
+              -\-ignore=${ignorepaths}
+              " />
+  </exec>
+ </target>
+-->
+
+ <!-- Generate pmd-cpd.xml -->
+ <target name="phpcpd">
+  <exec executable="phpcpd">
+   <arg line="	--log-pmd '${basedir}/hudson/logs/pmd-cpd.xml'
+   				--exclude '${basedir}/htdocs/conf'
+   				--exclude '${basedir}/htdocs/core/filemanagerdol'
+   				--exclude '${basedir}/htdocs/includes'
+   				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*'
+   				--min-tokens 70
+   				--min-lines 20 
+   				htdocs
+   				" />
+  </exec>
+ </target>
+ 
+ <!-- Generate phploc.csv -->
+ <target name="phploc">
+  <exec executable="phploc">
+   <arg line="	--log-csv '${basedir}/hudson/logs/phploc.csv'
+   				--exclude '${basedir}/htdocs/conf'
+   				--exclude '${basedir}/htdocs/core/filemanagerdol'
+   				--exclude '${basedir}/htdocs/includes'
+   				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*'
+   				htdocs
+   				" />
+  </exec>
+ </target>
+   
+ <!-- Generate checkstyle.xml -->
+ <target name="phpcs">
+  <exec executable="phpcs" dir="${basedir}">
+    <arg line=" --standard=${basedir}/dev/codesniffer/jenkins_ruleset.xml
+    			--report=checkstyle
+    			--report-file=${basedir}/hudson/logs/checkstyle.xml
+                --ignore=${ignorepaths},${ignoreregexp}
+                htdocs
+                "/>
+  </exec>
+ </target>
+ 
+ <!-- Run unit tests and generate junit.xml and clover.xml -->
+ <target name="phpunit">
+  <exec executable="phpunit" dir="${basedir}" failonerror="true">
+   <arg line="	--configuration ${basedir}/test/phpunit/phpunittest.xml
+				--log-junit ${basedir}/hudson/logs/junit.xml
+				--coverage-clover ${basedir}/hudson/coverage/clover.xml
+  				--coverage-html ${basedir}/hudson/coverage/
+  				test/phpunit/AllTests.php
+  				"/>
+  </exec>
+ </target>
+
+ <!-- Generate Doxygen documentation -->
+ <target name="doxygen" description="Dolibarr documentation" >
+  <exec executable="doxygen" dir="${basedir}" failonerror="false">
+   <arg value="${basedir}/build/doxygen/jenkins_doxygen.doxyfile"/>
+  </exec>
+ </target>
+
+ <target name="hudson" depends="clean,phpunit,phpcs,parallelTasks"/>
+</project>

build/README

@@ -1,66 +1,48 @@
 README (English)
-
-Path: /dolibarr/build/README
-
 ##################################################
 Building packages
 ##################################################
 
 All sub-directories of "build" directory contains files (setup or binary tools) required to build automatically Dolibarr packages.
-
 There are several tools:
 
 
+
 - To build full Dolibarr packages, launch the script
 > Launch command perl makepack-dolibarr.pl
 
---------------------------------------------------------------------------------------------------
-
-
-Prerequisites to build tgz, debian, rpm package:
-
+Note: Prerequisites to build tgz, debian, rpm package
 > apt-get install tar dpkg dpatch p7zip-full rpm zip
 
-
---------------------------------------------------------------------------------------------------
-
-Prerequisites to build autoexe DoliWamp package:
+Note: 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.
+   For example by running isetup-5.3.9.exe (http://www.jrsoftware.org)
+> Install WampServer into "C:\Program Files\Wamp"
+   For example by running wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe (http://www.wampserver.com)
+> Install WampServer addon to have versions: Mysql5.0.45
+   For example by running WampServer2-MYSQL5045.exe (http://www.wampserver.com)
+> To build 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.
 > 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.
-
---------------------------------------------------------------------------------------------------
   
 - To build a theme package, launch the script
 > perl makepack-dolibarrtheme.pl
 
-
---------------------------------------------------------------------------------------------------
-
 - To build a package for a module, launch the script
 > perl makepack-dolibarrmodule.pl
 
-
---------------------------------------------------------------------------------------------------
-
 - To build developper documentation, launch the script
 > perl dolibarr-doxygen-build.pl
 
 
---------------------------------------------------------------------------------------------------
-
 Note: 
-The build directory and all its contents is absolutely not required to make Dolibarr working. 
-It is here only to build Dolibarr packages, and those generated packages will not contains this "build" directory.
+The build directory and all its contents is absolutely not required to make
+Dolibarr working. It is here only to build Dolibarr packages, and those
+generated packages will not contains this "build" directory.
 
 
 You can find in "build", following sub-directories:
@@ -77,9 +59,6 @@ To build Mac OS package (not ready yet).
 * doap:
 To build Doap descriptor to promote/describe Dolibarr releases.
 
-* docker:
-To deploy Dolibarr with docker.
-
 * doxygen:
 Dir with config file to build doxygen documentation.
 
@@ -87,12 +66,12 @@ Dir with config file to build doxygen documentation.
 To build exe package for Windows that distribute Dolibarr sources or
 to build the complete DoliWamp package.
 
-* gource:
-To build the video of history of git changes.
-
 * launchpad:
 Doc file to explain how to use launchpad.
 
+* live:
+Doc file to explain how to create a demo live CD.
+
 * obs:
 Doc file to explain how to push release onto OBS.
 
@@ -111,8 +90,5 @@ To build Redhat, Opensuse or Mandriva package.
 * tgz:
 To build a tgz package.
 
-* travis-ci:
-Used by travis to make CI.
-
 * zip:
 To build a zip package.

build/debian/README.howto

@@ -306,7 +306,7 @@ If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VER
 - htdocs/includes/jquery/plugins/datatables
 - htdocs/includes/jszip
 - htdocs/includes/mike42
-- htdocs/includes/phpoffice
+- htdocs/includes/phpexcel or htdocs/includes/phpoffice
 - htdocs/includes/restler/framework/Luracast/Restler/explorer
 - htdocs/includes/swiftmailer
 - htdocs/includes/tcpdf or htdocs/includes/tecnickcom

build/debian/conf.php.install

@@ -232,7 +232,7 @@ $dolibarr_main_prod='0';
 # Examples:
 # $dolibarr_mailing_limit_sendbycli='0';
 
-# dolibarr_main_distrib
+# dolibarr_distrib
 # A key to identify the distribution used for first installation
-$dolibarr_main_distrib = 'debian';
+$dolibarr_distrib = 'deb';
 

build/debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
 # Uploaders: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>		# Only if differs from Maintainer
 Standards-Version: 3.9.6
-Homepage: https://www.dolibarr.org
+Homepage: http://www.dolibarr.org
 Build-Depends: debhelper (>= 9), po-debconf
 # This package need at least debian 7 or ubuntu 13.04 or any distribution based on this version
  

build/debian/copyright

@@ -1,4 +1,4 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Dolibarr
 Upstream-Contact: Laurent Destailleur <eldy@users.sourceforge.net>
 Source: https://www.dolibarr.org/files/stable/standard/
@@ -37,8 +37,7 @@ Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>
            2010, Servitux Servicios Informaticos <info@servitux.es>
            2011, Herve Prot                  <herve.prot@symeos.com>
            2011, Remy Younes                 <ryounes@gmail.com>
-           2012-2013, Christophe Battarel    <christophe.battarel@altairis.fr>
-	   
+           2012-2013, Christophe Battarel         <christophe.battarel@altairis.fr>
 License: GPL-3+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
@@ -57,9 +56,7 @@ License: GPL-3+
  .
  On Debian systems, the full text of the GNU General Public
  License version 3 can be found in the file
- '/usr/share/common-licenses/GPL-3'.
-
-------------------------------------------------------------
+ `/usr/share/common-licenses/GPL-3'.
 
 Files: htdocs/includes/adodbtime/*
 Copyright: 2003-2005, John Lim
@@ -83,9 +80,6 @@ Comment:
  Those files are not shipped in the binary package since we use
  the library as packaged in "libphp-adodb".
 
-
-------------------------------------------------------------
-
 Files: htdocs/includes/ckeditor/*
 Copyright: 2003-2012 CKSource - Frederico Knabben
 License: GPL-2+
@@ -115,9 +109,6 @@ Comment:
  Those files are not shipped in the binary package since we use the
  library as packaged in "ckeditor".
 
-
-------------------------------------------------------------
-
 Files: htdocs/includes/fonts/*
 Copyright: 2003, Bitstream Inc
 	   unknown, Gavin Graham
@@ -167,10 +158,7 @@ License: other
 Comments:
  Those files are not shipped in the binary package as we
  configure Dolibarr to use Dejavu fonts from "fonts-dejavu-core".
-
-
-------------------------------------------------------------
-
+  
 Files: doc/images/*
 Copyright: Laurent Destailleur 
 License: CC-BY-SA-3.0
@@ -186,15 +174,33 @@ License: CC-BY-SA-3.0
  distribute the resulting work only under the same, similar or a compatible
  license.
  .
- For more information, see https://creativecommons.org/licenses/by-sa/3.0/
+ For more information, see http://creativecommons.org/licenses/by-sa/3.0/
 
+Files: htdocs/includes/fpdfi/*
+Copyright: 2004-2011 Setasign - Jan Slabon
+License: GPL-2+
+ 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 2 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/>.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
 
-
-------------------------------------------------------------
-
-Files: htdocs/includes/geoip2/*
+Files: htdocs/includes/geoip/*
 Copyright: 2007 MaxMind LLC
-License: CC-By-SA
+License: LGPL-2.1+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either
@@ -210,14 +216,10 @@ License: CC-By-SA
  .
  On Debian systems, the full text of the GNU Lesser General Public
  License version 2.1 can be found in the file
- '/usr/share/common-licenses/LGPL-2.1'.
-
-
-------------------------------------------------------------
+ `/usr/share/common-licenses/LGPL-2.1'.
 
 Files: htdocs/includes/jquery/*
 Copyright: JQuery team
-https://www.jquery.com
 License: GPL-2+ or MIT
  === GPL-2+ LICENSE NOTICE ===
  .
@@ -238,7 +240,7 @@ License: GPL-2+ or MIT
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
- '/usr/share/common-licenses/GPL-2'.
+ `/usr/share/common-licenses/GPL-2'.
  .
  === MIT LICENSE ===
  .
@@ -265,8 +267,6 @@ Comment:
  "libjs-jquery-ui". Most of the plugins are shipped though.
 
 
-------------------------------------------------------------
-
 Files: htdocs/includes/jquery/plugins/flot/*
 Copyright: Flot team
 License: Public-Domain
@@ -275,9 +275,6 @@ Comment:
  Those files are not shipped in the binary package because we configure
  Dolibarr to use the files provided by "libjs-flot".
 
-
-------------------------------------------------------------
-
 Files: htdocs/includes/jsgantt/*
 Copyright: JSGantt team
 License: GPL-2+
@@ -298,10 +295,7 @@ License: GPL-2+
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
- '/usr/share/common-licenses/GPL-2'.
-
-
-------------------------------------------------------------
+ `/usr/share/common-licenses/GPL-2'.
 
 Files: htdocs/includes/nusoap/*
 Copyright: 2002-2010 NuSphere Corporation
@@ -321,14 +315,11 @@ License: LGPL-2.1+
  .
  On Debian systems, the full text of the GNU Lesser General Public
  License version 2.1 can be found in the file
- '/usr/share/common-licenses/LGPL-2.1'.
+ `/usr/share/common-licenses/LGPL-2.1'.
 Comment:
  Those files are not shipped in the binary package since we
  configure Dolibarr to use the library provided in "libnusoap-php".
 
-
-------------------------------------------------------------
-
 Files: htdocs/includes/odtphp/*
 Copyright: 2008, Julien Pauli
            2008, Cyril PIERRE de GEYER 
@@ -351,12 +342,29 @@ License: GPL-2+
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
- '/usr/share/common-licenses/GPL-2'.
+ `/usr/share/common-licenses/GPL-2'.
 
+Files: htdocs/includes/phpexcel/*
+Copyright: 2006-2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU Lesser General Public
+ License version 2.1 can be found in the file
+ `/usr/share/common-licenses/LGPL-2.1'.
 
-------------------------------------------------------------
-
-Files: htdocs/includes/tecnickcom/*
+Files: htdocs/includes/tcpdf/*
 Copyright: 2002-2013 Nicola Asuni - Tecnick.com LTD
 License: LGPL-3.0+
  TCPDF is free software: you can redistribute it and/or modify it

build/debian/dolibarr.postinst

@@ -23,7 +23,7 @@ setup_empty_conf() {
     mkdir -p /etc/dolibarr
     touch /etc/dolibarr/conf.php
     chown root:www-data /etc/dolibarr/conf.php
-    chmod 660 /etc/dolibarr/conf.php
+    chmod 664 /etc/dolibarr/conf.php
 }
 
 is_new_upstream_version() {
@@ -150,6 +150,7 @@ case "$1" in
 			##grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
 			#grep -q -c "dolibarr_lib_NUSOAP_PATH" $config   || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
 			#grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
+			##grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
 			##grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
 			#grep -q -c "dolibarr_js_CKEDITOR" $config       || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
 			#grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config

build/debian/install.forced.php.install

@@ -24,7 +24,6 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
-$force_install_distrib='debian';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one.
 // If during install, we enable/disable declaration to use non embedded libraries, we must also check they are 
@@ -35,6 +34,7 @@ $force_install_distrib='debian';
 //$force_dolibarr_lib_GEOIP_PATH='';
 //$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
 //$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
+//$force_dolibarr_lib_PHPEXCEL_PATH='';	// Use '' or 'disabled'
 //$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';	// Use '/javascript/ckeditor' or 'disabled'
 //$force_dolibarr_js_JQUERY='/javascript/jquery';
 //$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui';

build/debian/rules

@@ -103,6 +103,8 @@ override_dh_install:
 
 	# clean from useless files
 	rm -fr htdocs/includes/jquery/plugins/multiselect
+	rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PDF
+	rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip
 	rm -fr htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33
 	rm -fr htdocs/includes/tcpdf/fonts/freefont-20100919
 	rm -fr htdocs/includes/tcpdf/fonts/utils
@@ -111,6 +113,7 @@ override_dh_install:
 
 	# Licence files are already included into copyright file.
 	rm -f  htdocs/includes/jquery/plugins/flot/LICENSE.txt
+	rm -f  htdocs/includes/phpexcel/license.txt
 	rm -f  htdocs/includes/tcpdf/LICENSE.TXT
 
 	# Drop unwanted executable permissions

build/docker/Dockerfile

@@ -1,63 +1,38 @@
-FROM php:7.3-apache
+FROM php:7.2-apache
 
+ENV HOST_USER_ID 33
 ENV PHP_INI_DATE_TIMEZONE 'UTC'
-ENV PHP_INI_MEMORY_LIMIT 256M
 
-RUN apt-get update -y \
-    && apt-get install -y --no-install-recommends \
-        libfreetype6-dev \
-        libjpeg62-turbo-dev \
-        libjpeg62-turbo \
-        libpng-dev \
-        libpng16-16 \
-        libldap2-dev \
-        libxml2-dev \
-        libzip-dev \
-        zlib1g-dev \
-        libicu-dev \
-        g++ \
-        default-mysql-client \
-        unzip \
-        curl \
-        apt-utils \
-        msmtp \
-        msmtp-mta \
-        mailutils \
-    && apt-get autoremove -y \
-    && rm -rf /var/lib/apt/lists/* \
-    && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
-    && docker-php-ext-install -j$(nproc) calendar intl mysqli pdo_mysql gd soap zip \
-    && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
-    && docker-php-ext-install -j$(nproc) ldap && \
-    mv ${PHP_INI_DIR}/php.ini-development ${PHP_INI_DIR}/php.ini
+RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libldap2-dev libzip-dev zlib1g-dev libicu-dev g++\
+	&& rm -rf /var/lib/apt/lists/* \
+	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
+	&& docker-php-ext-install gd \
+	&& docker-php-ext-install zip \
+	&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
+        && docker-php-ext-install ldap \
+        && docker-php-ext-install mysqli \
+        && docker-php-ext-install calendar \
+        && docker-php-ext-configure intl \
+        && docker-php-ext-install intl \
+        && apt-get autoremove --purge -y libjpeg-dev libldap2-dev zlib1g-dev libicu-dev g++
 
 RUN mkdir /var/documents
-RUN chown www-data:www-data /var/documents
+RUN chown www-data /var/documents
 
 COPY docker-run.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-run.sh
 
 RUN pecl install xdebug && docker-php-ext-enable xdebug
-RUN echo 'zend_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20180731/xdebug.so"' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.remote_autostart=1' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.remote_enable=1' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.default_enable=1' >> ${PHP_INI_DIR}/php.ini
-#RUN echo 'xdebug.remote_host=docker.host' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.remote_port=9000' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.remote_connect_back=1' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.profiler_enable=0' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.remote_log="/tmp/xdebug.log"' >> ${PHP_INI_DIR}/php.ini
-#RUN echo 'localhost docker.host' >> /etc/hosts
-
-# set up sendmail config, to use maildev
-RUN echo "account default" > /etc/msmtprc
-RUN echo "auth off" >> /etc/msmtprc
-RUN echo "port 25" >> /etc/msmtprc
-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
+RUN echo 'zend_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so"' >> /usr/local/etc/php/php.ini
+RUN echo 'xdebug.remote_autostart=0' >> /usr/local/etc/php/php.ini
+RUN echo 'xdebug.remote_enable=1' >> /usr/local/etc/php/php.ini
+RUN echo 'xdebug.default_enable=0' >> /usr/local/etc/php/php.ini
+RUN echo 'xdebug.remote_host=docker.host' >> /usr/local/etc/php/php.ini
+RUN echo 'xdebug.remote_port=9000' >> /usr/local/etc/php/php.ini
+RUN echo 'xdebug.remote_connect_back=0' >> /usr/local/etc/php/php.ini
+RUN echo 'xdebug.profiler_enable=0' >> /usr/local/etc/php/php.ini
+RUN echo 'xdebug.remote_log="/tmp/xdebug.log"' >> /usr/local/etc/php/php.ini
+RUN echo '172.17.0.1 docker.host' >> /etc/hosts
 
 EXPOSE 80
 

build/docker/README.md

@@ -1,8 +1,6 @@
 # How to use it ?
 
 The docker-compose.yml file is used to build and run Dolibarr in the current workspace.
-This docker image intended for developpement usage.
-For production usage you should consider other contributor reference like https://hub.docker.com/r/tuxgasy/dolibarr 
 
 Before build/run, define the variable HOST_USER_ID as following:
 
@@ -16,7 +14,7 @@ And then, you can run :
 
         docker-compose up
 
-This will run 4 containers Docker : Dolibarr, MariaDB, PhpMyAdmin and MailDev.
+This will run 3 container Docker : Dolibarr, MariaDB and PhpMyAdmin.
 
 The URL to go to the Dolibarr is :
 
@@ -25,10 +23,6 @@ The URL to go to the Dolibarr is :
 The URL to go to PhpMyAdmin is (login/password is root/root) :
 
         http://0.0.0.0:8080
-        
-In Dolibarr configuration Email let PHP mail function, To see all mail send by Dolibarr go to maildev
 
-        http://0.0.0.0:8081
-
-Setup the database connection during the installation process, please use mariadb (name of the database container) as database host.
-Setup documents folder, during the installation process, to /var/documents
+Setup the database connection during the installation process, please use mariad
+b (name of the database container) as database host.

build/docker/docker-compose.yml

@@ -1,57 +1,25 @@
-version: '3'
+mariadb:
+    build: mariadb
+    environment:
+        MYSQL_ROOT_PASSWORD: root
+        MYSQL_DATABASE: dolibarr
 
-networks:
-    internal-pod:
-        internal: true
-    external-pod:
-        internal: false
+phpmyadmin:
+    image: phpmyadmin/phpmyadmin
+    environment:
+        PMA_HOST: mariadb
+    links:
+        - mariadb
+    ports:
+        - "8080:80"
 
-services:
-    mariadb:
-        image: mariadb:latest
-        environment:
-            MYSQL_ROOT_PASSWORD: root
-            MYSQL_DATABASE: dolibarr
-        ports:
-            - "3306:3306"
-        networks:
-            - internal-pod
-            - external-pod
-
-    phpmyadmin:
-        image: phpmyadmin/phpmyadmin
-        environment:
-            PMA_HOST: mariadb
-        depends_on:
-            - mariadb
-        ports:
-            - "8080:80"
-        networks:
-            - internal-pod
-            - external-pod
-
-    web:
-        build: .
-        environment:
-            HOST_USER_ID: $HOST_USER_ID
-        volumes:
-            - ../../htdocs:/var/www/html/
-            - ../../documents:/var/documents
-        ports:
-            - "80:80"
-            - "9000:9000"
-        depends_on:
-            - mariadb
-            - mail
-        networks:
-            - internal-pod
-            - external-pod
-
-    mail:
-        image: maildev/maildev
-        ports:
-            - "8081:80"
-            - "25:25"
-        networks:
-            - internal-pod
-            - external-pod
+web:
+    build: .
+    environment:
+        HOST_USER_ID: $HOST_USER_ID
+    volumes:
+        - ../../htdocs:/var/www/html
+    links:
+        - mariadb
+    ports:
+        - "80:80"

build/docker/docker-run.sh

@@ -1,21 +1,15 @@
 #!/bin/bash
 
-usermod -u ${HOST_USER_ID} www-data
-groupmod -g ${HOST_USER_ID} www-data
+usermod -u $HOST_USER_ID www-data
+groupmod -g $HOST_USER_ID www-data
 
 chgrp -hR www-data /var/www/html
 chmod g+rwx /var/www/html/conf
 
-if [ ! -d /var/documents ]; then
-	echo "[docker-run] => create volume directory /var/documents ..."
-  	mkdir -p /var/documents
-fi
-echo "[docker-run] => Set Permission to www-data for /var/documents"
-chown -R www-data:www-data /var/documents
-
 if [ ! -f /usr/local/etc/php/php.ini ]; then
   cat <<EOF > /usr/local/etc/php/php.ini
 date.timezone = $PHP_INI_DATE_TIMEZONE
+display_errors = On
 EOF
 fi
 

build/exe/doliwamp/README.md

@@ -5,7 +5,6 @@ It's a dedicated Dolibarr version for Windows newbies with no technical knowledg
 
 This directory contains files used by *makepack-dolibarr.pl* script to build the all-in-on .EXE package DoliWamp, ready
 to be distributed (for Windows).
-The build of .exe files need to have some windows executable files already installed (Apache, MariaDb). The package to install to get this files are defined into the file *doliwamp.iss* (searhc line starting with "; Value OK:")
 
 If you have technical knowledge in web administration and plan to share your server instance (Apache, Mysql or PHP) with other projects than Dolibarr or want to use Dolibarr other components (PostgreSQL), you should not use this assistant and make a manual installation of Dolibarr on your existing server by downloading the standard package (.tgz or .zip file).
 

build/exe/doliwamp/config.inc.php.install

@@ -542,7 +542,7 @@ $cfg['ThemePerServer']      = FALSE;         // allow diferent theme for each co
  * %f will be replaced by a list of field names.
  * (%t and %f only applies to DefaultQueryTable)
  */
-$cfg['DefaultQueryTable']    = 'SELECT * FROM %t WHERE 1';
+$cfg['DefaultQueryTable']    = 'SELECT * FROM %t WHERE 1 = 1';
 $cfg['DefaultQueryDatabase'] = '';
 
 /**

build/exe/doliwamp/doliwamp.iss

@@ -118,7 +118,7 @@ Source: "C:\wamp64\bin\mariadb\mariadb10.4.10\*.*"; DestDir: "{app}\bin\mariadb\
 ;Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mariadb\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db"
 
 ; Dolibarr
-Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,nltechno*\*,sabre\sabre\*\tests,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php"
+Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,nltechno*\*,sabre\sabre\*\tests,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php"
 Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,dbmodel\*,fpdf\*,initdata\*,initdemo\*,iso-normes\*,licence\*,phpcheckstyle\*,phpunit\*,samples\*,test\*,uml\*,vagrant\*,xdebug\*"
 Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*,images\dolibarr_screenshot2.png,images\dolibarr_screenshot3.png,images\dolibarr_screenshot4.png,images\dolibarr_screenshot5.png,images\dolibarr_screenshot6.png,images\dolibarr_screenshot7.png,images\dolibarr_screenshot8.png,images\dolibarr_screenshot9.png,images\dolibarr_screenshot10.png,images\dolibarr_screenshot11.png,images\dolibarr_screenshot12.png"
 Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php"

build/exe/doliwamp/install.forced.php.install

@@ -22,7 +22,6 @@ $force_install_databaserootpass='WAMPMYSQLNEWPASSWORD';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='644';
-$force_install_distrib='doliwamp';
 
 $force_install_module='';
 ?>

build/generate_filelist_xml.php

@@ -50,16 +50,15 @@ if (empty($argv[1])) {
     print "Example: ".$script_file." release=6.0.0 includecustom=1 includeconstant=FR:INVOICE_CAN_ALWAYS_BE_REMOVED:0 includeconstant=all:MAILING_NO_USING_PHPMAIL:1\n";
     exit -1;
 }
-
 parse_str($argv[1]);
 
 $i=0;
 while ($i < $argc) {
     if (! empty($argv[$i])) parse_str($argv[$i]);
     if (preg_match('/includeconstant=/', $argv[$i])) {
-    	$tmp=explode(':', $includeconstant, 3);			// $includeconstant has been set with previous parse_str()
+        $tmp=explode(':', $includeconstant, 3);
         if (count($tmp) != 3) {
-        	print "Error: Bad parameter includeconstant=".$includeconstant."\n";
+            print "Error: Bad parameter includeconstant ".$includeconstant."\n";
             exit -1;
         }
         $includeconstants[$tmp[0]][$tmp[1]] = $tmp[2];
@@ -106,12 +105,12 @@ if (empty($includecustom)) {
     }
 }
 
-print "Working on files into          : ".DOL_DOCUMENT_ROOT."\n";
 print "Release                        : ".$release."\n";
+print "Working on files into          : ".DOL_DOCUMENT_ROOT."\n";
 print "Include custom in signature    : ".$includecustom."\n";
 print "Include constants in signature : ";
 foreach ($includeconstants as $countrycode => $tmp) {
-    foreach ($tmp as $constname => $constvalue) {
+    foreach($tmp as $constname => $constvalue) {
         print $constname.'='.$constvalue." ";
     }
 }
@@ -126,17 +125,12 @@ $checksumconcat=array();
 
 $outputfile=$outputdir.'/filelist-'.$release.'.xml';
 $fp = fopen($outputfile, 'w');
-if (empty($fp)) {
-	print 'Failed to open file '.$outputfile."\n";
-	exit(-1);
-}
-
 fputs($fp, '<?xml version="1.0" encoding="UTF-8" ?>'."\n");
 fputs($fp, '<checksum_list version="'.$release.'" date="'.dol_print_date(dol_now(), 'dayhourrfc').'" generator="'.$script_file.'">'."\n");
 
 foreach ($includeconstants as $countrycode => $tmp) {
     fputs($fp, '<dolibarr_constants country="'.$countrycode.'">'."\n");
-    foreach ($tmp as $constname => $constvalue) {
+    foreach($tmp as $constname => $constvalue) {
         $valueforchecksum=(empty($constvalue)?'0':$constvalue);
         $checksumconcat[]=$valueforchecksum;
         fputs($fp, '    <constant name="'.$constname.'">'.$valueforchecksum.'</constant>'."\n");
@@ -152,9 +146,8 @@ $iterator1 = new RecursiveIteratorIterator($dir_iterator1);
 $files = new RegexIterator($iterator1, '#^(?:[A-Z]:)?(?:/(?!(?:'.($includecustom?'':'custom\/|').'documents\/|conf\/|install\/))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
 */
 $regextoinclude='\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
-$regextoexclude='('.($includecustom?'':'custom|').'documents|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
+$regextoexclude='('.($includecustom?'':'custom|').'documents|conf|install|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
 $files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
-
 $dir='';
 $needtoclose=0;
 foreach ($files as $filetmp) {
@@ -162,10 +155,9 @@ foreach ($files as $filetmp) {
     //$newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
     $newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
     if ($newdir!=$dir) {
-    	if ($needtoclose) {
+        if ($needtoclose)
             fputs($fp, '  </dir>'."\n");
-    	}
-        fputs($fp, '  <dir name="'.$newdir.'">'."\n");
+        fputs($fp, '  <dir name="'.$newdir.'" >'."\n");
         $dir = $newdir;
         $needtoclose=1;
     }

build/makepack-dolibarr.pl

@@ -390,9 +390,6 @@ if ($nboftargetok) {
 		$olddir=getcwd();
 		chdir("$SOURCE");
 		
-		print "Clean $SOURCE/htdocs\n";
-		$ret=`rm -f  $SOURCE/htdocs/includes/autoload.php`;
-		
 		$ret=`git ls-files . --exclude-standard --others`;
 		if ($ret)
 		{
@@ -479,7 +476,6 @@ if ($nboftargetok) {
 		$ret=`rm -f  $BUILDROOT/$PROJECT/build.xml`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/phpstan.neon`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/pom.xml`;
-		$ret=`rm -f  $BUILDROOT/$PROJECT/README-*.md`;
 		
 		$ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/build/Doli*-*`;
@@ -507,10 +503,7 @@ if ($nboftargetok) {
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mysql/README`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`;
 
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/install/mssql`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/install/sqlite3`;
-
-		$ret=`rm -fr $BUILDROOT/$PROJECT/node_modules`;
+		$ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/install/mssql`;
 
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/ansible`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/codesniffer`;
@@ -582,53 +575,52 @@ 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/workstation*`;
 		$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`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/.gitignore $BUILDROOT/$PROJECT/*/.gitignore $BUILDROOT/$PROJECT/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.gitignore`;
-		
-		# Removed files installed by the awful composer   	    
    	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/geoip/sample*.*`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/bin`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/adapters`;		# Keep this removal in case we embed libraries
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/samples`;		# Keep this removal in case we embed libraries
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;					# _source must be kept into tarball for official debian, not for the rest
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/composer`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/doctrine`;
+   	    
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/select2/release.sh`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/doc`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/example`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/test`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/example`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/test`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mobiledetect/mobiledetectlib/.gitmodules`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mobiledetect/mobiledetectlib/docs`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/.github`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/docs`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/samples`;
-        $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/parsedown/LICENSE.txt`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/php-iban/docs`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/.gitattributes`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Classes/license.md`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PDF`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Examples`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/unitTests`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/license.md`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/*/tests`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/stripe/tests`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/stripe/LICENSE`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/examples`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/ae_fonts_*`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-*`;
         $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 -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`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/theme/common/octicons/LICENSE`;
 	}
 
 	# Build package for each target

build/pdf/README.txt

@@ -1,10 +1,9 @@
-To make htmldoc working from wiki.dolibarr.org, the wiki must be modified to have
+To make htmldoc working from wiki.dolibarr.org, them must be modified to have
 
-To disable part of content, add: 
-class="htmldoc-ignore" 
-with css
-.htmldoc-ignore { display: none; }
-
-Note:
 $_SERVER["HTTP_USER_AGENT"] is "HTMLDOC/x.y.z"
 $_COOKIE["htmldoc"] may also be defined if set on command line.
+
+To disable part, add 
+class="htmldoc-ignore" with css
+.htmldoc-ignore { display: none; }
+

build/perl/virtualmin/dolibarr.pl

@@ -1,7 +1,7 @@
 #----------------------------------------------------------------------------
 # \file         dolibarr.pl
 # \brief        Dolibarr script install for Virtualmin Pro
-# \author       (c)2009-2020 Regis Houssin  <regis.houssin@inodbox.com>
+# \author       (c)2009-2019 Regis Houssin  <regis.houssin@inodbox.com>
 #----------------------------------------------------------------------------
 
 
@@ -30,7 +30,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "12.0.3", "11.0.5", "10.0.7", "9.0.4", "8.0.6", "7.0.5" );
+return ( "10.0.0", "9.0.3", "8.0.5", "7.0.5", "6.0.8" );
 }
 
 sub script_dolibarr_release
@@ -77,16 +77,6 @@ if ($ver >= 3.6) {
 		push(@rv, "Dolibarr requires PHP version 5.3 or later");
 		}
 	}
-if ($ver >= 12.0) {
-	# Check for PHP 5.6+
-	local $phpv = &get_php_version($phpver || 5, $d);
-	if (!$phpv) {
-		push(@rv, "Could not work out exact PHP version");
-		}
-	elsif ($phpv < 5.6) {
-		push(@rv, "Dolibarr requires PHP version 5.6 or later");
-		}
-	}
 
 return @rv;
 }
@@ -386,7 +376,7 @@ sub script_dolibarr_realversion
 local ($d, $opts, $sinfo) = @_;
 local $lref = &read_file_lines("$opts->{'dir'}/filefunc.inc.php", 1);
 foreach my $l (@$lref) {
-		if ($l =~ /'DOL_VERSION',\s?'([0-9a-z\.\-]+)'/) {
+		if ($l =~ /'DOL_VERSION','([0-9a-z\.\-]+)'/) {
                 return $1;
                 }
         }
@@ -400,8 +390,6 @@ sub script_dolibarr_check_latest
 {
 local ($ver) = @_;
 local @vers = &osdn_package_versions("dolibarr",
-				$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" :
 				$ver >= 9.0 ? "dolibarr\\-(9\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 8.0 ? "dolibarr\\-(8\\.0\\.[0-9\\.]+)\\.tgz" :
@@ -422,7 +410,7 @@ return $ver eq $vers[0] ? undef : $vers[0];
 
 sub script_dolibarr_site
 {
-return 'https://www.dolibarr.org/';
+return 'http://www.dolibarr.org/';
 }
 
 sub script_dolibarr_passmode

build/rpm/dolibarr_fedora.spec

@@ -181,7 +181,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/datapolicy
 %_datadir/dolibarr/htdocs/dav
 %_datadir/dolibarr/htdocs/debugbar
-%_datadir/dolibarr/htdocs/delivery
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/emailcollector
@@ -197,8 +196,8 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
-%_datadir/dolibarr/htdocs/intracommreport
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
+%_datadir/dolibarr/htdocs/livraison
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
@@ -212,7 +211,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
-%_datadir/dolibarr/htdocs/recruitment
 %_datadir/dolibarr/htdocs/reception
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/salaries
@@ -275,6 +273,7 @@ then
   #grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
   grep -q -c "dolibarr_lib_NUSOAP_PATH" $config    || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
   grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
+  #grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
   #grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
   grep -q -c "dolibarr_js_CKEDITOR" $config        || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
   grep -q -c "dolibarr_js_JQUERY" $config          || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config

build/rpm/dolibarr_generic.spec

@@ -261,7 +261,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/datapolicy
 %_datadir/dolibarr/htdocs/dav
 %_datadir/dolibarr/htdocs/debugbar
-%_datadir/dolibarr/htdocs/delivery
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/emailcollector
@@ -277,8 +276,8 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
-%_datadir/dolibarr/htdocs/intracommreport
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
+%_datadir/dolibarr/htdocs/livraison
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
@@ -292,7 +291,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
-%_datadir/dolibarr/htdocs/recruitment
 %_datadir/dolibarr/htdocs/reception
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/salaries
@@ -425,6 +423,7 @@ then
   #grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
   grep -q -c "dolibarr_lib_NUSOAP_PATH" $config    || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
   grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
+  #grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
   #grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
   grep -q -c "dolibarr_js_CKEDITOR" $config        || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
   grep -q -c "dolibarr_js_JQUERY" $config          || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config

build/rpm/dolibarr_mandriva.spec

@@ -177,7 +177,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/custom
 %_datadir/dolibarr/htdocs/datapolicy
 %_datadir/dolibarr/htdocs/dav
-%_datadir/dolibarr/htdocs/delivery
 %_datadir/dolibarr/htdocs/debugbar
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
@@ -194,8 +193,8 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
-%_datadir/dolibarr/htdocs/intracommreport
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
+%_datadir/dolibarr/htdocs/livraison
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
@@ -209,7 +208,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
-%_datadir/dolibarr/htdocs/recruitment
 %_datadir/dolibarr/htdocs/reception
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/salaries
@@ -272,6 +270,7 @@ then
   #grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
   grep -q -c "dolibarr_lib_NUSOAP_PATH" $config    || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
   grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
+  #grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
   #grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
   grep -q -c "dolibarr_js_CKEDITOR" $config        || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
   grep -q -c "dolibarr_js_JQUERY" $config          || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config

build/rpm/dolibarr_opensuse.spec

@@ -189,7 +189,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/datapolicy
 %_datadir/dolibarr/htdocs/dav
 %_datadir/dolibarr/htdocs/debugbar
-%_datadir/dolibarr/htdocs/delivery
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/emailcollector
@@ -205,8 +204,8 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
-%_datadir/dolibarr/htdocs/intracommreport
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
+%_datadir/dolibarr/htdocs/livraison
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
@@ -220,7 +219,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
-%_datadir/dolibarr/htdocs/recruitment
 %_datadir/dolibarr/htdocs/reception
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/salaries
@@ -283,6 +281,7 @@ then
   #grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
   grep -q -c "dolibarr_lib_NUSOAP_PATH" $config    || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
   grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
+  #grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
   #grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
   grep -q -c "dolibarr_js_CKEDITOR" $config        || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
   grep -q -c "dolibarr_js_JQUERY" $config          || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config

build/rpm/install.forced.php.fedora

@@ -17,7 +17,6 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
-$force_install_distrib='rpmfedora';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one
 $force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
@@ -25,6 +24,7 @@ $force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
 //$force_dolibarr_lib_GEOIP_PATH='';
 $force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
 //$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
+$force_dolibarr_lib_PHPEXCEL_PATH='';
 $force_dolibarr_lib_TCPDF_PATH='';
 //$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';
 //$force_dolibarr_js_JQUERY='/javascript/jquery';

build/rpm/install.forced.php.generic

@@ -17,7 +17,6 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
-$force_install_distrib='rpmgeneric';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one
 // We don't force any external lib with generic package

build/rpm/install.forced.php.mandriva

@@ -17,7 +17,6 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
-$force_install_distrib='rpmmandriva';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one
 $force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
@@ -25,6 +24,7 @@ $force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
 //$force_dolibarr_lib_GEOIP_PATH='';
 $force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
 //$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
+$force_dolibarr_lib_PHPEXCEL_PATH='';
 $force_dolibarr_lib_TCPDF_PATH='';
 //$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';
 //$force_dolibarr_js_JQUERY='/javascript/jquery';

build/rpm/install.forced.php.opensuse

@@ -17,7 +17,6 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
-$force_install_distrib='rpmopensuse';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one
 //$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
@@ -25,6 +24,7 @@ $force_install_distrib='rpmopensuse';
 //$force_dolibarr_lib_GEOIP_PATH='';
 //$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
 //$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
+$force_dolibarr_lib_PHPEXCEL_PATH='';
 $force_dolibarr_lib_TCPDF_PATH='';
 //$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';
 //$force_dolibarr_js_JQUERY='/javascript/jquery';

build/sitemap/urllist-wiki.txt

@@ -1 +1 @@
-https://wiki.dolibarr.org/
+http://wiki.dolibarr.org/

composer.json

@@ -33,13 +33,11 @@
 		"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"
+		"stripe/stripe-php" : "6.43.1"
 	},
 	"require-dev" : {
-		"php-parallel-lint/php-parallel-lint" : "^0",
-		"php-parallel-lint/php-console-highlighter" : "^0",
+		"jakub-onderka/php-parallel-lint" : "^0",
+		"jakub-onderka/php-console-highlighter" : "^0",
 		"phpunit/phpunit" : "^4",
 		"squizlabs/php_codesniffer" : "^2",
 		"phpunit/phpunit-selenium" : "^2"
@@ -59,4 +57,4 @@
 		"ext-zip" : "ODT, Excel and file compression support",
 		"ext-xml" : "Excel support"
 	}
-}
+}

dev/dolibarr_changes.txt

@@ -28,6 +28,19 @@ With
 
 
 
+DEBUGBAR:
+---------
+
+Move
+    this.options = {
+                bodyMarginBottom: true,
+                bodyMarginBottomHeight: parseInt($('body').css('margin-bottom')),
+    };
+few line lower in the  
+	initialize: function() {
+
+
+
 ESCPOS:
 -------
 Replace
@@ -48,14 +61,6 @@ By
 * In file nusoap.php, to avoid a warning,
 Replace call to serialize_val with no bugged value
 
-* In all files, replace constructor names into __construct. Replace also parent::constructor_name with parent::__construct
-
-* Line 4222 of file nusoap.php
-
-		$rev = array();
-		preg_match('/\$Revision: ([^ ]+)/', $this->revision, $rev);
-		$this->outgoing_headers[] = "X-SOAP-Server: $this->title/$this->version (".(isset($rev[1]) ? $rev[1] : '').")";
-
 
 
 
@@ -170,13 +175,24 @@ In htdocs/includes/tecnickcom/tcpdf/tcpdf.php
 -       protected $default_monospaced_font = 'courier';
 +       protected $default_monospaced_font = 'freemono';
 
+* In tecnickcom/tcpdf/include/tcpdf_static, in function intToRoman, right at the beginning
+  of the function, replace:
+
+		$roman = '';
+
+with:
+
+		$roman = '';
+		if ($number >= 4000) {
+			// do not represent numbers above 4000 in Roman numerals
+			return strval($number);
+		}
 
 
 
 TCPDI:
 ------
 Add fpdf_tpl.php 1.2
-
 Add tcpdi.php
 
 Add tcpdi_parser.php and replace:
@@ -215,6 +231,8 @@ with
 
 
 
+
+
 JCROP:
 ------
 * Remove analytics tag into file index.html
@@ -225,6 +243,14 @@ JQUERYFILETREE:
 * Remove directory htdocs/includes/jquery/plugins/jqueryFileTree/connectors
 
 
+PHPEXCEL:
+---------
+* Replace in htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE.php
+    continue;
+with:
+    continue 2;
+
+
 RESTLER:
 --------
 Change content of file htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
@@ -236,21 +262,11 @@ Change content of file htdocs/includes/restler/framework/Luracast/Restler/explor
     public static function getShortName($className)
     {
     	// @CHANGE LDR
-    	if (!is_string($className)) return;
+    	if (! is_string($className)) return;
     	//var_dump($className);
 
-* Add line into Data/Text.php to complete function
-
-    public static function endsWith($haystack, $needle)
-    {
-        $length = strlen($needle);
-        if ($length == 0) {
-            return true;
-        }
-    	// @CHANGE LDR
-        if (!is_string($haystack)) return false;
-
-
+    	
+    	
 PARSEDOWN
 ---------
 

dev/examples/code/create_invoice.php

@@ -87,11 +87,14 @@ if ($idobject > 0)
 	// Change status to validated
 	$result=$obj->validate($user);
 	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else {
+	else
+	{
 		$error++;
 		dol_print_error($db, $obj->error);
 	}
-} else {
+}
+else
+{
 	$error++;
 	dol_print_error($db, $obj->error);
 }
@@ -103,7 +106,9 @@ if (! $error)
 {
 	$db->commit();
 	print '--- end ok'."\n";
-} else {
+}
+else
+{
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }

dev/examples/code/create_order.php

@@ -85,11 +85,14 @@ if ($idobject > 0)
 	// Change status to validated
 	$result=$com->valid($user);
 	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else {
+	else
+	{
 		$error++;
 		dol_print_error($db, $com->error);
 	}
-} else {
+}
+else
+{
 	$error++;
 	dol_print_error($db, $com->error);
 }
@@ -101,7 +104,9 @@ if (! $error)
 {
 	$db->commit();
 	print '--- end ok'."\n";
-} else {
+}
+else
+{
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }

dev/examples/code/create_product.php

@@ -82,7 +82,9 @@ $idobject = $myproduct->create($user);
 if ($idobject > 0)
 {
 	print "OK Object created with id ".$idobject."\n";
-} else {
+}
+else
+{
 	$error++;
 	dol_print_error($db, $myproduct->error);
 }
@@ -93,7 +95,9 @@ if (! $error)
 {
 	$db->commit();
 	print '--- end ok'."\n";
-} else {
+}
+else
+{
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }

dev/examples/code/create_user.php

@@ -74,14 +74,18 @@ if ($idobject > 0)
 	// Change status to validated
 	$result=$obj->setStatut(1);
 	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else {
+	else
+	{
 		$error++;
 		dol_print_error($db, $obj->error);
 	}
-} elseif ($obj->error == 'ErrorLoginAlreadyExists')
+}
+elseif ($obj->error == 'ErrorLoginAlreadyExists')
 {
      print "User with login ".$obj->login." already exists\n";
-} else {
+}
+else
+{
 	$error++;
 	dol_print_error($db, $obj->error);
 }
@@ -93,7 +97,9 @@ if (! $error)
 {
 	$db->commit();
 	print '--- end ok'."\n";
-} else {
+}
+else
+{
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }

dev/examples/mail/source_email_ticket_1_to_create.txt

@@ -1,89 +0,0 @@
-Delivered-To: testldrdev@gmail.com
-Received: by 2002:a2e:9b9a:0:0:0:0:0 with SMTP id z26csp1425223lji;
-        Thu, 20 Aug 2020 08:29:02 -0700 (PDT)
-X-Received: by 2002:a05:620a:1292:: with SMTP id w18mr2938234qki.158.1597937342304;
-        Thu, 20 Aug 2020 08:29:02 -0700 (PDT)
-ARC-Seal: i=1; a=rsa-sha256; t=1597937342; cv=none;
-        d=google.com; s=arc-20160816;
-        b=FhT/+rJ/zNYgVQ5Nt/rLZJycGd/Ntkhm6LwI16YUfmEmxeGrP/cXXQULrqQ1LhBr9B
-         oRKweltTdnpyA14gm0kzbs1vUkf5HxLUuGk8IqqJWAPMUZoN8oUPkzq2BuKNQGxPiE+y
-         Hsg/fnYp8WzcAlZOLsEP2kcFIdA95Dyy5LkM8HgphI1jSS1d6gkx6nDGIMIpDD9D+w4X
-         ISxRUXp5JlDwFCUMOPoAvHIBUdJ3jpLsjesbMEnU4ssFqhxU21pBq+Fc+csSPeY5DL0M
-         HR1o+ChEAXIdDOrDqa0ohHfqR216juGCzH8YuEQ88LT0Qbst9IkOYWiAQv4TIh7vHtvQ
-         TMvA==
-ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
-        h=to:subject:message-id:date:from:mime-version:dkim-signature;
-        bh=sojOjnIKAXmsZ9zvMk5MGvY3qyOaFgnpRe6YPMYutOI=;
-        b=CRlrRPfoGkfmz6iXKy4HdxKQ4SeJTiIxjC2jNkgQPSnIDFJgDkJcwASJVpcjTmlVmH
-         Z9WnHKVUPRIHGDEoMRlx6eUx9QfelWqPYu3BBQGFry9sgth0BR/1s6tmQ+P+bAj23ryo
-         aL3UkF6KCSx4GhEk3MfHA5Ex81YDFHvHL3BZ2kb3XCVSlPiBq2szw1ETmRAsDdS5Gbu+
-         ZlzBbl4pRtUWgi1fB5H4Wcv7e90F4Et1SBP8IKSCa23qu2nV9xefgjfMw2ndxCj1zgCL
-         c3l7Ul6pw32nqf6+vxfZTstwIwgu6dXZXCHDqJqesI2g8RGxeba+LfKZEDpBuSeINS9r
-         GMvw==
-ARC-Authentication-Results: i=1; mx.google.com;
-       dkim=pass header.i=@destailleur.fr header.s=google header.b=IPMz90Yj;
-       spf=pass (google.com: domain of contact@destailleur.fr designates 209.85.220.41 as permitted sender) smtp.mailfrom=contact@destailleur.fr;
-       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=destailleur.fr
-Return-Path: <contact@destailleur.fr>
-Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41])
-        by mx.google.com with SMTPS id w14sor2138230qtb.9.2020.08.20.08.29.00
-        for <testldrdev@gmail.com>
-        (Google Transport Security);
-        Thu, 20 Aug 2020 08:29:01 -0700 (PDT)
-Received-SPF: pass (google.com: domain of contact@destailleur.fr designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;
-Authentication-Results: mx.google.com;
-       dkim=pass header.i=@destailleur.fr header.s=google header.b=IPMz90Yj;
-       spf=pass (google.com: domain of contact@destailleur.fr designates 209.85.220.41 as permitted sender) smtp.mailfrom=contact@destailleur.fr;
-       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=destailleur.fr
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=destailleur.fr; s=google;
-        h=mime-version:from:date:message-id:subject:to;
-        bh=sojOjnIKAXmsZ9zvMk5MGvY3qyOaFgnpRe6YPMYutOI=;
-        b=IPMz90Yjw1Mf57/rYWUYGtpc+IazEWcy6/bqxf1j0h6rxDH/wjhxsCWzfARgqqlfVj
-         ACg4IbPpZZlKFIYDSCbfMlWF65rbKfNre56HldfQgy0Tq3LC434zHz2ZZMOVCM52w3J9
-         VGBpASUlSL1o+YRmzOpRtHVu7I9aNwGxHuA070Yka8XLV76vV3P0vdL8PcoHq0jUUEoi
-         +dCZ9NCPuAFtGK2IavNoM2qQrLdfYIi+RwgWBtqjTwzyvDEJR+p5fIPK142ynMbHgWYO
-         RVtMqAgxjvL4sfyKZ5KuzKXkQNM3zyzMinWK89scBl+QLFCcWA4Qqc0dJjqLCBhh8lmq
-         n67g==
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20161025;
-        h=x-gm-message-state:mime-version:from:date:message-id:subject:to;
-        bh=sojOjnIKAXmsZ9zvMk5MGvY3qyOaFgnpRe6YPMYutOI=;
-        b=H0GsrFAi9JmRTKQ2budtDeLBqCaTisHKYCVVziyxmv+/tIcrSZBA4tdKwm+wR80r50
-         zMJXmyVS2DMDWfnIlOv39wcwQjYN3WK1aRJfV0bVuEWrQuzt5MMWbskf6xbzo201nhr9
-         ZlqATsEV7v1u5EHmfYwRhR8+AOmENdnm0g9RXPJVrFS58WNEJUSotS5Y5rZPjnT943y0
-         62Kf4Bd6uWvXhPFXWQoZLtWrPpkbcYPWIBmpftKhD0PD9c6rKaVduV0WhbigYsDoxb3F
-         iIafGPOyq91hiHR2gTLHiMmTDm+IDQ4n6gSkS7HKpZlLQhHoBMnpqJZYoxMJTxdpAbSy
-         mY+A==
-X-Gm-Message-State: AOAM5325RcN4/ThWbYCO3vWRMFFBrfzJUHC1bd1Z9VB3/2Q3RuF9lmIJ +SjshEErhK68Of2pHDZQ3aPU4rzDfV8ozbvRsgChdfZg8aA=
-X-Google-Smtp-Source: ABdhPJxUOUdurKEQfLldtiQGRkgC/h8gKQG1zhS+8k93p6N1SsOn517+GeRyT3E+/Uw536pmReO29la3EIAS6VT33SE=
-X-Received: by 2002:aed:3e8e:: with SMTP id n14mr3191190qtf.67.1597937340509; Thu, 20 Aug 2020 08:29:00 -0700 (PDT)
-MIME-Version: 1.0
-From: John Tester <customer@customercompany.fr>
-Date: Thu, 20 Aug 2020 17:28:34 +0200
-Message-ID: <CALeEO_kij-ogXKzrjV_pTgqVbUB9j=287VkX34iVSWgDHFA8eg@mail.gmail.com>
-Subject: Support besoin
-To: testldrdev@gmail.com
-Content-Type: multipart/alternative; boundary="0000000000008e099705ad50c772"
-
---0000000000008e099705ad50c772
-Content-Type: text/plain; charset="UTF-8"
-
-adfsdfsdfds
-
--- 
-Laurent.
-------------------------------------------------------------------------------------
-Twitter: https://www.twitter.com/eldy10
-
---0000000000008e099705ad50c772
-Content-Type: text/html; charset="UTF-8"
-Content-Transfer-Encoding: quoted-printable
-
-<div dir=3D"ltr">adfsdfsdfds<br clear=3D"all"><div><br></div>-- <br><div di=
-r=3D"ltr" class=3D"gmail_signature" data-smartmail=3D"gmail_signature">Laur=
-ent.<br>-------------------------------------------------------------------=
------------------<br>Twitter: <a href=3D"https://www.twitter.com/eldy10" ta=
-rget=3D"_blank">https://www.twitter.com/eldy10</a></div></div>
-
---0000000000008e099705ad50c772--

dev/examples/mail/source_email_ticket_2_answer_from_ticket.txt

@@ -1,57 +0,0 @@
-Return-Path: <testldrdev@gmail.com>
-Received: from smtp.gmail.com ([2a01:e0a:7e:4ae0:329c:23ff:feb8:dc8d])
-        by smtp.gmail.com with ESMTPSA id 32sm5811196wrh.18.2020.08.20.09.31.37
-        for <customer@customercompany.fr>
-        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
-        Thu, 20 Aug 2020 09:31:37 -0700 (PDT)
-From: testldrdev@gmail.com
-X-Google-Original-From: <aa@aa.comg>
-To: customer@customercompany.fr
-Subject: [MyBigCompany - Ticket #TS2008-0040] Nouveau message
-Date: Thu, 20 Aug 2020 18:31:37 +0200
-Message-ID: <1597941097.SMTPs-dolibarr-tic58@83b5bc91f83a56e458db71e0adac2b62>
-References: <1597941097.SMTPs-dolibarr-tic58@83b5bc91f83a56e458db71e0adac2b62>
-X-Dolibarr-TRACKID: tic58@83b5bc91f83a56e458db71e0adac2b62
-X-RemoteAddr: 127.0.0.1
-X-Mailer: Dolibarr version 13.0.0-alpha (using SMTPs Mailer)
-X-Dolibarr-Option: MAIN_MAIL_USE_MULTI_PART
-Mime-Version: 1.0
-Content-Type: multipart/mixed; boundary="multipart_x.1597941097.x_boundary"
-Content-Transfer-Encoding: 8bit
-
---multipart_x.1597941097.x_boundary
-Content-Type: multipart/alternative; boundary="mul_872cdd6a64216735955664484832b075"
-
---mul_872cdd6a64216735955664484832b075
-Content-Type: text/plain; charset=UTF-8
-
-Bonjour 
-
- 
-Une nouvelle réponse a été ajoutée à un ticket que vous suivez. Voici
-le message :PredefinedMailContentTicket_send 
- 
- 
-Vous pouvez voir la progression du ticket en cliquant sur le lien
-ci-dessus. : fr5uw2yospypn2rz 
- Cordialement, 
- 
---
---mul_872cdd6a64216735955664484832b075
-Content-Type: text/html; charset=UTF-8
-
-<html><head><title></title></head><body>Bonjour<br>
-
-<br>
-Une nouvelle réponse a été ajoutée à un ticket que vous suivez. Voici
-le message :PredefinedMailContentTicket_send<br>
-<br>
-<br>
-Vous pouvez voir la progression du ticket en cliquant sur le lien
-ci-dessus. : <a
-href="http://localhostgit/dolibarr_dev/htdocs/public/ticket/view.php?track_id=fr5uw2yospypn2rz">fr5uw2yospypn2rz</a><br>
-<br>Cordialement,<br>
-<br>
---</body></html>
---mul_872cdd6a64216735955664484832b075--
---multipart_x.1597941097.x_boundary--

dev/examples/mail/source_email_ticket_3_answer_from_mailer.txt

@@ -1,48 +0,0 @@
-MIME-Version: 1.0
-Date: Thu, 20 Aug 2020 18:34:01 +0200
-References: <CALeEO_kij-ogXKzrjV_pTgqVbUB9j=287VkX34iVSWgDHFA8eg@mail.gmail.com>
-In-Reply-To: <CALeEO_kij-ogXKzrjV_pTgqVbUB9j=287VkX34iVSWgDHFA8eg@mail.gmail.com>
-Message-ID: <CAC8+=32ccpEo12RR-juT=FW6+gNV-DcvNjxs_0s6Wn40xmfhug@mail.gmail.com>
-Subject: Re: Support besoin
-From: John Tester <testldrdev@gmail.com>
-To: John Tester <customer@customercompany.fr>
-Content-Type: multipart/alternative; boundary="0000000000001620dd05ad51b075"
-
---0000000000001620dd05ad51b075
-Content-Type: text/plain; charset="UTF-8"
-Content-Transfer-Encoding: quoted-printable
-
-Merci pour votre question.
-Voici la rep.
-
-Le jeu. 20 ao=C3=BBt 2020 =C3=A0 17:29, John Tester <laurent@destai=
-lleur.fr>
-a =C3=A9crit :
-
-> adfsdfsdfds
->
-> --
-> Laurent.
->
-> -------------------------------------------------------------------------=
------------
-> Twitter: https://www.twitter.com/eldy10
->
-
---0000000000001620dd05ad51b075
-Content-Type: text/html; charset="UTF-8"
-Content-Transfer-Encoding: quoted-printable
-
-<div dir=3D"ltr">Merci pour votre question.<div>Voici la rep.</div></div><b=
-r><div class=3D"gmail_quote"><div dir=3D"ltr" class=3D"gmail_attr">Le=C2=A0=
-jeu. 20 ao=C3=BBt 2020 =C3=A0=C2=A017:29, John Tester &lt;<a href=
-=3D"mailto:customer@customercompany.fr">customer@customercompany.fr</a>&gt; a =C3=A9c=
-rit=C2=A0:<br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0=
-px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div =
-dir=3D"ltr">adfsdfsdfds<br clear=3D"all"><div><br></div>-- <br><div dir=3D"=
-ltr">Laurent.<br>----------------------------------------------------------=
---------------------------<br>Twitter: <a href=3D"https://www.twitter.com/e=
-ldy10" target=3D"_blank">https://www.twitter.com/eldy10</a></div></div>
-</blockquote></div>
-
---0000000000001620dd05ad51b075--

dev/examples/mail/source_email_ticket_4_answer_of_answer_from_mailer.txt

@@ -1,134 +0,0 @@
-Delivered-To: testldrdev@gmail.com
-Received: by 2002:a2e:9b9a:0:0:0:0:0 with SMTP id z26csp1483607lji;
-        Thu, 20 Aug 2020 09:56:03 -0700 (PDT)
-X-Received: by 2002:ac8:3868:: with SMTP id r37mr3301993qtb.95.1597942563252;
-        Thu, 20 Aug 2020 09:56:03 -0700 (PDT)
-ARC-Seal: i=1; a=rsa-sha256; t=1597942563; cv=none;
-        d=google.com; s=arc-20160816;
-        b=skUGL+keim3FdNXfKGgQokCfj85gnhYhuLbMM61qY5W6ixSH9s8I6uoNh3gzVy89XM
-         NGbZiajjDiPMBryl87PhD+ACBjv8WoZAQiojAga0ELPPmVDnhrtWKANLbRrkUI3Xtfoj
-         b1o2iHP2Q12Vqs6xiAy86yxURlIKGM3tw91WryWiIPiAL7bRZPn49N3XbO2ULE0QKTBq
-         BI5YnOxt9NfTj0xhKaLLIJ9M1qa4e1QyOHl56WuEv3Gx6uHDAQDYz+C5G0VgdjBvwRzH
-         pJaiAulc1uW/V9TcRMwvwIWtI7eWygvU2PiuI/c05G1KVKibAubHE55IjOJCn2O2UaH4
-         WMNQ==
-ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
-        h=to:subject:message-id:date:from:in-reply-to:references:mime-version
-         :dkim-signature;
-        bh=j6+rsx5MBsg1/s7LIIfByV7u0jGK09n72bnK4XcN6ZQ=;
-        b=Ps5kk+tBGQzMP6ugDCwKf4hzn8fn3DU4AFz1dJvkHdDestLZWN99Qtr6iNMdslsHJm
-         ov378c+8oCfcV7shyBYjlAFfikFi7o4RM/evh3yqqjAnhyVfcYH7c9cexVvDo/AXUAZ7
-         N7Mh7EOvyDXXsaHK2l89XiAxZx/hZh/O+/HR2EoVEGre1eYRYwI/aEfPN8d4/fL2VtCD
-         0wzAwnUrINuXmcaUDT30Twjk9kwGjjTsM6Z531vKM6L3y48a7f3GTE7V+vo2QxHdUT54
-         fQVue9OO7b4VKTEj/x/dmNr+92sHRAMMS7dj/VXMmzM+WttUCAPNxZ27/bvt4bBc5oBp
-         QPEA==
-ARC-Authentication-Results: i=1; mx.google.com;
-       dkim=pass header.i=@destailleur.fr header.s=google header.b=SEYSmxbT;
-       spf=pass (google.com: domain of contact@destailleur.fr designates 209.85.220.41 as permitted sender) smtp.mailfrom=contact@destailleur.fr;
-       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=destailleur.fr
-Return-Path: <contact@destailleur.fr>
-Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41])
-        by mx.google.com with SMTPS id q3sor2285165qtn.34.2020.08.20.09.56.02
-        for <testldrdev@gmail.com>
-        (Google Transport Security);
-        Thu, 20 Aug 2020 09:56:03 -0700 (PDT)
-Received-SPF: pass (google.com: domain of contact@destailleur.fr designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;
-Authentication-Results: mx.google.com;
-       dkim=pass header.i=@destailleur.fr header.s=google header.b=SEYSmxbT;
-       spf=pass (google.com: domain of contact@destailleur.fr designates 209.85.220.41 as permitted sender) smtp.mailfrom=contact@destailleur.fr;
-       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=destailleur.fr
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=destailleur.fr; s=google;
-        h=mime-version:references:in-reply-to:from:date:message-id:subject:to;
-        bh=j6+rsx5MBsg1/s7LIIfByV7u0jGK09n72bnK4XcN6ZQ=;
-        b=SEYSmxbTKCuc1baQZzjIJwm7WXvgjt/nEGhMLqWxQCU3beM3qhH8wYlSeMyB8Z/9pi
-         tszZFZhZ3cjnIbbJnjzsMYJgBnYbkf6hz14+BsFwyPU030EkDjJy2i3DSXzYK7A+GbBn
-         G9I9foG/4+pcx0LnFsjchGsRhLFkTKJIsP2SVfOx0wlim3WHMIqIXvKsxY05PoPyf8Tp
-         IwQi7iNl/+nTyjNHl2DQh+ty3CRTmUw9uEbY+jRRvIg5i/7cfREekK98d7qi/5HQycr6
-         aptRDdCVHXpe47q+c7OPiMEEQWs+mFJhBqPXIlU54fwFApEEnLn/jwGbrPsrPYJaswgI
-         vd/g==
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20161025;
-        h=x-gm-message-state:mime-version:references:in-reply-to:from:date
-         :message-id:subject:to;
-        bh=j6+rsx5MBsg1/s7LIIfByV7u0jGK09n72bnK4XcN6ZQ=;
-        b=M6a4k1gKc4e7TwKncuNPy0b3KxutR1FLFJGWxd4NyW84b7f3LfIR94IeInLQIWmY8C
-         Ddus0upZJI4+NN9XBGvXCdsiiYlwFGBJRWwjv82XFKVAKL5DD94RJNQZJUiE39hgJ2aa
-         6V9gasiP+nUAX4ZV9bZmw21CgKEZrZVXh5unmW2ABrfcx8lHjp/DUw5XEkym1J92Wo1l
-         g0H3XrC2FL+aQuj+WpCynMNkY9ljw71oqyv3SP9pjnVNHArAdZiPMHkNxiuPdq7q41fg
-         eIbdRCQXYZL5O48QsjDdiXwaQzx+NcYtrKAH0RIVD1lG6zc9pxqDJsbGxP9VLs8jGDTT
-         mSdQ==
-X-Gm-Message-State: AOAM532LuATWDKbo1HImMWshHVqb0kC0isehf3owfYUKq5J68o3juKbm kCgUMt25A2C7QoNMDXcjfJyteBNQD7ZhSh3yeYTGoLSvsD4=
-X-Google-Smtp-Source: ABdhPJyQYCpCHSwA87x030i8YChySZqcNXxT1qVlZyEA+XM6DTyPZusa8gtbDUVcMyx7Jma/7toh+4EEE2bWg0bG+2E=
-X-Received: by 2002:aed:3e8e:: with SMTP id n14mr3547383qtf.67.1597942562373; Thu, 20 Aug 2020 09:56:02 -0700 (PDT)
-MIME-Version: 1.0
-References: <CALeEO_kij-ogXKzrjV_pTgqVbUB9j=287VkX34iVSWgDHFA8eg@mail.gmail.com> <CAC8+=32ccpEo12RR-juT=FW6+gNV-DcvNjxs_0s6Wn40xmfhug@mail.gmail.com>
-In-Reply-To: <CAC8+=32ccpEo12RR-juT=FW6+gNV-DcvNjxs_0s6Wn40xmfhug@mail.gmail.com>
-From: John Tester <customer@customercompany.fr>
-Date: Thu, 20 Aug 2020 18:55:36 +0200
-Message-ID: <CALeEO_nLUY8Tk+o7WoaHtBkxvOy0dhvt+fL0MwPrApGty_AG_g@mail.gmail.com>
-Subject: Re: Support besoin
-To: John Tester <testldrdev@gmail.com>
-Content-Type: multipart/alternative; boundary="000000000000cd54be05ad51fe67"
-
---000000000000cd54be05ad51fe67
-Content-Type: text/plain; charset="UTF-8"
-Content-Transfer-Encoding: quoted-printable
-
-Merci
-
-Le jeu. 20 ao=C3=BBt 2020 =C3=A0 18:34, John Tester <testldrdev@gma=
-il.com> a
-=C3=A9crit :
-
-> Merci pour votre question.
-> Voici la rep.
->
-> Le jeu. 20 ao=C3=BBt 2020 =C3=A0 17:29, John Tester <laurent@dest=
-ailleur.fr>
-> a =C3=A9crit :
->
->> adfsdfsdfds
->>
->> --
->> Laurent.
->>
->> ------------------------------------------------------------------------=
-------------
->> Twitter: https://www.twitter.com/eldy10
->>
->
-
---=20
-Laurent.
----------------------------------------------------------------------------=
----------
-Twitter: https://www.twitter.com/eldy10
-
---000000000000cd54be05ad51fe67
-Content-Type: text/html; charset="UTF-8"
-Content-Transfer-Encoding: quoted-printable
-
-<div dir=3D"ltr">Merci</div><br><div class=3D"gmail_quote"><div dir=3D"ltr"=
- class=3D"gmail_attr">Le=C2=A0jeu. 20 ao=C3=BBt 2020 =C3=A0=C2=A018:34, Lau=
-rent Destailleur &lt;<a href=3D"mailto:testldrdev@gmail.com">testldrdev@gma=
-il.com</a>&gt; a =C3=A9crit=C2=A0:<br></div><blockquote class=3D"gmail_quot=
-e" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204)=
-;padding-left:1ex"><div dir=3D"ltr">Merci pour votre question.<div>Voici la=
- rep.</div></div><br><div class=3D"gmail_quote"><div dir=3D"ltr" class=3D"g=
-mail_attr">Le=C2=A0jeu. 20 ao=C3=BBt 2020 =C3=A0=C2=A017:29, Laurent Destai=
-lleur &lt;<a href=3D"mailto:customer@customercompany.fr" target=3D"_blank">laure=
-nt@destailleur.fr</a>&gt; a =C3=A9crit=C2=A0:<br></div><blockquote class=3D=
-"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(2=
-04,204,204);padding-left:1ex"><div dir=3D"ltr">adfsdfsdfds<br clear=3D"all"=
-><div><br></div>-- <br><div dir=3D"ltr">Laurent.<br>-----------------------=
--------------------------------------------------------------<br>Twitter: <=
-a href=3D"https://www.twitter.com/eldy10" target=3D"_blank">https://www.twi=
-tter.com/eldy10</a></div></div>
-</blockquote></div>
-</blockquote></div><br clear=3D"all"><div><br></div>-- <br><div dir=3D"ltr"=
- class=3D"gmail_signature">Laurent.<br>------------------------------------=
-------------------------------------------------<br>Twitter: <a href=3D"htt=
-ps://www.twitter.com/eldy10" target=3D"_blank">https://www.twitter.com/eldy=
-10</a></div>
-
---000000000000cd54be05ad51fe67--

dev/examples/zapier/.editorconfig

@@ -1,21 +0,0 @@
-# EditorConfig is awesome: https://editorconfig.org
-
-# top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
-[*]
-charset = utf-8
-end_of_line = lf
-
-[*.js]
-indent_style = space
-indent_size = 4
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.md]
-indent_style = space
-indent_size = 2
-insert_final_newline = true
-trim_trailing_whitespace = false

dev/examples/zapier/.gitignore

@@ -5,4 +5,3 @@ node_modules
 .environment
 .env
 .zapierapprc
-package-lock.json

dev/examples/zapier/README.md

@@ -1,68 +0,0 @@
-# HOW TO BUILD
-
-
-## ENABLE MODULE ZAPIER ON DOLIBARR
-
-This should also enable the module API (required for authentication by Zapier service and to execute action in Dolibarr by Zapier).
-
-Create the Dolibarr login that will be used by Zapier to call APIs. Give the login the permissions on the action you plan to automate.
-
-
-## CREATE A ZAPIER DEVELOPPER ACCOUNT
-
-At first, you need to have a Zapier developper acoount, create it here [Zapier Platform](https://developer.zapier.com/)
-
-
-## INSTALL ZAPIER COMMAND LINE TOOLS WITH LINK TO ZAPIER ONLINE ACCOUNT
-
-### Install Node.js
-
-An easy option to get set up with Node.js is to visit [https://nodejs.org/en/download/](https://nodejs.org/en/download/) and download the official installer for your OS. If you're installing with a package manager it's even easier.
-
-After installation, confirm that Node.js is ready to use:
-  `node --version`
-
-### Install the Zapier CLI
-
-Next let's install the Zapier CLI tools. The CLI will allow you to build your app, deploy it to the Zapier platform, do local testing, manage users and testers, view remote logs, collaborate with your team, and more:
-
-  `cd dev/examples/zapier`
-
-  `npm install -g zapier-platform-cli` to install the CLI globally
-
-  `zapier --version` to return version of the CLI
-
-### Run Zapier Login
-
-Let's configure authentication between your dev environment and the Zapier platform. You'll use the email address and password you use to log in to the Zapier application.
-
-  `zapier login`
-
-This command will set up a .zapierrc file in your home directory.
-
-### Install the Project
-
-In zapier example directory, run:
-
-  `cd dev/examples/zapier`
-
-  `npm install`
-
-### Deploying your App
-
-Let's deploy it! When you're ready to try your code out on the Zapier platform use the push command. Only you will be able to see the app until you invite testers.
-
-  `zapier register`   (the first time, choose name for example "Dolibarr")
-  
-  `zapier push`
-
-After a push, the Application, with the name you defined during the register step, is available when creating a Zap.
-
-You will find original tutorial here : [https://zapier.com/developer/start/introduction](https://zapier.com/developer/start/introduction)
-
-
-### Create a Zap
-
-Create a ZAP that use the application you registered.
-For authentication, you must enter the login / pass of account used by Zapier to call APIs.
-

dev/examples/zapier/authentication.js

@@ -1,6 +1,6 @@
 /*jshint esversion: 6 */
-const test = (z , bundle) => {
-    const url = bundle.authData.url+'/api/index.php/status';
+const testAuth = (z , bundle) => {
+    const url = bundle.authData.url+'/api/index.php/login';
     // Normally you want to make a request to an endpoint that is either specifically designed to test auth, or one that
     // every user will have access to, such as an account or profile endpoint like /me.
     // In this example, we'll hit httpbin, which validates the Authorization Header against the arguments passed in the URL path
@@ -11,92 +11,67 @@ const test = (z , bundle) => {
     // This method can return any truthy value to indicate the credentials are valid.
     // Raise an error to show
     return promise.then((response) => {
-        if (response.status === 400) {
-            throw new Error('400 -The Session Key you supplied is invalid');
-        }
-        if (response.status === 403) {
-            throw new Error('403 -The Session Key you supplied is invalid');
+        if (response.status === 401) {
+            throw new Error('The Session Key you supplied is invalid');
         }
         return response;
     });
 };
 
-// To include the session key header on all outbound requests, simply define a function here.
-// It runs runs before each request is sent out, allowing you to make tweaks to the request in a centralized spot
-const includeSessionKeyHeader = (request, z, bundle) => {
-    if (bundle.authData.sessionKey) {
-        request.headers = request.headers || {};
-        request.headers['DOLAPIKEY'] = bundle.authData.sessionKey;
-    }
-    return request;
-};
-
-// If we get a response and it is a 401, we can raise a special error telling Zapier to retry this after another exchange.
-const sessionRefreshIf401 = (response, z, bundle) => {
-    if (bundle.authData.sessionKey) {
-        if (response.status === 401) {
-            throw new z.errors.RefreshAuthError('Session apikey needs refreshing.');
-        }
-    }
-    return response;
-};
-
-const getSessionKey = async (z, bundle) => {
+const getSessionKey = (z, bundle) => {
     const url = bundle.authData.url + '/api/index.php/login';
 
-    const response = await z.request({
-        url: url,
+    const promise = z.request({
         method: 'POST',
+        url: url,
         body: {
             login: bundle.authData.login,
             password: bundle.authData.password,
-        },
+        }
     });
 
-    // if (response.status === 401) {
-    //     throw new Error('The login/password you supplied is invalid');
-    // }
-    const json = JSON.parse(response.content);
-    return {
-        sessionKey: json.success.token || '',
-    };
+    return promise.then((response) => {
+        if (response.status === 401) {
+            throw new Error('The login/password you supplied is invalid');
+        }
+        const json = JSON.parse(response.content);
+        return {
+            sessionKey: json.success.token || 'secret'
+        };
+    });
 };
 
 module.exports = {
-    config: {
-        type: 'session',
-        sessionConfig: {
-            perform: getSessionKey
+    type: 'session',
+    // Define any auth fields your app requires here. The user will be prompted to enter this info when
+    // they connect their account.
+    fields: [
+        {
+            key: 'url',
+            label: 'Url of service',
+            required: true,
+            type: 'string'
         },
-        // Define any auth fields your app requires here. The user will be prompted to enter this info when
-        // they connect their account.
-        fields: [
-            {
-                key: 'url',
-                label: 'Url of service without trailing-slash',
-                required: true,
-                type: 'string'
-            },
-            {
-                key: 'login',
-                label: 'Login',
-                required: true,
-                type: 'string'
-            },
-            {
-                key: 'password',
-                label: 'Password',
-                required: true,
-                type: 'password'
-            }
-        ],
-        // The test method allows Zapier to verify that the credentials a user provides are valid. We'll execute this
-        // method whenever a user connects their account for the first time.
-        test,
-        // The method that will exchange the fields provided by the user for session credentials.
-        // assuming "login" is a key returned from the test
-        connectionLabel: '{{login}}'
+        {
+            key: 'login',
+            label: 'Login',
+            required: true,
+            type: 'string'
+        },
+        {
+            key: 'password',
+            label: 'Password',
+            required: true,
+            type: 'password'
+        }
+    ],
+    // The test method allows Zapier to verify that the credentials a user provides are valid. We'll execute this
+    // method whenever a user connects their account for the first time.
+    test: testAuth,
+    // The method that will exchange the fields provided by the user for session credentials.
+    sessionConfig: {
+        perform: getSessionKey
     },
-    befores: [includeSessionKeyHeader],
-    afters: [sessionRefreshIf401],
+    // assuming "login" is a key returned from the test
+    connectionLabel: '{{login}}'
 };

dev/examples/zapier/creates/thirdparty.js

@@ -72,7 +72,7 @@ module.exports = {
         },
 
         outputFields: [
-            {key: 'id', type: "integer", label: 'ID'},
+            {key: 'id', label: 'ID'},
             {key: 'name', label: 'Name'},
             {key: 'name_alias', label: 'Name alias'},
             {key: 'address', label: 'Address'},
@@ -81,8 +81,8 @@ module.exports = {
             {key: 'phone', label: 'Phone'},
             {key: 'fax', label: 'Fax'},
             {key: 'email', label: 'Email'},
-            {key: 'client', type: "integer", label: 'Customer/Prospect 0/1/2/3'},
-            {key: 'fournisseur', type: "integer", label: 'Supplier 0/1'},
+            {key: 'client', label: 'Customer/Prospect 0/1/2/3'},
+            {key: 'fournisseur', label: 'Supplier 0/1'},
             {key: 'code_client', label: 'Customer code'},
             {key: 'code_fournisseur', label: 'Supplier code'}
         ]

dev/examples/zapier/index.js

@@ -1,39 +1,33 @@
 /*jshint esversion: 6 */
-const triggerAction = require('./triggers/action');
-const triggerOrder = require('./triggers/order');
 const triggerThirdparty = require('./triggers/thirdparty');
-const triggerTicket = require('./triggers/ticket');
-const triggerUser = require('./triggers/user');
+const triggerOrder = require('./triggers/order');
+const triggerAction = require('./triggers/action');
 
 const searchThirdparty = require('./searches/thirdparty');
 
 const createThirdparty = require('./creates/thirdparty');
 
-const {
-    config: authentication,
-    befores = [],
-    afters = [],
-} = require('./authentication');
+const authentication = require('./authentication');
 
 // To include the session key header on all outbound requests, simply define a function here.
 // It runs runs before each request is sent out, allowing you to make tweaks to the request in a centralized spot
-// const includeSessionKeyHeader = (request, z, bundle) => {
-//     if (bundle.authData.sessionKey) {
-//         request.headers = request.headers || {};
-//         request.headers['DOLAPIKEY'] = bundle.authData.sessionKey;
-//     }
-//     return request;
-// };
+const includeSessionKeyHeader = (request, z, bundle) => {
+    if (bundle.authData.sessionKey) {
+        request.headers = request.headers || {};
+        request.headers['DOLAPIKEY'] = bundle.authData.sessionKey;
+    }
+    return request;
+};
 
 // If we get a response and it is a 401, we can raise a special error telling Zapier to retry this after another exchange.
-// const sessionRefreshIf401 = (response, z, bundle) => {
-//     if (bundle.authData.sessionKey) {
-//         if (response.status === 401) {
-//             throw new z.errors.RefreshAuthError('Session apikey needs refreshing.');
-//         }
-//     }
-//     return response;
-// };
+const sessionRefreshIf401 = (response, z, bundle) => {
+    if (bundle.authData.sessionKey) {
+        if (response.status === 401) {
+            throw new z.errors.RefreshAuthError('Session apikey needs refreshing.');
+        }
+    }
+    return response;
+};
 
 // We can roll up all our behaviors in an App.
 const App = {
@@ -46,11 +40,11 @@ const App = {
 
     // beforeRequest & afterResponse are optional hooks into the provided HTTP client
     beforeRequest: [
-        ...befores
+        includeSessionKeyHeader
     ],
 
     afterResponse: [
-        ...afters
+        sessionRefreshIf401
     ],
 
     // If you want to define optional resources to simplify creation of triggers, searches, creates - do that here!
@@ -59,11 +53,9 @@ const App = {
 
     // If you want your trigger to show up, you better include it here!
     triggers: {
-        [triggerAction.key]: triggerAction,
-        [triggerOrder.key]: triggerOrder,
         [triggerThirdparty.key]: triggerThirdparty,
-        [triggerTicket.key]: triggerTicket,
-        [triggerUser.key]: triggerUser,
+        [triggerOrder.key]: triggerOrder,
+        [triggerAction.key]: triggerAction
     },
 
     // If you want your searches to show up, you better include it here!

dev/examples/zapier/package-lock.json

@@ -0,0 +1,405 @@
+{
+  "name": "Dolibarr",
+  "version": "1.0.2",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@types/node": {
+      "version": "8.10.20",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.20.tgz",
+      "integrity": "sha512-M7x8+5D1k/CuA6jhiwuSCmE8sbUWJF0wYsjcig9WrXvwUI5ArEoUBdOXpV4JcEMrLp02/QbDjw+kI+vQeKyQgg==",
+      "optional": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "bluebird": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
+      "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw="
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true
+    },
+    "combined-stream": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
+      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+      "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "content-disposition": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
+    },
+    "debug": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "dev": true,
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "dev": true
+    },
+    "dotenv": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz",
+      "integrity": "sha512-4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow=="
+    },
+    "encoding": {
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
+      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
+      "requires": {
+        "iconv-lite": "~0.4.13"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "growl": {
+      "version": "1.10.5",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "he": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
+      "dev": true
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+    },
+    "json-tryparse": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/json-tryparse/-/json-tryparse-1.0.5.tgz",
+      "integrity": "sha1-Khy6CLTjEjNo+p+2o01GQwBFeyc="
+    },
+    "jsonschema": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.1.1.tgz",
+      "integrity": "sha1-PO3o4+QR03eHLu+8n98mODy8Ptk="
+    },
+    "lodash": {
+      "version": "4.17.11",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+    },
+    "mime-db": {
+      "version": "1.38.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
+      "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="
+    },
+    "mime-types": {
+      "version": "2.1.22",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz",
+      "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
+      "requires": {
+        "mime-db": "~1.38.0"
+      }
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "mocha": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
+      "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
+      "dev": true,
+      "requires": {
+        "browser-stdout": "1.3.1",
+        "commander": "2.15.1",
+        "debug": "3.1.0",
+        "diff": "3.5.0",
+        "escape-string-regexp": "1.0.5",
+        "glob": "7.1.2",
+        "growl": "1.10.5",
+        "he": "1.1.1",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "supports-color": "5.4.0"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node-fetch": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.1.tgz",
+      "integrity": "sha512-j8XsFGCLw79vWXkZtMSmmLaOk9z5SQ9bV/tkbZVCqvgwzrjAGq66igobLofHtF63NvMTp2WjytpsNTGKa+XRIQ==",
+      "requires": {
+        "encoding": "^0.1.11",
+        "is-stream": "^1.0.1"
+      }
+    },
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "semver": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
+    },
+    "should": {
+      "version": "13.2.3",
+      "resolved": "https://registry.npmjs.org/should/-/should-13.2.3.tgz",
+      "integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==",
+      "dev": true,
+      "requires": {
+        "should-equal": "^2.0.0",
+        "should-format": "^3.0.3",
+        "should-type": "^1.4.0",
+        "should-type-adaptors": "^1.0.1",
+        "should-util": "^1.0.0"
+      }
+    },
+    "should-equal": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz",
+      "integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==",
+      "dev": true,
+      "requires": {
+        "should-type": "^1.4.0"
+      }
+    },
+    "should-format": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz",
+      "integrity": "sha1-m/yPdPo5IFxT04w01xcwPidxJPE=",
+      "dev": true,
+      "requires": {
+        "should-type": "^1.3.0",
+        "should-type-adaptors": "^1.0.1"
+      }
+    },
+    "should-type": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz",
+      "integrity": "sha1-B1bYzoRt/QmEOmlHcZ36DUz/XPM=",
+      "dev": true
+    },
+    "should-type-adaptors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz",
+      "integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==",
+      "dev": true,
+      "requires": {
+        "should-type": "^1.3.0",
+        "should-util": "^1.0.0"
+      }
+    },
+    "should-util": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.0.tgz",
+      "integrity": "sha1-yYzaN0qmsZDfi6h8mInCtNtiAGM=",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+      "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "zapier-platform-core": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/zapier-platform-core/-/zapier-platform-core-8.0.1.tgz",
+      "integrity": "sha512-vuAe7JkFQ88AeQ//NwwNEh8ZjiZr30GRWtwYo7Wo/nx1cqZwq+CRc9zJU2WRrhJfJOtOOTUF6w+pArBTtMOC5A==",
+      "requires": {
+        "@types/node": "8.10.20",
+        "bluebird": "3.5.0",
+        "content-disposition": "0.5.2",
+        "dotenv": "5.0.1",
+        "form-data": "2.3.2",
+        "lodash": "4.17.11",
+        "node-fetch": "1.7.1",
+        "oauth-sign": "0.9.0",
+        "semver": "5.6.0",
+        "zapier-platform-schema": "8.0.1"
+      }
+    },
+    "zapier-platform-schema": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/zapier-platform-schema/-/zapier-platform-schema-8.0.1.tgz",
+      "integrity": "sha512-97KJ0xVLtpU4BiXVaMTPQpiA0T6CQIEzWfzAWwJAWbu5336+6DMFUzDWN4bANBeD3CIsRHHPcZkP8n/17U05ag==",
+      "requires": {
+        "jsonschema": "1.1.1",
+        "lodash": "4.17.10"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.10",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
+          "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
+        }
+      }
+    }
+  }
+}

dev/examples/zapier/package.json

@@ -1,9 +1,9 @@
 {
-  "name": "dolibarr",
-  "version": "1.13.0",
+  "name": "Dolibarr",
+  "version": "1.0.0",
   "description": "An app for connecting Dolibarr to the Zapier platform.",
   "repository": "Dolibarr/dolibarr",
-  "homepage": "https://www.dolibarr.org/",
+  "homepage": "https://www.dolibarr.fr/",
   "author": "Frédéric France <frederic.france@netlogic.fr>",
   "license": "BSD-3-Clause",
   "main": "index.js",
@@ -15,7 +15,7 @@
     "npm": ">=5.6.0"
   },
   "dependencies": {
-    "zapier-platform-core": "10.1.2"
+    "zapier-platform-core": "8.0.1"
   },
   "devDependencies": {
     "mocha": "^5.2.0",

dev/examples/zapier/searches/thirdparty.js

@@ -54,20 +54,13 @@ module.exports = {
         // outputFields: () => { return []; }
         // Alternatively, a static field definition should be provided, to specify labels for the fields
         outputFields: [
-            {
-                key: 'id',
-                type: "integer",
-                label: 'ID'
-            },
-            {key: 'createdAt', type: "integer", label: 'Created At'},
+            {key: 'id', label: 'ID'},
+            {key: 'createdAt', label: 'Created At'},
             {key: 'name', label: 'Name'},
             {key: 'firstname', label: 'Firstname'},
             {key: 'directions', label: 'Directions'},
-            {key: 'authorId', type: "integer", label: 'Author ID'},
-            {
-                key: 'style',
-                label: 'Style'
-            }
+            {key: 'authorId', label: 'Author ID'},
+            {key: 'style', label: 'Style'}
         ]
     }
 };

dev/examples/zapier/triggers/action.js

@@ -10,14 +10,14 @@ const subscribeHook = (z, bundle) => {
         action: bundle.inputData.action
     };
 
-    const url = bundle.authData.url + '/api/index.php/zapierapi/hook';
+    const url = bundle.authData.url  + '/api/index.php/zapierapi/hook';
 
     // You can build requests and our client will helpfully inject all the variables
     // you need to complete. You can also register middleware to control this.
     const options = {
         url: url,
         method: 'POST',
-        body: data,
+        body: JSON.stringify(data)
     };
 
     // You may return a promise or a normal data structure from any perform method.
@@ -32,7 +32,7 @@ const unsubscribeHook = (z, bundle) => {
     // You can build requests and our client will helpfully inject all the variables
     // you need to complete. You can also register middleware to control this.
     const options = {
-        url: bundle.authData.url + '/api/index.php/zapierapi/hook/' + bundle.subscribeData.id,
+        url: bundle.authData.url  + '/api/index.php/zapierapi/hook/' + bundle.subscribeData.id,
         method: 'DELETE',
     };
 
@@ -74,7 +74,7 @@ const getFallbackRealAction = (z, bundle) => {
     // For the test poll, you should get some real data, to aid the setup process.
     const module = bundle.inputData.module;
     const options = {
-        url: bundle.authData.url + '/api/index.php/agendaevents/0',
+        url: bundle.authData.url  + '/api/index.php/agendaevents/0',
     };
 
     return z.request(options).then((response) => [JSON.parse(response.content)]);
@@ -100,7 +100,7 @@ module.exports = {
     noun: 'Action',
     display: {
         label: 'New Agenda',
-        description: 'Triggers when a new agenda with action is done in Dolibarr.'
+        description: 'Trigger when a new agenda with action is done in Dolibarr.'
     },
 
     // `operation` is where the business logic goes.
@@ -111,7 +111,6 @@ module.exports = {
         inputFields: [
             {
                 key: 'action',
-                required: true,
                 type: 'string',
                 helpText: 'Which action of agenda this should trigger on.',
                 choices: {
@@ -146,33 +145,12 @@ module.exports = {
         // outputFields: () => { return []; }
         // Alternatively, a static field definition should be provided, to specify labels for the fields
         outputFields: [
-            {
-                key: 'id',
-                type: "integer",
-                label: 'ID'
-            },
-            {
-                key: 'createdAt',
-                type: "integer",
-                label: 'Created At'
-            },
-            {
-                key: 'name',
-                label: 'Name'
-            },
-            {
-                key: 'usertodo__name',
-                label: 'UserToDo Name'
-            },
-            {
-                key: 'authorId',
-                type: "integer",
-                label: 'Author ID'
-            },
-            {
-                key: 'action',
-                label: 'Action'
-            }
+            {key: 'id', label: 'ID'},
+            {key: 'createdAt', label: 'Created At'},
+            {key: 'name', label: 'Name'},
+            {key: 'usertodo__name', label: 'UserToDo Name'},
+            {key: 'authorId', label: 'Author ID'},
+            {key: 'action', label: 'Action'}
         ]
     }
 };

dev/examples/zapier/triggers/order.js

@@ -17,7 +17,7 @@ const subscribeHook = (z, bundle) => {
     const options = {
         url: url,
         method: 'POST',
-        body: data,
+        body: JSON.stringify(data)
     };
 
     // You may return a promise or a normal data structure from any perform method.
@@ -90,7 +90,7 @@ module.exports = {
     noun: 'Order',
     display: {
         label: 'New Order',
-        description: 'Triggers when a new order with action is done in Dolibarr.'
+        description: 'Trigger when a new order with action is done in Dolibarr.'
     },
 
     // `operation` is where the business logic goes.
@@ -101,7 +101,6 @@ module.exports = {
         inputFields: [
             {
                 key: 'action',
-                required: true,
                 type: 'string',
                 helpText: 'Which action of order this should trigger on.',
                 choices: {
@@ -137,11 +136,11 @@ module.exports = {
         // outputFields: () => { return []; }
         // Alternatively, a static field definition should be provided, to specify labels for the fields
         outputFields: [
-            {key: 'id', type: "integer", label: 'ID'},
-            {key: 'createdAt', type: "integer", label: 'Created At'},
+            {key: 'id', label: 'ID'},
+            {key: 'createdAt', label: 'Created At'},
             {key: 'name', label: 'Name'},
             {key: 'directions', label: 'Directions'},
-            {key: 'authorId', type: "integer", label: 'Author ID'},
+            {key: 'authorId', label: 'Author ID'},
             {key: 'module', label: 'Module'},
             {key: 'action', label: 'Action'}
         ]

dev/examples/zapier/triggers/thirdparty.js

@@ -17,7 +17,7 @@ const subscribeHook = (z, bundle) => {
     const options = {
         url: url,
         method: 'POST',
-        body: data,
+        body: JSON.stringify(data)
     };
 
     // You may return a promise or a normal data structure from any perform method.
@@ -112,7 +112,7 @@ module.exports = {
     noun: 'Thirdparty',
     display: {
         label: 'New Thirdparty',
-        description: 'Triggers when a new thirdpaty action is done in Dolibarr.'
+        description: 'Trigger when a new thirdpaty action is done in Dolibarr.'
     },
 
     // `operation` is where the business logic goes.
@@ -123,7 +123,6 @@ module.exports = {
         inputFields: [
             {
                 key: 'action',
-                required: true,
                 type: 'string',
                 helpText: 'Which action of thirdparty this should trigger on.',
                 choices: {
@@ -160,12 +159,12 @@ module.exports = {
         // outputFields: () => { return []; }
         // Alternatively, a static field definition should be provided, to specify labels for the fields
         outputFields: [
-            {key: 'id', type: "integer", label: 'ID'},
+            {key: 'id', label: 'ID'},
             {key: 'createdAt', label: 'Created At'},
             {key: 'name', label: 'Name'},
             {key: 'name_alias', label: 'Name alias'},
-            {key: 'firstname', label: 'Firstname'},
-            {key: 'authorId', type: "integer", label: 'Author ID'},
+            {key: 'firstname', label: 'Firstame'},
+            {key: 'authorId', label: 'Author ID'},
             {key: 'action', label: 'Action'},
             {key: 'client', label: 'Customer/Prospect 0/1/2/3'},
             {key: 'fournisseur', label: 'Supplier 0/1'},

dev/examples/zapier/triggers/ticket.js

@@ -1,237 +0,0 @@
-const subscribeHook = (z, bundle) => {
-    // `z.console.log()` is similar to `console.log()`.
-    z.console.log('suscribing hook!');
-
-    // bundle.targetUrl has the Hook URL this app should call when an action is created.
-    const data = {
-        url: bundle.targetUrl,
-        event: bundle.event,
-        module: 'ticket',
-        action: bundle.inputData.action
-    };
-
-    const url = bundle.authData.url  + '/api/index.php/zapierapi/hook';
-
-    // You can build requests and our client will helpfully inject all the variables
-    // you need to complete. You can also register middleware to control this.
-    const options = {
-        url: url,
-        method: 'POST',
-        body: data,
-    };
-
-    // You may return a promise or a normal data structure from any perform method.
-    return z.request(options).then((response) => JSON.parse(response.content));
-};
-
-const unsubscribeHook = (z, bundle) => {
-    // bundle.subscribeData contains the parsed response JSON from the subscribe
-    // request made initially.
-    z.console.log('unsuscribing hook!');
-
-    // You can build requests and our client will helpfully inject all the variables
-    // you need to complete. You can also register middleware to control this.
-    const options = {
-        url: bundle.authData.url + '/api/index.php/zapierapi/hook/' + bundle.subscribeData.id,
-        method: 'DELETE',
-    };
-
-    // You may return a promise or a normal data structure from any perform method.
-    return z.request(options).then((response) => JSON.parse(response.content));
-};
-
-const getTicket = (z, bundle) => {
-    // bundle.cleanedRequest will include the parsed JSON object (if it's not a
-    // test poll) and also a .querystring property with the URL's query string.
-    const ticket = {
-        id: bundle.cleanedRequest.id,
-        track_id: bundle.cleanedRequest.track_id,
-        subject: bundle.cleanedRequest.subject,
-        message: bundle.cleanedRequest.message,
-        lastname: bundle.cleanedRequest.lastname,
-        firstname: bundle.cleanedRequest.firstname,
-        address: bundle.cleanedRequest.address,
-        zip: bundle.cleanedRequest.zip,
-        town: bundle.cleanedRequest.town,
-        email_from: bundle.cleanedRequest.email_from,
-        login: bundle.cleanedRequest.login,
-        authorId: bundle.cleanedRequest.authorId,
-        createdAt: bundle.cleanedRequest.createdAt,
-        action: bundle.cleanedRequest.action
-    };
-
-    return [ticket];
-};
-
-const getFallbackRealTicket = (z, bundle) => {
-    // For the test poll, you should get some real data, to aid the setup process.
-    const module = bundle.inputData.module;
-    const options = {
-        url: bundle.authData.url + '/api/index.php/tickets/0',
-    };
-
-    return z.request(options).then((response) => [JSON.parse(response.content)]);
-};
-
-// const getModulesChoices = (z/*, bundle*/) => {
-//     // For the test poll, you should get some real data, to aid the setup process.
-//     const options = {
-//         url: bundle.authData.url + '/api/index.php/zapierapi/getmoduleschoices',
-//     };
-
-//     return z.request(options).then((response) => JSON.parse(response.content));
-// };
-// const getModulesChoices = () => {
-
-//     return {
-//         orders: "Order",
-//         invoices: "Invoice",
-//         thirdparties: "Thirdparty",
-//         users: "User",
-//         tickets: "Ticket",
-//         contacts: "Contacts"
-//     };
-// };
-
-// const getActionsChoices = (z, bundle) => {
-//     // For the test poll, you should get some real data, to aid the setup process.
-//     const module = bundle.inputData.module;
-//     const options = {
-//         url:  url: bundle.authData.url + '/api/index.php/zapierapi/getactionschoices/thirparty`,
-//     };
-
-//     return z.request(options).then((response) => JSON.parse(response.content));
-// };
-
-// We recommend writing your triggers separate like this and rolling them
-// into the App definition at the end.
-module.exports = {
-    key: 'ticket',
-
-    // You'll want to provide some helpful display labels and descriptions
-    // for tickets. Zapier will put them into the UX.
-    noun: 'Ticket',
-    display: {
-        label: 'New Ticket',
-        description: 'Triggers when a new ticket action is done in Dolibarr.'
-    },
-
-    // `operation` is where the business logic goes.
-    operation: {
-
-        // `inputFields` can define the fields a ticket could provide,
-        // we'll pass them in as `bundle.inputData` later.
-        inputFields: [
-            {
-                key: 'action',
-                type: 'string',
-                required: true,
-                helpText: 'Which action of ticket this should trigger on.',
-                choices: {
-                    create: "Create",
-                    modify: "Modify",
-                    validate: "Validate",
-                }
-            }
-        ],
-
-        type: 'hook',
-
-        performSubscribe: subscribeHook,
-        performUnsubscribe: unsubscribeHook,
-
-        perform: getTicket,
-        performList: getFallbackRealTicket,
-
-        // In cases where Zapier needs to show an example record to the user, but we are unable to get a live example
-        // from the API, Zapier will fallback to this hard-coded sample. It should reflect the data structure of
-        // returned records, and have obviously dummy values that we can show to any user.
-        sample: {
-            id: 1,
-            track_id: 'Xaz123er',
-            subject: 'Subject',
-            message: 'Message',
-            createdAt: 1472069465,
-            lastname: 'DOE',
-            firstname: 'John',
-            email: 'john@doe.com',
-            address: 'Park Avenue',
-            zip: '12345',
-            town: 'NEW-YORK',
-            email_from: 'doe.john@example;com',
-            authorId: 1,
-            action: 'create'
-        },
-
-        // If the resource can have fields that are custom on a per-user basis, define a function to fetch the custom
-        // field definitions. The result will be used to augment the sample.
-        // outputFields: () => { return []; }
-        // Alternatively, a static field definition should be provided, to specify labels for the fields
-        outputFields: [
-            {
-                key: 'id',
-                type: "integer",
-                label: 'ID'
-            },
-            {
-                key: 'track_id',
-                type: "string",
-                label: 'TrackID'
-            },
-            {
-                key: 'subject',
-                type: "string",
-                label: 'Subject'
-            },
-            {
-                key: 'message',
-                type: "string",
-                label: 'Message'
-            },
-            {
-                key: 'createdAt',
-                type: "integer",
-                label: 'Created At'
-            },
-            {
-                key: 'lastname',
-                label: 'Lastname'
-            },
-            {
-                key: 'firstname',
-                label: 'Firstname'
-            },
-            {
-                key: 'email',
-                label: 'Email'
-            },
-            {
-                key: 'address',
-                label: 'Address'
-            },
-            {
-                key: 'zip',
-                label: 'Zip'
-            },
-            {
-                key: 'town',
-                label: 'Town'
-            },
-            {
-                key: 'email_from',
-                type: 'string',
-                label: 'Email from'
-            },
-            {
-                key: 'authorId',
-                type: "integer",
-                label: 'Author ID'
-            },
-            {
-                key: 'action',
-                type: 'string',
-                label: 'Action'
-            }
-        ]
-    }
-};

dev/examples/zapier/triggers/user.js

@@ -1,177 +0,0 @@
-const subscribeHook = (z, bundle) => {
-    // `z.console.log()` is similar to `console.log()`.
-    z.console.log('suscribing hook!');
-
-    // bundle.targetUrl has the Hook URL this app should call when an action is created.
-    const data = {
-        url: bundle.targetUrl,
-        event: bundle.event,
-        module: 'user',
-        action: bundle.inputData.action
-    };
-
-    const url = bundle.authData.url  + '/api/index.php/zapierapi/hook';
-
-    // You can build requests and our client will helpfully inject all the variables
-    // you need to complete. You can also register middleware to control this.
-    const options = {
-        url: url,
-        method: 'POST',
-        body: data,
-    };
-
-    // You may return a promise or a normal data structure from any perform method.
-    return z.request(options).then((response) => JSON.parse(response.content));
-};
-
-const unsubscribeHook = (z, bundle) => {
-    // bundle.subscribeData contains the parsed response JSON from the subscribe
-    // request made initially.
-    z.console.log('unsuscribing hook!');
-
-    // You can build requests and our client will helpfully inject all the variables
-    // you need to complete. You can also register middleware to control this.
-    const options = {
-        url: bundle.authData.url + '/api/index.php/zapierapi/hook/' + bundle.subscribeData.id,
-        method: 'DELETE',
-    };
-
-    // You may return a promise or a normal data structure from any perform method.
-    return z.request(options).then((response) => JSON.parse(response.content));
-};
-
-const getUser = (z, bundle) => {
-    // bundle.cleanedRequest will include the parsed JSON object (if it's not a
-    // test poll) and also a .querystring property with the URL's query string.
-    const user = {
-        id: bundle.cleanedRequest.id,
-        lastname: bundle.cleanedRequest.lastname,
-        firstname: bundle.cleanedRequest.firstname,
-        address: bundle.cleanedRequest.address,
-        zip: bundle.cleanedRequest.zip,
-        town: bundle.cleanedRequest.town,
-        email: bundle.cleanedRequest.email,
-        login: bundle.cleanedRequest.login,
-        authorId: bundle.cleanedRequest.authorId,
-        createdAt: bundle.cleanedRequest.createdAt,
-        action: bundle.cleanedRequest.action
-    };
-
-    return [user];
-};
-
-const getFallbackRealUser = (z, bundle) => {
-    // For the test poll, you should get some real data, to aid the setup process.
-    const module = bundle.inputData.module;
-    const options = {
-        url: bundle.authData.url + '/api/index.php/users/0',
-    };
-
-    return z.request(options).then((response) => [JSON.parse(response.content)]);
-};
-
-// const getModulesChoices = (z/*, bundle*/) => {
-//     // For the test poll, you should get some real data, to aid the setup process.
-//     const options = {
-//         url: bundle.authData.url + '/api/index.php/zapierapi/getmoduleschoices',
-//     };
-
-//     return z.request(options).then((response) => JSON.parse(response.content));
-// };
-// const getModulesChoices = () => {
-
-//     return {
-//         orders: "Order",
-//         invoices: "Invoice",
-//         thirdparties: "Thirdparty",
-//         users: "User",
-//         contacts: "Contacts"
-//     };
-// };
-
-// const getActionsChoices = (z, bundle) => {
-//     // For the test poll, you should get some real data, to aid the setup process.
-//     const module = bundle.inputData.module;
-//     const options = {
-//         url:  url: bundle.authData.url + '/api/index.php/zapierapi/getactionschoices/thirparty`,
-//     };
-
-//     return z.request(options).then((response) => JSON.parse(response.content));
-// };
-
-// We recommend writing your triggers separate like this and rolling them
-// into the App definition at the end.
-module.exports = {
-    key: 'user',
-
-    // You'll want to provide some helpful display labels and descriptions
-    // for users. Zapier will put them into the UX.
-    noun: 'User',
-    display: {
-        label: 'New User',
-        description: 'Triggers when a new user action is done in Dolibarr.'
-    },
-
-    // `operation` is where the business logic goes.
-    operation: {
-
-        // `inputFields` can define the fields a user could provide,
-        // we'll pass them in as `bundle.inputData` later.
-        inputFields: [
-            {
-                key: 'action',
-                required: true,
-                type: 'string',
-                helpText: 'Which action of user this should trigger on.',
-                choices: {
-                    create: "Create",
-                    modify: "Modify",
-                    validate: "Validate",
-                }
-            }
-        ],
-
-        type: 'hook',
-
-        performSubscribe: subscribeHook,
-        performUnsubscribe: unsubscribeHook,
-
-        perform: getUser,
-        performList: getFallbackRealUser,
-
-        // In cases where Zapier needs to show an example record to the user, but we are unable to get a live example
-        // from the API, Zapier will fallback to this hard-coded sample. It should reflect the data structure of
-        // returned records, and have obviously dummy values that we can show to any user.
-        sample: {
-            id: 1,
-            createdAt: 1472069465,
-            lastname: 'DOE',
-            firstname: 'John',
-            email: 'john@doe.com',
-            address: 'Park Avenue',
-            zip: '12345',
-            town: 'NEW-YORK',
-            login: 'doe.john',
-            authorId: 1,
-            action: 'create'
-        },
-
-        // If the resource can have fields that are custom on a per-user basis, define a function to fetch the custom
-        // field definitions. The result will be used to augment the sample.
-        // outputFields: () => { return []; }
-        // Alternatively, a static field definition should be provided, to specify labels for the fields
-        outputFields: [
-            {key: 'id', type: "integer", label: 'ID'},
-            {key: 'createdAt', type: "integer", label: 'Created At'},
-            {key: 'lastname', label: 'Lastname'},
-            {key: 'firstname', label: 'Firstname'},
-            {key: 'email', label: 'Email'},
-            {key: 'address', label: 'Address'},
-            {key: 'zip', label: 'Zip'},
-            {key: 'town', label: 'Town'},
-            {key: 'login', label: 'Login'},
-            {key: 'authorId', type: "integer", label: 'Author ID'},
-            {key: 'action', label: 'Action'}
-        ]
-    }
-};

dev/initdata/dbf/importdb-products.php

@@ -227,7 +227,8 @@ while ($fields = $db->fetch_array($resql)) {
 		$error++;    // $errorrecord will be reset
 	}
 	$j++;
-} else die("error : $sql");
+} else
+    die("error : $sql");
 
 
 

dev/initdata/dbf/importdb-thirdparties.php

@@ -179,7 +179,8 @@ while ($fields = $db->fetch_array($resql)) {
 	$object->town = trim($fields['FVILLE']);
 	if ($fields['FPAYS'])
 		$object->country_id = dol_getIdFromCode($db, trim(ucwords(strtolower($fields['FPAYS']))), 'c_country', 'label', 'rowid');
-	else $object->country_id = 1;
+	else
+		$object->country_id = 1;
 	$object->phone = trim($fields['FTEL']) ? trim($fields['FTEL']) : trim($fields['FCONTACT']);
 	$object->phone = substr($object->phone, 0, 20);
 	$object->fax = trim($fields['FFAX']) ? trim($fields['FFAX']) : trim($fields['FCONTACT']);
@@ -298,7 +299,8 @@ while ($fields = $db->fetch_array($resql)) {
 		$contact->town = trim($fields['LVILLE']);
 		if ($fields['FPAYS'])
 			$contact->country_id = dol_getIdFromCode($db, trim(ucwords(strtolower($fields['LPAYS']))), 'c_country', 'label', 'rowid');
-		else $contact->country_id = 1;
+		else
+			$contact->country_id = 1;
 		$contact->email = $fields['LMAIL'];
 		$contact->phone = trim($fields['LTEL']) ? trim($fields['LTEL']) : trim($fields['LCONTACT']);
 		$contact->fax = trim($fields['LFAX']) ? trim($fields['LFAX']) : trim($fields['LCONTACT']);
@@ -338,7 +340,8 @@ while ($fields = $db->fetch_array($resql)) {
 		$error++;    // $errorrecord will be reset
 	}
 	$j++;
-} else die("error : $sql");
+} else
+    die("error : $sql");
 
 $db->commit();
 

dev/initdata/dbf/includes/dbase.class.php

@@ -207,7 +207,8 @@ class DBase
                     $value = true;
                 elseif ($value == 'f' || $value == 'n')
                     $value = false;
-                else $value = null;
+                else
+                    $value = null;
             }
             $record[$i] = $value;
         }
@@ -294,7 +295,8 @@ class DBase
         $i = unpack("S$n", $data);
         if ($n == 1)
             return (int) $i[1];
-        else return array_merge($i);
+        else
+            return array_merge($i);
     }
 
     private static function putInt16($fd, $value)
@@ -308,7 +310,8 @@ class DBase
         $i = unpack("L$n", $data);
         if ($n == 1)
             return (int) $i[1];
-        else return array_merge($i);
+        else
+            return array_merge($i);
     }
 
     private static function putInt32($fd, $value)

dev/initdata/generate-invoice.php

@@ -179,10 +179,14 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 		if ($result)
 		{
 			print " OK with ref ".$object->ref."\n";;
-		} else {
+		}
+		else
+		{
 			dol_print_error($db, $object->error);
 		}
-	} else {
+	}
+	else
+	{
 		dol_print_error($db, $object->error);
 	}
 }

dev/initdata/generate-order.php

@@ -124,7 +124,8 @@ if ($resql) {
         $row = $db->fetch_row($resql);
         $societesid[$i] = $row[0];
     }
-} else { print "err"; }
+}
+else { print "err"; }
 
 $commandesid = array();
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande";
@@ -137,7 +138,8 @@ if ($resql) {
         $row = $db->fetch_row($resql);
         $commandesid[$i] = $row[0];
     }
-} else { print "err"; }
+}
+else { print "err"; }
 
 $prodids = array();
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product WHERE tosell=1";
@@ -204,12 +206,16 @@ for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
         {
             $db->commit();
             print " OK with ref ".$object->ref."\n";
-        } else {
+        }
+        else
+        {
             print " KO\n";
             $db->rollback();
             dol_print_error($db, $object->error);
         }
-    } else {
+    }
+    else
+    {
         print " KO\n";
         $db->rollback();
         dol_print_error($db, $object->error);

dev/initdata/generate-proposal.php

@@ -210,12 +210,16 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 		{
 		    $db->commit();
 		    print " OK with ref ".$object->ref."\n";
-		} else {
+		}
+		else
+		{
 		    print " KO\n";
 		    $db->rollback();
 		    dol_print_error($db, $object->error);
 		}
-	} else {
+	}
+	else
+	{
 		dol_print_error($db, $object->error);
 	}
 }

dev/initdata/generate-thirdparty.php

@@ -136,7 +136,9 @@ for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++)
         }
 
         print "Company ".$s." created nom=".$soc->name."\n";
-    } else {
+    }
+    else
+    {
     	print "Error: ".$soc->error."\n";
     }
 }

dev/initdata/import-products.php

@@ -163,7 +163,9 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     {
         print " - Error in create result code = ".$ret." - ".$produit->errorsToString();
         $errorrecord++;
-    } else {
+    }
+	else
+	{
 	    print " - Creation OK with ref ".$produit->ref." - id = ".$ret;
 	}
 
@@ -178,7 +180,9 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         {
             print " - Error in updatePrice result code = ".$ret1." ".$ret2." - ".$produit->errorsToString();
             $errorrecord++;
-        } else {
+        }
+    	else
+    	{
     	    print " - updatePrice OK";
     	}
 	}
@@ -196,7 +200,9 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         {
             print " - Error in setMultiLangs result code = ".$ret." - ".$produit->errorsToString();
             $errorrecord++;
-        } else {
+        }
+    	else
+    	{
     	    print " - setMultiLangs OK";
     	}
 	}
@@ -221,7 +227,9 @@ if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
 {
     print "Rollback any changes.\n";
     $db->rollback();
-} else {
+}
+else
+{
     print "Commit all changes.\n";
     $db->commit();
 }

dev/initdata/import-thirdparties.php

@@ -181,7 +181,9 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         {
             print " - Error in create result code = ".$ret." - ".$object->errorsToString();
             $errorrecord++;
-        } else {
+        }
+    	else
+    	{
     	    print " - Creation OK with name ".$object->name." - id = ".$ret;
     	}
     }
@@ -210,7 +212,9 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     	{
     	    print " - Error in create link with sale representative result code = ".$result." - ".$object->errorsToString();
     	    $errorrecord++;
-    	} else {
+    	}
+    	else
+    	{
     	    print " - create link sale representative OK";
     	}
 	}
@@ -239,7 +243,9 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         {
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
             $errorrecord++;
-        } else {
+        }
+    	else
+    	{
     	    print " - create contact OK";
     	}
 	}
@@ -271,7 +277,9 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         {
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
             $errorrecord++;
-        } else {
+        }
+    	else
+    	{
     	    print " - create contact OK";
     	}
 	}
@@ -297,7 +305,9 @@ if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
 {
     print "Rollback any changes.\n";
     $db->rollback();
-} else {
+}
+else
+{
     print "Commit all changes.\n";
     $db->commit();
 }

dev/initdata/import-users.php

@@ -142,7 +142,9 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     {
         print " - Error in create result code = ".$ret." - ".$object->errorsToString();
         $errorrecord++;
-    } else {
+    }
+	else
+	{
 	    print " - Creation OK with login ".$object->login." - id = ".$ret;
 	}
 
@@ -166,7 +168,9 @@ if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
 {
     print "Rollback any changes.\n";
     $db->rollback();
-} else {
+}
+else
+{
     print "Commit all changes.\n";
     $db->commit();
 }

dev/initdata/purge-data.php

@@ -26,7 +26,7 @@
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=__DIR__.'/';
+$path=dirname(__FILE__).'/';
 
 // Test si mode batch
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -120,8 +120,8 @@ $sqls=array(
         "DELETE FROM ".MAIN_DB_PREFIX."expedition where date_creation < '__DATE__'",
     ),
     'delivery'=>array(
-        "DELETE FROM ".MAIN_DB_PREFIX."deliverydet WHERE fk_delivery IN (select rowid FROM ".MAIN_DB_PREFIX."delivery where date_creation < '__DATE__')",
-        "DELETE FROM ".MAIN_DB_PREFIX."delivery where date_creation < '__DATE__'",
+        "DELETE FROM ".MAIN_DB_PREFIX."livraisondet WHERE fk_livraison IN (select rowid FROM ".MAIN_DB_PREFIX."livraison where date_creation < '__DATE__')",
+        "DELETE FROM ".MAIN_DB_PREFIX."livraison where date_creation < '__DATE__'",
     ),
     'contract'=>array(
         "DELETE FROM ".MAIN_DB_PREFIX."contratdet_extrafields WHERE fk_object IN (select rowid FROM ".MAIN_DB_PREFIX."contratdet WHERE fk_contrat IN (select rowid FROM ".MAIN_DB_PREFIX."contrat where datec < '__DATE__'))",
@@ -198,7 +198,7 @@ if (empty($option))
 if ($option != 'all')
 {
     $listofoptions=explode(',', $option);
-    foreach ($listofoptions as $cursoroption)
+    foreach($listofoptions as $cursoroption)
     {
         if (! in_array($cursoroption, array_keys($sqls))) {
             print "Usage:  $script_file (test|confirm) (all|option) (all|YYYY-MM-DD) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
@@ -264,7 +264,7 @@ function processfamily($family, $date)
     global $db, $sqls;
 
     $error=0;
-    foreach ($sqls[$family] as $sql)
+    foreach($sqls[$family] as $sql)
     {
         if (preg_match('/^@/', $sql))
         {
@@ -302,10 +302,10 @@ function processfamily($family, $date)
 $db->begin();
 
 $listofoptions=explode(',', $option);
-foreach ($listofoptions as $cursoroption)
+foreach($listofoptions as $cursoroption)
 {
     $oldfamily='';
-    foreach ($sqls as $family => $familysql)
+    foreach($sqls as $family => $familysql)
     {
         if ($cursoroption && $cursoroption != 'all' && $cursoroption != $family) continue;
 
@@ -325,7 +325,9 @@ if ($error || $mode != 'confirm')
 {
     print "\nRollback any changes.\n";
     $db->rollback();
-} else {
+}
+else
+{
     print "Commit all changes.\n";
     $db->commit();
 }

dev/initdemo/README

@@ -12,11 +12,6 @@ The script initdemo.sh will erase current database with data into mysqldump_doli
 Do a chmod 700 initdemo.sh
 then run ./initdemo.sh to launch Graphic User Interface.
 
-After loading the demo files, admin login may be:
-- admin / admin
-or
-- admin / adminadmin
-
 
 *** Save demo
 

dev/initdemo/initdemo.sh

@@ -69,7 +69,6 @@ then
 	  255)
 	exit;;
 	esac
-	rm $fichtemp
 	
 	# ----------------------------- database name
 	DIALOG=${DIALOG=dialog}
@@ -87,7 +86,6 @@ then
 	  255)
 	exit;;
 	esac
-	rm $fichtemp
 	
 	# ---------------------------- database port
 	DIALOG=${DIALOG=dialog}
@@ -106,7 +104,6 @@ then
 	  255)
 	exit;;
 	esac
-	rm $fichtemp
 	
 	# ---------------------------- compte admin mysql
 	DIALOG=${DIALOG=dialog}
@@ -125,7 +122,6 @@ then
 	  255)
 	exit;;
 	esac
-	rm $fichtemp
 	
 	# ---------------------------- mot de passe admin mysql
 	DIALOG=${DIALOG=dialog}
@@ -144,7 +140,6 @@ then
 	  255)
 	exit;;
 	esac
-	rm $fichtemp
 	
 	
 	export documentdir=`cat $mydir/../../htdocs/conf/conf.php | grep '^\$dolibarr_main_data_root' | sed -e 's/$dolibarr_main_data_root=//' | sed -e 's/;//' | sed -e "s/'//g" | sed -e 's/"//g' `
@@ -189,8 +184,8 @@ export res=$?
 export documentdir=`cat $mydir/../../htdocs/conf/conf.php | grep '^\$dolibarr_main_data_root' | sed -e 's/$dolibarr_main_data_root=//' | sed -e 's/;//' | sed -e "s/'//g" | sed -e 's/"//g' `
 if [ "x$documentdir" != "x" ]
 then
-	$DIALOG --title "Reset document directory" --clear \
-	        --inputbox "DELETE and recreate document directory $documentdir/:" 16 55 n 2> $fichtemp
+	$DIALOG --title "Reset document directory tpp" --clear \
+	        --inputbox "Delete and recreate document directory $documentdir/:" 16 55 n 2> $fichtemp
 	
 	valret=$?
 	

dev/initdemo/initdemopassword.sh

@@ -1,166 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------
-# Script to reinit admin password.
-# Note: "dialog" tool need to be available if no parameter provided.
-#
-# Laurent Destailleur - eldy@users.sourceforge.net
-#------------------------------------------------------
-# Usage: initdemopassword.sh confirm 
-# usage: initdemopassword.sh confirm base port login pass
-#------------------------------------------------------
-
-
-export mydir=`echo "$0" | sed -e 's/initdemopassword.sh//'`;
-if [ "x$mydir" = 'x' -o "x$mydir" = 'x./' ]
-then
-    export mydir="."
-fi
-export id=`id -u`;
-
-
-# ----------------------------- check if root
-if [ "x$id" != "x0" -a "x$id" != "x1001" ]
-then
-	echo "Script must be ran as root"
-	exit
-fi
-
-
-# ----------------------------- command line params
-confirm=$1;
-base=$2;
-port=$3;
-demologin=$4;
-demopass=$5;
-
-# ----------------------------- check params
-if [ "x$confirm" != "xconfirm" ]
-then
-	echo "----- $0 -----"
-	echo "Usage: initdemopassword.sh confirm [base port login pass]"
-	exit
-fi
-
-
-# ----------------------------- if no params on command line
-if [ "x$demopass" = "x" ]
-then
-	export dumpfile=`ls -v $mydir/mysqldump_dolibarr_*.sql | tail -n 1`
-	export dumpfile=`basename $dumpfile`
-
-	# ----------------------------- database name
-	DIALOG=${DIALOG=dialog}
-	DIALOG="$DIALOG --ascii-lines"
-	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
-	trap "rm -f $fichtemp" 0 1 2 5 15
-	$DIALOG --title "Reset login password" --clear \
-	        --inputbox "Mysql database name :" 16 55 dolibarrdemo 2> $fichtemp
-	valret=$?
-	case $valret in
-	  0)
-	base=`cat $fichtemp`;;
-	  1)
-	exit;;
-	  255)
-	exit;;
-	esac
-	rm $fichtemp
-	
-	# ---------------------------- database port
-	DIALOG=${DIALOG=dialog}
-	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
-	trap "rm -f $fichtemp" 0 1 2 5 15
-	$DIALOG --title "Reset login password" --clear \
-	        --inputbox "Mysql port (ex: 3306):" 16 55 3306 2> $fichtemp
-	
-	valret=$?
-	
-	case $valret in
-	  0)
-	port=`cat $fichtemp`;;
-	  1)
-	exit;;
-	  255)
-	exit;;
-	esac
-	rm $fichtemp
-	
-	
-	# ----------------------------- demo login
-	DIALOG=${DIALOG=dialog}
-	DIALOG="$DIALOG --ascii-lines"
-	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
-	trap "rm -f $fichtemp" 0 1 2 5 15
-	$DIALOG --title "Reset login password" --clear \
-	        --inputbox "Login to reset :" 16 55 dolibarrdemologin 2> $fichtemp
-	valret=$?
-	case $valret in
-	  0)
-	demologin=`cat $fichtemp`;;
-	  1)
-	exit;;
-	  255)
-	exit;;
-	esac
-	rm fichtemp
-	
-	# ----------------------------- demo pass
-	DIALOG=${DIALOG=dialog}
-	DIALOG="$DIALOG --ascii-lines"
-	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
-	trap "rm -f $fichtemp" 0 1 2 5 15
-	$DIALOG --title "Reset login password" --clear \
-	        --inputbox "Pass to set :" 16 55 dolibarrdemopass 2> $fichtemp
-	valret=$?
-	case $valret in
-	  0)
-	demopass=`cat $fichtemp`;;
-	  1)
-	exit;;
-	  255)
-	exit;;
-	esac
-	rm fichtemp
-	
-	
-	export documentdir=`cat $mydir/../../htdocs/conf/conf.php | grep '^\$dolibarr_main_data_root' | sed -e 's/$dolibarr_main_data_root=//' | sed -e 's/;//' | sed -e "s/'//g" | sed -e 's/"//g' `
-
-
-	# ---------------------------- confirmation
-	DIALOG=${DIALOG=dialog}
-	$DIALOG --title "Reset login password" --clear \
-	        --yesno "Do you confirm ? \n Mysql database : '$base' \n Mysql port : '$port' \n Demo login: '$demologin' \n Demo password : '$demopass'" 15 55
-	
-	case $? in
-	        0)      echo "Ok, start process...";;
-	        1)      exit;;
-	        255)    exit;;
-	esac
-
-fi
-
-
-# ---------------------------- run sql file
-if [ "x$passwd" != "x" ]
-then
-	export passwd="-p$passwd"
-fi
-#echo "mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile"
-#mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
-echo "echo \"UPDATE llx_user SET pass_crypted = MD5('$demopass') WHERE login = '$demologin';\" | mysql -P$port $base"
-echo "UPDATE llx_user SET pass_crypted = MD5('$demopass') WHERE login = '$demologin';" | mysql -P$port $base
-export res=$?
-
-if [ $res -ne 0 ]; then
-	echo "Error to execute sql with mysql -P$port -u$admin -p***** $base"
-	exit
-fi 
-
-
-if [ "x$res" = "x0" ]
-then
-	echo "Success, file successfully loaded."
-else
-	echo "Error, load failed."
-fi
-echo

dev/initdemo/sftpget_and_loaddump.php

@@ -95,7 +95,8 @@ if ($connection)
 		dol_syslog("Could not authenticate with username ".$login." . and password ".preg_replace('/./', '*', $password), LOG_ERR);
 		exit(-5);
 	}
-	else {
+	else
+	{
 		//$stream = ssh2_exec($connection, '/usr/bin/php -i');
 		/*
 		print "Generate dump ".$filesys1.'.bz2'."\n";
@@ -124,13 +125,14 @@ if ($connection)
 		$return_var=0;
 		print strftime("%Y%m%d-%H%M%S").' '.$fullcommand."\n";
 		exec($fullcommand, $output, $return_var);
-		foreach ($output as $line) print $line."\n";
+		foreach($output as $line) print $line."\n";
 
 		//ssh2_sftp_unlink($sftp, $fileinstalllock);
 		//print $output;
 	}
 }
-else {
+else
+{
 	print 'Failed to connect to ssh2 to '.$server;
 	exit(-6);
 }

dev/initdemo/updatedemo.php

@@ -73,8 +73,7 @@ $tables=array(
     'commande_fournisseur'=>array(0=>'date_commande', 1=>'date_valid', 3=>'date_creation', 4=>'date_approve', 5=>'date_approve2', 6=>'date_livraison'),
     'supplier_proposal'=>array(0=>'datec', 1=>'date_valid', 2=>'date_cloture'),
 	'expensereport'=>array(0=>'date_debut', 1=>'date_fin', 2=>'date_create', 3=>'date_valid', 4=>'date_approve', 5=>'date_refuse', 6=>'date_cancel'),
-	'holiday'=>array(0=>'date_debut', 1=>'date_fin', 2=>'date_create', 3=>'date_valid', 5=>'date_refuse', 6=>'date_cancel'),
-	'ticket'=>array(0=>'datec', 1=>'date_read', 2=>'date_close')
+	'holiday'=>array(0=>'date_debut', 1=>'date_fin', 2=>'date_create', 3=>'date_valid', 5=>'date_refuse', 6=>'date_cancel')
 );
 
 $year=2010;
@@ -88,7 +87,7 @@ while ($year <= $currentyear)
 
     if ($delta1)
     {
-        foreach ($tables as $tablekey => $tableval)
+        foreach($tables as $tablekey => $tableval)
         {
             print "Correct ".$tablekey." for year ".$year." and move them to current year ".$currentyear." ";
             $sql="select rowid from ".MAIN_DB_PREFIX.$tablekey." where ".$tableval[0]." between '".$year."-01-01' and '".$year."-12-31' and ".$tableval[0]." < DATE_ADD(NOW(), INTERVAL -1 YEAR)";
@@ -106,7 +105,7 @@ while ($year <= $currentyear)
                         print ".";
                         $sql2="UPDATE ".MAIN_DB_PREFIX.$tablekey." set ";
                         $j=0;
-                        foreach ($tableval as $field)
+                        foreach($tableval as $field)
                         {
                             if ($j) $sql2.=", ";
                             $sql2.= $field." = ".$db->ifsql("DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR) > NOW()", "DATE_ADD(".$field.", INTERVAL ".$delta2." YEAR)", "DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR)");

dev/namespacemig/aaa.class.php

@@ -15,9 +15,6 @@ function faaa()
 	return 'faaa';
 }
 
-/**
- * Class Aaa
- */
 class Aaa
 {
 	const AAA='aaa';

dev/namespacemig/bbb.class.php

@@ -12,9 +12,6 @@ function fbbb()
 	return 'fbbb';
 }
 
-/**
- * Class Bbb
- */
 class Bbb
 {
 	const BBB='bbb';

dev/resources/intracommreport/schema_deb.xsd

@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-<xsd:element name="INSTAT">
-<xsd:complexType>
-<xsd:sequence>
-<xsd:element ref="Envelope"/>
-</xsd:sequence>
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="Envelope">
-<xsd:complexType>
-<xsd:sequence>
-<xsd:element ref="envelopeId"/>
-<xsd:element ref="DateTime"/>
-<xsd:element ref="Party"/>
-<xsd:element ref="softwareUsed" minOccurs="0"/>
-<xsd:element ref="Declaration" maxOccurs="unbounded"/>
-</xsd:sequence>
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="envelopeId" type="xsd:string"/>
-<xsd:element name="DateTime">
-<xsd:complexType>
-<xsd:sequence>
-<xsd:element ref="date"/>
-<xsd:element ref="time" minOccurs="0"/>
-</xsd:sequence>
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="Party">
-<xsd:complexType>
-<xsd:sequence>
-<xsd:element ref="partyId"/>
-<xsd:element ref="partyName"/>
-</xsd:sequence>
-<xsd:attribute name="partyType" use="required">
-<xsd:simpleType>
-<xsd:restriction base="xsd:NMTOKEN">
-<xsd:enumeration value="PSI"/>
-<xsd:enumeration value="TDP"/>
-</xsd:restriction>
-</xsd:simpleType>
-</xsd:attribute>
-<xsd:attribute name="partyRole" use="required">
-<xsd:simpleType>
-<xsd:restriction base="xsd:NMTOKEN">
-<xsd:enumeration value="sender"/>
-<xsd:enumeration value="PSI"/>
-</xsd:restriction>
-</xsd:simpleType>
-</xsd:attribute>
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="partyId" type="xsd:string"/>
-<xsd:element name="partyName" type="xsd:string"/>
-<xsd:element name="softwareUsed" type="xsd:string"/>
-<xsd:element name="Declaration">
-<xsd:complexType>
-<xsd:sequence>
-<xsd:element ref="declarationId"/>
-<xsd:element ref="referencePeriod"/>
-<xsd:element ref="PSIId"/>
-<xsd:element ref="Function"/>
-<xsd:element ref="declarationTypeCode"/>
-<xsd:element ref="flowCode"/>
-<xsd:element ref="currencyCode"/>
-<xsd:element ref="Item" maxOccurs="unbounded"/>
-</xsd:sequence>
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="declarationId" type="xsd:string"/>
-<xsd:element name="referencePeriod" type="xsd:string"/>
-<xsd:element name="PSIId" type="xsd:string"/>
-<xsd:element name="Function">
-<xsd:complexType>
-<xsd:sequence>
-<xsd:element ref="functionCode"/>
-</xsd:sequence>
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="functionCode" type="xsd:string"/>
-<xsd:element name="declarationTypeCode" type="xsd:string"/>
-<xsd:element name="flowCode" type="xsd:string"/>
-<xsd:element name="currencyCode" type="xsd:string"/>
-<xsd:element name="Item">
-<xsd:complexType>
-<xsd:sequence>
-<xsd:element ref="itemNumber"/>
-<xsd:element ref="CN8" minOccurs="0"/>
-<xsd:element ref="MSConsDestCode" minOccurs="0"/>
-<xsd:element ref="countryOfOriginCode" minOccurs="0"/>
-<xsd:element ref="netMass" minOccurs="0"/>
-<xsd:element ref="quantityInSU" minOccurs="0"/>
-<xsd:element ref="invoicedAmount"/>
-<xsd:element ref="partnerId" minOccurs="0"/>
-<xsd:element ref="invoicedNumber" minOccurs="0"/>
-<xsd:element ref="statisticalProcedureCode" />
-<xsd:element ref="NatureOfTransaction" minOccurs="0"/>
-<xsd:element ref="modeOfTransportCode" minOccurs="0"/>
-<xsd:element ref="regionCode" minOccurs="0"/>
-</xsd:sequence>
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="itemNumber" type="xsd:integer"/>
-<xsd:element name="CN8">
-<xsd:complexType>
-<xsd:sequence>
-<xsd:element ref="CN8Code" minOccurs="0"/>
-<xsd:element ref="SUCode" minOccurs="0"/>
-<xsd:element ref="additionalGoodsCode" minOccurs="0"/>
-</xsd:sequence>
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="CN8Code" type="xsd:string"/>
-<xsd:element name="SUCode" type="xsd:string"/>
-<xsd:element name="additionalGoodsCode" type="xsd:string"/>
-<xsd:element name="MSConsDestCode" type="xsd:string"/>
-<xsd:element name="countryOfOriginCode" type="xsd:string"/>
-<xsd:element name="netMass" type="xsd:integer"/>
-<xsd:element name="quantityInSU" type="xsd:integer"/>
-<xsd:element name="invoicedAmount" type="xsd:integer"/>
-<xsd:element name="partnerId" type="xsd:string"/>
-<xsd:element name="invoicedNumber" type="xsd:string"/>
-<xsd:element name="statisticalProcedureCode" type="xsd:integer"/>
-<xsd:element name="NatureOfTransaction">
-<xsd:complexType>
-<xsd:sequence>
-<xsd:element ref="natureOfTransactionACode"/>
-<xsd:element ref="natureOfTransactionBCode" minOccurs="0"/>
-</xsd:sequence>
-</xsd:complexType>
-</xsd:element>
-<xsd:element name="natureOfTransactionACode" type="xsd:string"/>
-<xsd:element name="natureOfTransactionBCode" type="xsd:string"/>
-<xsd:element name="modeOfTransportCode" type="xsd:string"/>
-<xsd:element name="regionCode" type="xsd:string"/>
-<xsd:element name="date" type="xsd:date"/>
-<xsd:element name="time" type="xsd:time"/>
-</xsd:schema>

dev/resources/iso-normes/company_ids.txt

@@ -1,2 +0,0 @@
-Spain  https://incwell.eu/en/company-formation-spain/
-France https://www.economie.gouv.fr/entreprises/numeros-identification-entreprise

dev/setup/codesniffer/ruleset.xml

@@ -6,7 +6,7 @@
 
 	<exclude-pattern type="relative">build/html</exclude-pattern>
 	<exclude-pattern type="relative">build/aps</exclude-pattern>
-	<exclude-pattern type="relative">dev/tools/test/namespacemig</exclude-pattern>
+	<exclude-pattern type="relative">dev/namespacemig</exclude-pattern>
 	<exclude-pattern type="relative">dev/initdata/dbf/includes</exclude-pattern>
 	<exclude-pattern type="relative">documents</exclude-pattern>
 	<exclude-pattern type="relative">htdocs/core/class/lessc.class.php</exclude-pattern>
@@ -17,7 +17,6 @@
 	<exclude-pattern type="relative">*/nltechno*</exclude-pattern>
 	<exclude-pattern type="relative">*/htdocs/includes</exclude-pattern>
 	<exclude-pattern type="relative">*/htdocs/includes</exclude-pattern>
-	<exclude-pattern type="relative">.git</exclude-pattern>
 
 	<!-- List of all tests -->
 
@@ -28,7 +27,7 @@
 
 
 	<!-- Rules from Generic Standard -->
-
+	
 	<!-- We want to allow empty statement: It allows to put some code comments into the else for examples -->
 	<rule ref="Generic.CodeAnalysis.EmptyStatement">
         <exclude name="Generic.CodeAnalysis.EmptyStatement.DetectedIf"/>
@@ -102,7 +101,7 @@
 			<property name="error" value="false"/>
 		</properties>
 		</rule>
-	-->
+	-->    
 	<!--  We want to allow 'if () { ...small code... }' on same line for better code compacity and readability -->
 	<rule ref="Generic.Formatting.DisallowMultipleStatements">
 		<severity>0</severity>
@@ -118,7 +117,7 @@
 		</properties>
 		</rule>
 	-->
-
+	
 	<rule ref="Generic.Formatting.SpaceAfterCast" />
 
     <rule ref="Generic.Functions.CallTimePassByReference" />
@@ -189,8 +188,8 @@
 	</rule>
 
     <!-- Check for duplicate class names -->
-    <!-- Disabled: We need this for dependency injection.
-    <rule ref="Generic.Classes.DuplicateClassName" />
+    <!-- Disabled: We need this for dependency injection. 
+    <rule ref="Generic.Classes.DuplicateClassName" /> 
     -->
 
 
@@ -214,10 +213,6 @@
     <rule ref="Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen" />
     <rule ref="Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose" />
 
-    <!-- <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseParenthesis" /> -->
-    <!-- <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace" /> -->
-    <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword" />
-
     <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration.SpaceAfterOpen" />
     <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration.SpaceBeforeClose" />
 
@@ -314,16 +309,16 @@
     <rule ref="PEAR.Files.IncludingFile.UseInclude">
         <severity>0</severity>
     </rule>
-
+    
     <!-- We disable this. We must be allowed to use strict require instead of non strict include anywhere -->
     <rule ref="PEAR.Files.IncludingFile.UseIncludeOnce">
         <severity>0</severity>
     </rule>
-
+    
     <rule ref="PEAR.Files.IncludingFile.UseRequire">
      	<severity>0</severity>
     </rule>
-
+    
     <!-- We disable this: We want to allow include_once -->
     <rule ref="PEAR.Files.IncludingFile.UseRequireOnce">
         <severity>0</severity>
@@ -337,7 +332,7 @@
     <rule ref="PEAR.Functions.FunctionCallSignature.CloseBracketLine">
         <severity>0</severity>
     </rule>
-
+    
     <!-- We disable this: We want to allow small function on 1 line -->
     <rule ref="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket">
         <severity>0</severity>
@@ -390,7 +385,7 @@
 	<!--<rule ref="PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps">
         <severity>0</severity>
 	</rule>-->
-
+	
 	<!-- We disable this: We don't want to have private methods prefixed with an underscore -->
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.PrivateNoUnderscore">
         <severity>0</severity>
@@ -431,5 +426,5 @@
 	<rule ref="PSR2.Classes.PropertyDeclaration.VarUsed" />
     <!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
     <rule ref="PSR2.Files.ClosingTag"/>
-
+	
 </ruleset>

dev/tools/dolibarr-postgres2mysql.php

@@ -76,12 +76,14 @@ function getfieldname($l)
 	if (preg_match("/`(.*)`/", $l, $regs)) {
 		if ($regs[1])
 			return $regs[1];
-		else return null;
+		else
+			return null;
 	} // if its not in quotes, then it should (we hope!) be the first "word" on the line, up to the first space.
 	elseif (preg_match("/([^\ ]*)/", trim($l), $regs)) {
 		if ($regs[1])
 			return $regs[1];
-		else return null;
+		else
+			return null;
 	}
 }
 
@@ -100,7 +102,8 @@ function formatsize($s)
 		return sprintf("%.1f", round($s / 1024, 1)) . "K";
 	elseif ($s < pow(2, 30))
 		return sprintf("%.1f", round($s / 1024 / 1024, 1)) . "M";
-	else return sprintf("%.1f", round($s / 1024 / 1024 / 1024, 1)) . "G";
+	else
+		return sprintf("%.1f", round($s / 1024 / 1024 / 1024, 1)) . "G";
 }
 
 /**
@@ -143,7 +146,8 @@ function pg2mysql_large($infilename, $outfilename)
 		if ($c % 2 != 0) {
 			if ($inquotes)
 				$inquotes = false;
-			else $inquotes = true;
+			else
+				$inquotes = true;
 		}
 
 		if ($linenum % 10000 == 0) {
@@ -325,7 +329,8 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 				$num = $regs[1];
 				if ($num <= 255)
 					$line = preg_replace("/ character varying\([0-9]*\)/", " varchar($num)", $line);
-				else $line = preg_replace("/ character varying\([0-9]*\)/", " text", $line);
+				else
+					$line = preg_replace("/ character varying\([0-9]*\)/", " text", $line);
 			}
 			// character varying with no size, we will default to varchar(255)
 			if (preg_match("/ character varying/", $line)) {
@@ -347,7 +352,8 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 				$num = $regs[1];
 				if ($num <= 255)
 					$line = preg_replace("/ character\([0-9]*\)/", " varchar($num)", $line);
-				else $line = preg_replace("/ character\([0-9]*\)/", " text", $line);
+				else
+					$line = preg_replace("/ character\([0-9]*\)/", " text", $line);
 			}
 			// timestamps
 			$line = str_replace(" timestamp with time zone", " datetime", $line);
@@ -357,8 +363,8 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 			$line = str_replace(" time with time zone", " time", $line);
 			$line = str_replace(" time without time zone", " time", $line);
 
-			$line = str_replace(" timestamp DEFAULT now()", " timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP", $line);
-			$line = str_replace(" timestamp without time zone DEFAULT now()", " timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP", $line);
+			$line = str_replace(" timestamp DEFAULT now()", " timestamp DEFAULT CURRENT_TIMESTAMP", $line);
+			$line = str_replace(" timestamp without time zone DEFAULT now()", " timestamp DEFAULT CURRENT_TIMESTAMP", $line);
 
 			if (strstr($line, "auto_increment") || preg_match('/ rowid int/', $line) || preg_match('/ id int/', $line)) {
 				$field = getfieldname($line);
@@ -459,7 +465,8 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 					if ($c % 2 != 0) {
 						if ($inquotes)
 							$inquotes = false;
-						else $inquotes = true;
+						else
+							$inquotes = true;
 						// echo "inquotes=$inquotes\n";
 					}
 				} while (substr($lines[$linenumber], - 3, - 1) != ");" || $inquotes);

dev/tools/test/testperf.php

@@ -1,21 +0,0 @@
-<?php
-
-$a = microtime(true);
-
-$i = 0;
-while ($i < 1000000)
-{
-	$key = '1234567890111213141516171819'.$i;
-	if ($i == 1000) $key = 'MAIN_MODULE_AAAAAiiiiiiiiiiiiiiiiiiiiiiiiiiiii';
-
-	//if (preg_match('/^MAIN_MODULE_/', $key)) {
-	//if (substr($key, 0, 12) == 'MAIN_MODULE_') {
-	if (strpos($key, 'MAIN_MODULE_') === 0) {
-		print "Found\n";
-	}
-	$i++;
-}
-
-$b = microtime(true);
-
-print $b - $a."\n";