Merge branch 'develop' into patch-243

2019-10-08 15:04:03 +02:00 · 2019-10-08 15:04:03 +02:00 · 1ca5a33e53
commit 1ca5a33e53
parent 21c51eb3d2 71c18b7d65
5124 changed files with 117684 additions and 53258 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -0,0 +1,5 @@
+# These are supported funding model platforms
+
+open_collective: dolibarr
+custom: https://wiki.dolibarr.org/index.php/Subscribe
+# github: [eldy]
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -1,8 +1,16 @@
+---
+name: Bug report
+about: Create a report to help us fix something that is broken
+title: ''
+labels: Bug
+assignees: ''
+
+---
+
 # Instructions
 *This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
 *Please:*
- *only keep the "Bug" or "Feature Request" section*
- *replace the bracket enclosed texts with meaningful informations*
+- *replace the bracket enclosed texts with meaningful information*
 - *remove any unused sub-section*


@ -25,17 +33,3 @@

 ## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)
 [*Files*]
-
-
-
-# Feature Request
-[*Short description*]
-
-## Use case
-[*Verbose description*]
-
-## Suggested implementation
-[*Verbose description*]
-
-## Suggested steps
-[*List of tasks to achieve goal*]
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -0,0 +1,27 @@
+---
+name: Feature request
+about: Suggest a new idea for this project
+title: ''
+labels: Feature request
+assignees: ''
+
+---
+
+# Instructions
+*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
+*Please:*
+- *replace the bracket enclosed texts with meaningful information*
+- *remove any unused sub-section*
+
+
+# Feature Request
+[*Short description*]
+
+## Use case
+[*Verbose description*]
+
+## Suggested implementation
+[*Verbose description*]
+
+## Suggested steps
+[*List of tasks to achieve goal*]
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@ -38,6 +38,7 @@ tools:
                - doc/*
                - test/*
                - htdocs/includes/*
+                - htdocs/core/class/lessc.class.php
            paths:
                - htdocs/
                - scripts/
--- a/.stickler.yml
+++ b/.stickler.yml
@ -0,0 +1,10 @@
+---
+linters:
+  phpcs:
+      standard: 'dev/setup/codesniffer/ruleset.xml'
+      extensions: 'php'
+      tab_width: 4
+      fixer: true
+
+fixers:
+    enable: true
--- a/.travis.yml
+++ b/.travis.yml
@ -18,9 +18,7 @@ addons:
  apt:
    sources:
    # To use the last version of pgloader, we add repo of postgresql
-    - postgresql
-    - sourceline: 'deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main'
-    - key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc'
+    - pgdg-trusty
    packages:
    # We need a webserver to test the webservices
    # Let's install Apache with.
@ -112,32 +110,33 @@ install:
  rm $TRAVIS_BUILD_DIR/composer.json
  rm $TRAVIS_BUILD_DIR/composer.lock
  composer self-update
+  # To have composer making parallel downloads
+  composer global require hirak/prestissimo
  composer -n init
  composer -n config vendor-dir htdocs/includes
  echo

 - |
-  echo "Installing Parallel Lint"
-  composer -n require jakub-onderka/php-parallel-lint ^0
-  composer -n require jakub-onderka/php-console-highlighter ^0
-  echo
-
- |
-  echo "Installing PHP Unit"
+  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
+    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' ]; then
-    composer -n require phpunit/phpunit ^5
+  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' ]; then
+    composer -n require phpunit/phpunit ^5 \
+                        jakub-onderka/php-parallel-lint ^0 \
+                        jakub-onderka/php-console-highlighter ^0 \
+                        squizlabs/php_codesniffer ^3
  fi
-  if [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
-    composer -n require phpunit/phpunit ^5
-  fi
-  echo
-
- |
-  echo "Installing PHP CodeSniffer"
-  composer -n require squizlabs/php_codesniffer ^3
+  if [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
+      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
  echo

 - |
@ -201,6 +200,7 @@ before_script:
      mysql -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
    fi
    if [ "$DB" = 'postgresql' ]; then
+      #pgsql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
      #pgloader mysql://root:pass@127.0.0.1/dolibarr_9 postgresql://dolibarrowner:dolibarrownerpass@127.0.0.1/dolibarr_dev
      echo pgloader mysql://root@127.0.0.1/travis postgresql:///travis
      pgloader mysql://root@127.0.0.1/travis postgresql:///travis
@ -210,7 +210,6 @@ before_script:
      #echo 'select * from information_schema.table_constraints;' | psql travis
      #echo 'ALTER TABLE "llx_accounting_account" DROP CONSTRAINT "idx_16390_primary"' | psql travis
    fi
-    # TODO: SQLite
    echo

  - |
@ -223,6 +222,7 @@ before_script:
    echo '$'dolibarr_main_db_host=\'127.0.0.1\'';' >> $CONF_FILE
    echo '$'dolibarr_main_db_name=\'travis\'';' >> $CONF_FILE
    echo '$'dolibarr_main_db_user=\'travis\'';' >> $CONF_FILE
+    echo '$'dolibarr_main_instance_unique_id=\'travis1234567890\'';' >> $CONF_FILE
    if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
      echo '$'dolibarr_main_db_type=\'mysqli\'';' >> $CONF_FILE
      echo '$'dolibarr_main_db_port=\'3306\'';' >> $CONF_FILE
@ -231,7 +231,6 @@ before_script:
      echo '$'dolibarr_main_db_type=\'pgsql\'';' >> $CONF_FILE
      echo '$'dolibarr_main_db_port=\'5432\'';' >> $CONF_FILE
    fi
-    # TODO: SQLite
    echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> $CONF_FILE
    cat $CONF_FILE
    echo
@ -246,8 +245,6 @@ before_script:


  - echo "Setting up Apache + FPM"
-  - sudo apt-get update
-  - sudo apt-get install apache2 libapache2-mod-fastcgi
  # enable php-fpm
  - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
  - |
@ -293,19 +290,79 @@ script:
  echo

 - |
-  echo "Checking coding style"
+  echo "Checking coding style (excluding Pull Requests builds)"
  # Ensure we catch errors
  set -e
  # Exclusions are defined in the ruleset.xml file
  #phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
-  phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .
+  if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .; fi
  set +e
  echo

-# TODO: Check Javascript (jshint?)
+- |
+  export INSTALL_FORCED_FILE=htdocs/install/install.forced.php
+  echo "Setting up Dolibarr $INSTALL_FORCED_FILE to test installation"
+  # Ensure we catch errors
+  set +e
+  echo '<?php ' > $INSTALL_FORCED_FILE
+  echo '$'force_install_noedit=2';' >> $INSTALL_FORCED_FILE
+  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
+    echo '$'force_install_type=\'mysqli\'';' >> $INSTALL_FORCED_FILE
+  fi
+  if [ "$DB" = 'postgresql' ]; then
+    echo '$'force_install_type=\'pgsql\'';' >> $INSTALL_FORCED_FILE
+  fi
+  echo '$'force_install_dbserver=\'127.0.0.1\'';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_database=\'travis\'';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_databaselogin=\'travis\'';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_databasepass=\'\'';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_port=\'5432\'';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_prefix=\'llx_\'';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_createdatabase=false';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_createuser=false';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_mainforcehttps=false';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_main_data_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $INSTALL_FORCED_FILE
+  #cat $INSTALL_FORCED_FILE

-# TODO: Check CSS (csslint?)
+#- |
+#  echo "Installing Dolibarr"
+#  cd htdocs/install
+#  php step1.php $TRAVIS_BUILD_DIR/htdocs > $TRAVIS_BUILD_DIR/install.log
+#  php step2.php set >> $TRAVIS_BUILD_DIR/install.log
+#  if [ "$?" -ne "0" ]; then
+#    echo "SORRY, AN ERROR OCCURED DURING INSTALLATION PROCESS"
+#    cat $TRAVIS_BUILD_DIR/install.log
+#    exit 1
+#  fi
+#  cd ../..
+#  rm $INSTALL_FORCED_FILE
+#  #cat $TRAVIS_BUILD_DIR/install.log
+# set +e
+#  echo

+- |
+  echo "Setting up database to test migrations"
+  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; then
+    echo "MySQL"
+    mysql -e 'DROP DATABASE IF EXISTS travis;'
+    mysql -e 'CREATE DATABASE IF NOT EXISTS travis;'
+    mysql -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
+    mysql -e 'FLUSH PRIVILEGES;'    
+    mysql -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+  fi
+  if [ "$DB" = 'postgresql' ]; then
+    #pgsql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+    #pgloader mysql://root:pass@127.0.0.1/base postgresql://dolibarrowner@127.0.0.1/dolibarr
+    echo pgloader mysql://root@127.0.0.1/travis postgresql:///travis
+    pgloader mysql://root@127.0.0.1/travis postgresql:///travis
+    echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql travis
+    echo 'ALTER SEQUENCE llx_accounting_account_rowid_seq RESTART WITH 1000001;' | psql travis
+    #echo 'select * from INFORMATION_SCHEMA.COLUMNS where table_name = 'llx_accountingaccount' | psql travis
+    #echo 'select * from information_schema.table_constraints;' | psql travis
+    #echo 'ALTER TABLE "llx_accounting_account" DROP CONSTRAINT "idx_16390_primary"' | psql travis
+  fi
+  echo
+  
 - |
  echo "Upgrading Dolibarr"
  # Ensure we catch errors. Set this to +e if you want to go to the end to see log files.
--- a/.tx/config
+++ b/.tx/config
@ -410,3 +410,9 @@ source_file = htdocs/langs/en_US/workflow.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES

+[dolibarr.zapier]
+file_filter = htdocs/langs/<lang>/zapier.lang
+source_file = htdocs/langs/en_US/zapier.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
--- a/6
+++ b/6
@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
    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 <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 Also add information on how to contact you by electronic and paper mail.

@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.

  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/14
+++ b/14
@ -5,7 +5,7 @@ License
 Dolibarr is released under the terms of the GNU General Public License as 
 published by the Free Software Foundation; either version 3 of the License,
 or (at your option) any later version (GPL-3+).
-More information: http://www.gnu.org/licenses/gpl-3.0.txt
+More information: https://www.gnu.org/licenses/gpl-3.0.txt

 Dolibarr uses some external libraries released under different licenses. This is compatibility summary:

@ -13,11 +13,11 @@ Component              Version       License                     GPL Compatible
 -------------------------------------------------------------------------------------
 PHP libraries:
 AdoDb-Date             0.36          Modified BSD License        Yes             Date convertion (not into rpm package)
-CKEditor               4.11.4        LGPL-2.1+                   Yes             Editor WYSIWYG
+CKEditor               4.12.1        LGPL-2.1+                   Yes             Editor WYSIWYG
 EvalMath               1.0           BSD                         Yes             Safe math expressions evaluation
 Escpos-php             ?             MIT License                 Yes             Thermal receipt printer library, for use with ESC/POS compatible printers
 GeoIP                  1.4           LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
-Mobiledetect           2.8.83        MIT License                 Yes             Detect mobile devices browsers
+Mobiledetect           2.8.33        MIT License                 Yes             Detect mobile devices browsers
 NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
 PEAR Mail_MIME         1.8.9         BSD                         Yes             NuSoap dependency
 ParseDown              1.6           MIT License                 Yes             Markdown parser
@ -33,11 +33,12 @@ Restler                3.0.0RC6      LGPL-3+                     Yes
 Sabre                  3.2.2         BSD                         Yes             DAV support
 Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
 Stripe                 6.41          MIT licence                 Yes             Library for Stripe module
-TCPDF                  6.2.25        LGPL-3+                     Yes             PDF generation
+TCPDF                  6.3.2         LGPL-3+                     Yes             PDF generation
 TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement

 JS libraries:
-jQuery                 3.3.1         MIT License                 Yes             JS library
+Ace                    1.4.6         BSD                         Yes             JS library to get code syntaxique coloration in a textarea.    
+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.5         GPL and Apache License      Yes             JS library plugin for sexier multiselect
 jQuery blockUI         2.70.0        GPL and MIT License         Yes             JS library plugin blockUI (to use ajax popups)
@ -54,7 +55,6 @@ jQuery Timepicker      1.1.0         GPL and MIT License         Yes
 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
-Ace                    1.2.8         BSD                         Yes             JS library to get code syntaxique coloration in a textarea.    

 Image libraries:
 Octicons               8.1           MIT                         Yes
@ -64,7 +64,7 @@ Fontawesome            5.7.2         Font Awesome Free licence   Yes


 For licenses compatibility informations:
-http://www.gnu.org/licenses/licenses.en.html
+https://www.gnu.org/licenses/licenses.en.html


 Copyright / Authors
--- a/107
+++ b/107
@ -16,8 +16,115 @@ Following changes may create regressions for some external modules, but were nec
 * Properties ->libelle_incoterms were renamed into ->label_incoterms
 * Removed the method liste_array() of project class. It was not used by core code.
 * The function show_theme() hase been renamed into showSkins()
+* Rename 'module_part' parameter into 'modulepart' into document APIs, for consistency.
+* The deprecated method get_OutstandingBill has been removed. You can use getOutstandingBills() instead.
+* The hook "moreFamily" must return payment into var "totalpayment" and no more "paiement" (english replace french).
+* Removed deprecated method actioncomm->add(), use create() instead
+* If you have developed your own emailing target selector and used parent::add_to_target(...), you must now use parent::addToTargets(...)
+* Removed function dol_micro_time. Use native PHP microtime instead.
+* The trigger BON_PRELEVEMENT_CREATE has been renamed into DIRECT_DEBIT_ORDER_CREATE.


+***** ChangeLog for 10.0.2 compared to 10.0.1 *****
+
+FIX: #10460 compatibility with MariaDB 10.4
+FIX: #11401 Adherent unknown language key
+FIX: #11422 Can't edit his own events with standard rights
+FIX: #11427 require product class (fixes POST /supplierinvoices REST API endpoint)
+FIX: #11570
+FIX: #11591 FIX: #11592
+FIX: #11671 CVE-2019-15062
+FIX: #11672
+FIX: #11685
+FIX: #11702
+FIX: #11711
+FIX: #11720
+FIX: #11746 Unable to modify amount of insurance of a loan
+FIX: #11752
+FIX: #11789 FIX: #11790
+FIX: #11804 list of tickets from a customer card display ALL tickets
+FIX: #11834
+FIX: Add char $ and ; in sanitizing of filenames.
+FIX: Add comment before protected functions
+FIX: Add log and type of content in dolWebsiteOutput and
+FIX: Add repair.php option 'restore' to restore user picture after v10
+FIX: amount opened on thirdparty card dont care of credit note not converted
+FIX: Api of documents work with value 'thirdparty'
+FIX: author in message / ticket API
+FIX: avoid sql error if fk_project is empty during update
+FIX: avoid Warning: A non-numeric value encountered
+FIX: bad consistency in list of invoice for direct debit order.
+FIX: Bad error management in zip compress and web site export
+FIX: bad substitution for extrafields type checkbox
+FIX: better help message with multicompany
+FIX: calculation of $products_dispatched
+FIX: Can't add a new chart of account
+FIX: Can't delete a draft leave even if it should
+FIX: Can't save setup of mailman module
+FIX: column jabberid missing
+FIX: Confirmation of deletion
+FIX: Consistency in direct debit order lists.
+FIX: Content send before header warning
+FIX: credit note can be split
+FIX: credit note used on list
+FIX: Css was saved on wrong website.
+FIX: delivery extrafields
+FIX: Disabling a website does not put it offline
+FIX: display only stripe sources for customer
+FIX: display payment intent in stripe's charge list
+FIX: document list for products in API
+FIX: dol_thirdparty_id for stripe PI
+FIX: Do not show tooltip if tooltip is empty
+FIX: duplicate css tag, decrease padding-bottom for boxes in eldy theme
+FIX: duration when creating service
+FIX: EDB-ID:47370
+FIX: Enable web site
+FIX: error management when adding a property with type real
+FIX: Fatal situation if payment removed on expense report. Action
+FIX: filepath of generated documents doesn't handle products with special characters
+FIX: for MAIN_MAXTABS_IN_CARD = $i card
+FIX: gzip and bzip2 must use option -f
+FIX: It was possible to create cashfence without entering data.
+FIX: javascript error when using dol_use_jmobile=1
+FIX: logout redirect to takepos.php
+FIX: Look and feel v10
+FIX: Make protected all pfd models functions
+FIX: management of extrafields in modulebuilder
+FIX: Missing div for buttons in tax, loan, various payment modules
+FIX: missing include (dol_convert_file not found)
+FIX: Missing some replacements in website module
+FIX: missing test on permission on button to delete ledger record
+FIX: Missing the filter fields in export of expense report and leaves
+FIX: Missing ticket icon on md theme
+FIX: Missing transaction
+FIX: Mode smartphone was not triggered when there is too loo menu
+FIX: Must escape shell
+FIX: Must exclude logs and some dirs for compressed backup
+FIX: name and position of hook FIX: #11710
+FIX: Not showing MAIN_INVERT_SENDER_RECIPIENT when edit field
+FIX: Nowrap missing on amount in boxes
+FIX: Option to use ZipArchive instead of PclZip bugged with large files.
+FIX: order or proposals billed if both workflow conf activated
+FIX: permission check on API intervention
+FIX: phpcs
+FIX: placement function
+FIX: qty in invoice list on product's stats
+FIX: remove disabled product type from product list
+FIX: Return code of pdf_einstein.modules.php and proformat
+FIX: round for application fee in stripe
+FIX: Sens of the balance (Debit - Credit in accountancy not contrary)
+FIX: Several pb in export of documents
+FIX: SQL syntax error and CSRF check on vat reports
+FIX: takepos layout clear or focus search
+FIX: too many record in sql request. Whena criteria is a filter, we must
+FIX: Translation of month
+FIX: USEDOLIBARREDITOR not always set
+FIX: VAT number for Monaco (it uses FR)
+FIX: vulenrability in uploading file found by 美创科技安全实验室
+FIX: wrong display (and hidden input) for already dispatched quantity
+FIX: wrong parameters (same error in branch 9, 10, develop)
+FIX: Wrong variable. Must be PROJECT_HIDE_UNSELECTABLES
+
 ***** ChangeLog for 10.0.1 compared to 10.0.0 *****
 FIX: #10930
 FIX: #10984 
--- a/README.md
+++ b/README.md
@ -1,7 +1,6 @@
 # DOLIBARR ERP & CRM

 ![Downloads per day](https://img.shields.io/sourceforge/dw/dolibarr.svg)
-[![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)

 |7|8|9|10|develop|
 |----------|----------|----------|----------|----------|
@ -75,6 +74,7 @@ If you don't have time to install it yourself, you can try some commercial 'read

 ## UPGRADING

+- At first make a backup of your Dolibarr files & than see https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr 
 - Overwrite all old files from 'dolibarr' directory with files provided into the new version's package.
 - 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*").
@ -91,18 +91,19 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)

 ### Main application/modules (all optional)

- Customers, Prospects and/or Suppliers directory
+- Customers, Prospects (Leads) and/or Suppliers directory
 - Products and/or Services catalog
 - Commercial proposals management
 - Customer and Supplier Orders management
 - Invoices and payment management
 - Standing orders management (European SEPA)
 - Bank accounts management
+- Accounting management
 - Shared calendar/agenda (with ical and vcal export for third party tools integration)
 - Opportunities and/or project management
 - Projects management
 - Contracts management
- Stock management
+- Warehouse/Stock management
 - Shipping management
 - Interventions management
 - Employee's leave requests management
@ -112,7 +113,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Foundations members management
 - Mass emailing
 - Surveys
- Point of Sale
+- Point of Sale (POS) 
 - …

 ### Other application/modules
@ -132,15 +133,15 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)

 ### Other general features

- Localization in most major languages.
- Multi-Users and groups with finely grained rights.
- Multi-currency.
- Multi-company by adding of an external module.
- Very user friendly and easy to use.
+- Localization in most major languages
+- Multi-Users and groups with finely grained rights
+- Multi-currency
+- Multi-company by adding of an external module
+- Very user friendly and easy to use
+- customizable 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)
- Works with PHP 5.3+ 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.
- APIs.
+
+- 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
@ -154,6 +155,12 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - PDF or ODT generation for invoice, proposals, orders...
 - …

+### System Environment / Requirements
+
+- 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).
--- a/build/README
+++ b/build/README
@ -3,8 +3,7 @@ README (English)
 Building packages
 ##################################################

-All sub-directories of "build" directory contains files required to build
-automatically Dolibarr packages.
+All sub-directories of "build" directory contains files (setup or binary tools) required to build automatically Dolibarr packages.
 There are several tools:


--- a/build/debian/copyright
+++ b/build/debian/copyright
@ -338,7 +338,7 @@ License: GPL-2+
 details.
 .
 You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ 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
--- a/build/docker/README.md
+++ b/build/docker/README.md
@ -23,3 +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
+
+Setup the database connection during the installation process, please use mariad
+b (name of the database container) as database host.
--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/build/doxygen/dolibarr-doxygen.doxyfile
@ -18,7 +18,7 @@
 # that follow. The default is UTF-8 which is also the encoding used for all
 # text before the first occurrence of this tag. Doxygen uses libiconv (or the
 # iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
+# https://www.gnu.org/software/libiconv for the list of possible encodings.

 DOXYFILE_ENCODING = UTF-8

@ -587,7 +587,7 @@ INPUT = ../../htdocs ../../scripts
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
 # also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# into libc) for the transcoding. See https://www.gnu.org/software/libiconv for
 # the list of possible encodings.

 INPUT_ENCODING = UTF-8
@ -737,7 +737,7 @@ REFERENCES_LINK_SOURCE = YES
 # If the USE_HTAGS tag is set to YES then the references to source code
 # will point to the HTML generated by the htags(1) tool instead of doxygen
 # built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
+# tagging system (see https://www.gnu.org/software/global/global.html). You
 # will need version 4.8.6 or higher.

 USE_HTAGS = NO
--- a/build/doxygen/doxygen_footer.html
+++ b/build/doxygen/doxygen_footer.html
@ -10,7 +10,6 @@ File added into doxygen generated documentation

 <br>

-</div>


 <!-- Global site tag (gtag.js) - Google Analytics -->
@ -24,13 +23,30 @@ File added into doxygen generated documentation
 </script>


+<!-- Facebook Pixel Code -->
+<script>
+!function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?
+n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n;
+n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0;
+t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window,
+document,'script','//connect.facebook.net/en_US/fbevents.js');
+
+fbq('init', '1998533953704960');
+fbq('track', "PageView");</script>
+<noscript><img height="1" width="1" style="display:none"
+src="https://www.facebook.com/tr?id=1998533953704960&ev=PageView&noscript=1"
+/></noscript>
+<!-- End Facebook Pixel Code -->
+
+
 <!-- Twitter ad collector -->
-<script src="//platform.twitter.com/oct.js" type="text/javascript"></script>
+<script src="//static.ads-twitter.com/oct.js" type="text/javascript"></script>
 <script type="text/javascript">twttr.conversion.trackPid('ntm4n', { tw_sale_amount: 0, tw_order_quantity: 0 });</script>
 <noscript>
 <img height="1" width="1" style="display:none;" alt="" src="https://analytics.twitter.com/i/adsct?txn_id=ntm4n&p_id=Twitter&tw_sale_amount=0&tw_order_quantity=0" />
 <img height="1" width="1" style="display:none;" alt="" src="//t.co/i/adsct?txn_id=ntm4n&p_id=Twitter&tw_sale_amount=0&tw_order_quantity=0" />
 </noscript>

+
 </body>
 </html>
--- a/build/doxygen/doxygen_header.html
+++ b/build/doxygen/doxygen_header.html
@ -30,7 +30,6 @@ src="https://www.facebook.com/tr?id=1998533953704960&ev=PageView&noscript=1"
 </head>

 <body>
-<div id="top">

 <div class="topmaincol">
 <div class="divpath">
--- a/build/exe/doliwamp/README
+++ b/build/exe/doliwamp/README
@ -1,8 +0,0 @@
-README (English)
-##################################################
-DOLIWAMP Package tools
-##################################################
-
-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).
--- a/build/exe/doliwamp/README.md
+++ b/build/exe/doliwamp/README.md
@ -3,5 +3,8 @@
 DoliWamp is a special all in one package installer for Windows (Dolibarr+Mysql+Apache+PHP). 
 It's a dedicated Dolibarr version for Windows newbies with no technical knowledge. This package will install or upgrade Dolibarr but also all prerequisites like the web server, and the database in one auto-install process.

+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).
+
 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).

--- a/build/exe/doliwamp/config.inc.php.install
+++ b/build/exe/doliwamp/config.inc.php.install
@ -402,7 +402,7 @@ $cfg['RecodingEngine'] = 'auto';

 // Specify some parameters for iconv used in charset conversion. See iconv
 // documentation for details:
-// http://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.html
+// https://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.html
 $cfg['IconvExtraParams'] = '//TRANSLIT';

 // Available charsets for MySQL conversion. currently contains all which could
--- a/build/flatpack/org.flatpak.Dolibarr.json
+++ b/build/flatpack/org.flatpak.Dolibarr.json
@ -1 +1 @@
-Help wanted...
+"Help wanted..."
--- a/composer.json
+++ b/composer.json
@ -26,15 +26,13 @@
 	"require" : {
 		"php" : ">=5.3.0",
 		"ext-curl" : "*",
-		"ccampbell/chromephp" : "4.1.0",
-		"ckeditor/ckeditor" : "4.6.2",
+		"ckeditor/ckeditor" : "4.12.1",
 		"mike42/escpos-php" : "1.2.1",
-		"mobiledetect/mobiledetectlib" : "2.8.17",
+		"mobiledetect/mobiledetectlib" : "2.8.33",
 		"phpoffice/phpexcel" : "1.8.1",
 		"restler/framework" : "3.0.0-RC6",
 		"tecnickcom/tcpdf" : "^6.2",
-		"atgp/factur-x" : "^1.0",
-		"luracast/restler": "^3.0"
+		"luracast/restler" : "^3.0"
 	},
 	"require-dev" : {
 		"jakub-onderka/php-parallel-lint" : "^0",
@ -59,4 +57,4 @@
 		"ext-xml" : "Excel support",
 		"firephp/firephp-core" : "Logging to Firebug console support"
 	}
-}
+}
--- a/composer.lock
+++ b/composer.lock
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@ -67,7 +67,7 @@ define('QR_FIND_FROM_RANDOM', false);
    zapfdingbats.php (for special chars like form checkboxes)

 * Optionnaly, made freemono the default monotype font if we removed courier
-In htdocs/includes/tcpdf/tcpdf.php
+In htdocs/includes/tecnickcom/tcpdf/tcpdf.php
 -       protected $default_monospaced_font = 'courier';
 +       protected $default_monospaced_font = 'freemono';

@ -137,20 +137,7 @@ with:

 RESTLER:
 --------
-
-* Add 2 lines into file AutoLoader.php to complete function     
-	private function alias($className, $currentClass)
-    {
-		...
-to get 
-
-	private function alias($className, $currentClass)
-    {
-        if ($className == 'Luracast\Restler\string') return;
-        if ($className == 'Luracast\Restler\mixed') return;
-		...
-
-Change also content of file htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
+Change content of file htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html

 +With swagger 2:

--- a/dev/examples/zapier/.gitignore
+++ b/dev/examples/zapier/.gitignore
@ -0,0 +1,7 @@
+build
+docs
+node_modules
+*.log
+.environment
+.env
+.zapierapprc
--- a/dev/examples/zapier/.travis.yml
+++ b/dev/examples/zapier/.travis.yml
@ -0,0 +1,7 @@
+language: node_js
+node_js:
+  - 8.10.0
+before_script: 'npm install -g zapier-platform-cli'
+script: 'zapier test'
+notifications:
+  email: false
--- a/dev/examples/zapier/action.json
+++ b/dev/examples/zapier/action.json
@ -0,0 +1,56 @@
+{
+    "table_rowid": "id",
+    "id": 6764,
+    "ref": null,
+    "type_id": "5",
+    "type_code": "AC_RDV",
+    "type": null,
+    "type_color": null,
+    "code": null,
+    "label": "azerty",
+    "datec": null,
+    "datem": null,
+    "authorid": null,
+    "usermodid": null,
+    "datep": 1555365600,
+    "datef": 1555538399,
+    "durationp": 172799,
+    "fulldayevent": 1,
+    "punctual": 1,
+    "percentage": "-1",
+    "location": "",
+    "transparency": 1,
+    "priority": 0,
+    "userassigned": {
+        "1": {
+            "id": "1",
+            "transparency": 1
+        }
+    },
+    "userownerid": "1",
+    "userdoneid": null,
+    "usertodo": null,
+    "userdone": null,
+    "socid": null,
+    "contactid": null,
+    "elementtype": "",
+    "icalname": null,
+    "icalcolor": null,
+    "actions": [],
+    "email_msgid": null,
+    "email_from": null,
+    "email_sender": null,
+    "email_to": null,
+    "email_tocc": null,
+    "email_tobcc": null,
+    "email_subject": null,
+    "errors_to": null,
+    "import_key": null,
+    "linkedObjectsIds": null,
+    "fk_project": 0,
+    "modelpdf": null,
+    "note_public": null,
+    "note_private": null,
+    "note": "wxcvbn",
+    "duree": 0
+}
--- a/dev/examples/zapier/authentication.js
+++ b/dev/examples/zapier/authentication.js
@ -0,0 +1,77 @@
+/*jshint esversion: 6 */
+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
+    const promise = z.request({
+        url: url,
+    });
+
+    // 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 === 401) {
+            throw new Error('The Session Key you supplied is invalid');
+        }
+        return response;
+    });
+};
+
+const getSessionKey = (z, bundle) => {
+    const url = bundle.authData.url + '/api/index.php/login';
+
+    const promise = z.request({
+        method: 'POST',
+        url: url,
+        body: {
+            login: bundle.authData.login,
+            password: bundle.authData.password,
+        }
+    });
+
+    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 = {
+    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'
+        },
+        {
+            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
+    },
+    // assuming "login" is a key returned from the test
+    connectionLabel: '{{login}}'
+};
--- a/dev/examples/zapier/creates/thirdparty.js
+++ b/dev/examples/zapier/creates/thirdparty.js
@ -0,0 +1,90 @@
+/*jshint esversion: 6 */
+// create a particular thirdparty by name
+const createThirdparty = async (z, bundle) => {
+    const apiurl = bundle.authData.url  + '/api/index.php/thirdparties';
+
+    const response = await z.request({
+        method: 'POST',
+        url: apiurl,
+        body: JSON.stringify({
+            name: bundle.inputData.name,
+            name_alias: bundle.inputData.name_alias,
+            ref_ext: bundle.inputData.ref_ext,
+            ref_int: bundle.inputData.ref_int,
+            address: bundle.inputData.address,
+            zip: bundle.inputData.zip,
+            town: bundle.inputData.town,
+            country_code: bundle.inputData.country_code,
+            country_id: bundle.inputData.country_id,
+            country: bundle.inputData.country,
+            phone: bundle.inputData.phone,
+            email: bundle.inputData.email,
+            client: bundle.inputData.client,
+            fournisseur: bundle.inputData.fournisseur,
+            code_client: bundle.inputData.code_client,
+            code_fournisseur: bundle.inputData.code_fournisseur,
+            sens: 'fromzapier'
+        })
+    });
+    const result = z.JSON.parse(response.content);
+    // api returns an integer when ok, a json when ko
+    return result.response || {id: response};
+};
+
+module.exports = {
+    key: 'thirdparty',
+    noun: 'Thirdparty',
+
+    display: {
+        label: 'Create Thirdparty',
+        description: 'Creates a thirdparty.'
+    },
+
+    operation: {
+        inputFields: [
+            {key: 'name', required: true},
+            {key: 'name_alias', required: false},
+            {key: 'address', required: false},
+            {key: 'zip', required: false},
+            {key: 'town', required: false},
+            {key: 'email', required: false},
+            {key: 'client', type: 'integer', required: false},
+            {key: 'fournisseur', type: 'integer', required: false},
+            {key: 'code_client', required: false},
+            {key: 'code_fournisseur', required: false}
+        ],
+        perform: createThirdparty,
+
+        sample: {
+            id: 1,
+            name: 'DUPOND',
+            name_alias: 'DUPOND Ltd',
+            address: 'Rue des Canaries',
+            zip: '34090',
+            town: 'MONTPELLIER',
+            phone: '0123456789',
+            fax: '2345678901',
+            email: 'robot@domain.com',
+            client: 1,
+            fournisseur: 0,
+            code_client: 'CU1903-1234',
+            code_fournisseur: 'SU1903-2345'
+        },
+
+        outputFields: [
+            {key: 'id', label: 'ID'},
+            {key: 'name', label: 'Name'},
+            {key: 'name_alias', label: 'Name alias'},
+            {key: 'address', label: 'Address'},
+            {key: 'zip', label: 'Zip'},
+            {key: 'town', label: 'Town'},
+            {key: 'phone', label: 'Phone'},
+            {key: 'fax', label: 'Fax'},
+            {key: 'email', label: 'Email'},
+            {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'}
+        ]
+    }
+};
--- a/dev/examples/zapier/index.js
+++ b/dev/examples/zapier/index.js
@ -0,0 +1,73 @@
+/*jshint esversion: 6 */
+const triggerThirdparty = require('./triggers/thirdparty');
+const triggerOrder = require('./triggers/order');
+const triggerAction = require('./triggers/action');
+
+const searchThirdparty = require('./searches/thirdparty');
+
+const createThirdparty = require('./creates/thirdparty');
+
+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;
+};
+
+// 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;
+};
+
+// We can roll up all our behaviors in an App.
+const App = {
+    // This is just shorthand to reference the installed dependencies you have. Zapier will
+    // need to know these before we can upload
+    version: require('./package.json').version,
+    platformVersion: require('zapier-platform-core').version,
+
+    authentication: authentication,
+
+    // beforeRequest & afterResponse are optional hooks into the provided HTTP client
+    beforeRequest: [
+        includeSessionKeyHeader
+    ],
+
+    afterResponse: [
+        sessionRefreshIf401
+    ],
+
+    // If you want to define optional resources to simplify creation of triggers, searches, creates - do that here!
+    resources: {
+    },
+
+    // If you want your trigger to show up, you better include it here!
+    triggers: {
+        [triggerThirdparty.key]: triggerThirdparty,
+        [triggerOrder.key]: triggerOrder,
+        [triggerAction.key]: triggerAction
+    },
+
+    // If you want your searches to show up, you better include it here!
+    searches: {
+        [searchThirdparty.key]: searchThirdparty,
+    },
+
+    // If you want your creates to show up, you better include it here!
+    creates: {
+        [createThirdparty.key]: createThirdparty,
+    }
+};
+
+// Finally, export the app.
+module.exports = App;
--- a/dev/examples/zapier/package-lock.json
+++ b/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=="
+        }
+      }
+    }
+  }
+}
--- a/dev/examples/zapier/package.json
+++ b/dev/examples/zapier/package.json
@ -0,0 +1,24 @@
+{
+  "name": "Dolibarr",
+  "version": "1.0.0",
+  "description": "An app for connecting Dolibarr to the Zapier platform.",
+  "repository": "Dolibarr/dolibarr",
+  "homepage": "https://www.dolibarr.fr/",
+  "author": "Frédéric France <frederic.france@netlogic.fr>",
+  "license": "BSD-3-Clause",
+  "main": "index.js",
+  "scripts": {
+    "test": "mocha --recursive"
+  },
+  "engines": {
+    "node": "8.10.0",
+    "npm": ">=5.6.0"
+  },
+  "dependencies": {
+    "zapier-platform-core": "8.0.1"
+  },
+  "devDependencies": {
+    "mocha": "^5.2.0",
+    "should": "^13.2.0"
+  }
+}
--- a/dev/examples/zapier/resources/resources.js
+++ b/dev/examples/zapier/resources/resources.js
--- a/dev/examples/zapier/searches/thirdparty.js
+++ b/dev/examples/zapier/searches/thirdparty.js
@ -0,0 +1,66 @@
+module.exports = {
+    key: 'thirdparty',
+
+    // You'll want to provide some helpful display labels and descriptions
+    // for users. Zapier will put them into the UX.
+    noun: 'Thirdparty',
+    display: {
+        label: 'Find a Thirdparty',
+        description: 'Search for thirdparty.'
+    },
+
+    // `operation` is where we make the call to your API to do the search
+    operation: {
+        // This search only has one search field. Your searches might have just one, or many
+        // search fields.
+        inputFields: [
+            {
+                key: 'name',
+                type: 'string',
+                label: 'Name',
+                helpText: 'Name to limit to the search to (i.e. The company or %company%).'
+            }
+        ],
+
+        perform: (z, bundle) => {
+            const url = bundle.authData.url  + '/api/index.php/thirdparties/';
+
+            // Put the search value in a query param. The details of how to build
+            // a search URL will depend on how your API works.
+            const options = {
+                params: {
+                    sqlfilters: "t.nom like \'%"+bundle.inputData.name+"%\'"
+                }
+            };
+
+            return z.request(url, options).then(response => JSON.parse(response.content));
+        },
+
+        // 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,
+            name: 'DOE',
+            firstname: 'John',
+            authorId: 1,
+            directions: '1. Boil Noodles\n2.Serve with sauce',
+            style: 'italian'
+        },
+
+        // 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', label: 'ID'},
+            {key: 'createdAt', label: 'Created At'},
+            {key: 'name', label: 'Name'},
+            {key: 'firstname', label: 'Firstname'},
+            {key: 'directions', label: 'Directions'},
+            {key: 'authorId', label: 'Author ID'},
+            {key: 'style', label: 'Style'}
+        ]
+    }
+};
--- a/dev/examples/zapier/test/index.js
+++ b/dev/examples/zapier/test/index.js
@ -0,0 +1,17 @@
+require('should');
+
+const zapier = require('zapier-platform-core');
+
+// Use this to make test calls into your app:
+const App = require('../index');
+const appTester = zapier.createAppTester(App);
+
+describe('My App', () => {
+
+  it('should test something', (done) => {
+    const x = 1;
+    x.should.eql(1);
+    done();
+  });
+
+});
--- a/dev/examples/zapier/triggers/action.js
+++ b/dev/examples/zapier/triggers/action.js
@ -0,0 +1,156 @@
+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: 'action',
+        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: JSON.stringify(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 getAction = (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 action = {
+        id: bundle.cleanedRequest.id,
+        ref: bundle.cleanedRequest.ref,
+        ref_client: bundle.cleanedRequest.ref_client,
+        name: bundle.cleanedRequest.name,
+        firstname: bundle.cleanedRequest.firstname,
+        usertodo__name: bundle.cleanedRequest.usertodo__name,
+        location: bundle.cleanedRequest.location,
+        label: bundle.cleanedRequest.label,
+        authorId: bundle.cleanedRequest.authorId,
+        createdAt: bundle.cleanedRequest.createdAt,
+        module: bundle.cleanedRequest.module,
+        datep: bundle.cleanedRequest.datep,
+        datef: bundle.cleanedRequest.datef,
+        fulldayevent: bundle.cleanedRequest.fulldayevent,
+        transparency: bundle.cleanedRequest.transparency,
+        icalname: bundle.cleanedRequest.icalname,
+        icalcolor: bundle.cleanedRequest.icalcolor,
+        note: bundle.cleanedRequest.note,
+        note_public: bundle.cleanedRequest.note_public,
+        note_private: bundle.cleanedRequest.note_private,
+        action: bundle.cleanedRequest.action
+    };
+
+    return [action];
+};
+
+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',
+    };
+
+    return z.request(options).then((response) => [JSON.parse(response.content)]);
+};
+
+// 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: bundle.authData.url  + '/api/index.php/zapierapi/getactionschoices/actions',
+//     };
+
+//     return z.request(options).then((response) => JSON.parse(response.content));
+// };
+
+// We recommend writing your actions separate like this and rolling them
+// into the App definition at the end.
+module.exports = {
+    key: 'action',
+
+    // You'll want to provide some helpful display labels and descriptions
+    // for users. Zapier will put them into the UX.
+    noun: 'Action',
+    display: {
+        label: 'New Agenda',
+        description: 'Trigger when a new agenda with 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',
+                type: 'string',
+                helpText: 'Which action of agenda this should trigger on.',
+                choices: {
+                    create: "Create",
+                    modify: "Modify",
+                    delete: "Delete",
+                }
+            }
+        ],
+
+        type: 'hook',
+
+        performSubscribe: subscribeHook,
+        performUnsubscribe: unsubscribeHook,
+
+        perform: getAction,
+        performList: getFallbackRealAction,
+
+        // 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,
+            name: 'Best Spagetti Ever',
+            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', 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'}
+        ]
+    }
+};
--- a/dev/examples/zapier/triggers/order.js
+++ b/dev/examples/zapier/triggers/order.js
@ -0,0 +1,148 @@
+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: 'order',
+        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: JSON.stringify(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 getOrder = (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 order = {
+        id: bundle.cleanedRequest.id,
+        ref: bundle.cleanedRequest.ref,
+        ref_client: bundle.cleanedRequest.ref_client,
+        name: bundle.cleanedRequest.name,
+        firstname: bundle.cleanedRequest.firstname,
+        directions: bundle.cleanedRequest.directions,
+        authorId: bundle.cleanedRequest.authorId,
+        createdAt: bundle.cleanedRequest.createdAt,
+        note_public: bundle.cleanedRequest.note_public,
+        note_private: bundle.cleanedRequest.note_private,
+        action: bundle.cleanedRequest.action
+    };
+
+    return [order];
+};
+
+const getFallbackRealOrder = (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/orders/0',
+    };
+
+    return z.request(options).then((response) => [JSON.parse(response.content)]);
+};
+
+// 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: bundle.authData.url  + '/api/index.php/zapierapi/getactionschoices/orders',
+//     };
+
+//     return z.request(options).then((response) => JSON.parse(response.content));
+// };
+
+// We recommend writing your orders separate like this and rolling them
+// into the App definition at the end.
+module.exports = {
+    key: 'order',
+
+    // You'll want to provide some helpful display labels and descriptions
+    // for users. Zapier will put them into the UX.
+    noun: 'Order',
+    display: {
+        label: 'New Order',
+        description: 'Trigger when a new order with 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',
+                type: 'string',
+                helpText: 'Which action of order this should trigger on.',
+                choices: {
+                    create: "Create",
+                    modify: "Modify",
+                    validate: "Validate",
+                }
+            }
+        ],
+
+        type: 'hook',
+
+        performSubscribe: subscribeHook,
+        performUnsubscribe: unsubscribeHook,
+
+        perform: getOrder,
+        performList: getFallbackRealOrder,
+
+        // 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,
+            name: 'Best Spagetti Ever',
+            authorId: 1,
+            directions: '1. Boil Noodles\n2.Serve with sauce',
+            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', label: 'ID'},
+            {key: 'createdAt', label: 'Created At'},
+            {key: 'name', label: 'Name'},
+            {key: 'directions', label: 'Directions'},
+            {key: 'authorId', label: 'Author ID'},
+            {key: 'module', label: 'Module'},
+            {key: 'action', label: 'Action'}
+        ]
+    }
+};
--- a/dev/examples/zapier/triggers/thirdparty.js
+++ b/dev/examples/zapier/triggers/thirdparty.js
@ -0,0 +1,175 @@
+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: 'company',
+        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: JSON.stringify(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 getThirdparty = (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 thirdparty = {
+        id: bundle.cleanedRequest.id,
+        name: bundle.cleanedRequest.name,
+        name_alias: bundle.cleanedRequest.name_alias,
+        firstname: bundle.cleanedRequest.firstname,
+        address: bundle.cleanedRequest.address,
+        zip: bundle.cleanedRequest.zip,
+        town: bundle.cleanedRequest.town,
+        email: bundle.cleanedRequest.email,
+        client: bundle.cleanedRequest.client,
+        fournisseur: bundle.cleanedRequest.fournisseur,
+        code_client: bundle.cleanedRequest.code_client,
+        code_fournisseur: bundle.cleanedRequest.code_fournisseur,
+        authorId: bundle.cleanedRequest.authorId,
+        createdAt: bundle.cleanedRequest.createdAt,
+        action: bundle.cleanedRequest.action
+    };
+
+    return [thirdparty];
+};
+
+const getFallbackRealThirdparty = (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/thirdparties/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",
+//         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: 'thirdparty',
+
+    // You'll want to provide some helpful display labels and descriptions
+    // for users. Zapier will put them into the UX.
+    noun: 'Thirdparty',
+    display: {
+        label: 'New Thirdparty',
+        description: 'Trigger when a new thirdpaty 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',
+                type: 'string',
+                helpText: 'Which action of thirdparty this should trigger on.',
+                choices: {
+                    create: "Create",
+                    modify: "Modify",
+                    validate: "Validate",
+                }
+            }
+        ],
+
+        type: 'hook',
+
+        performSubscribe: subscribeHook,
+        performUnsubscribe: unsubscribeHook,
+
+        perform: getThirdparty,
+        performList: getFallbackRealThirdparty,
+
+        // 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,
+            name: 'DOE',
+            name_alias: 'DOE Ltd',
+            firstname: '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', label: 'ID'},
+            {key: 'createdAt', label: 'Created At'},
+            {key: 'name', label: 'Name'},
+            {key: 'name_alias', label: 'Name alias'},
+            {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'},
+            {key: 'code_client', label: 'Customer code'},
+            {key: 'code_fournisseur', label: 'Supplier code'}
+        ]
+    }
+};
--- a/dev/initdemo/documents_demo/ticket/TS1909-0002/dolibarr_screenshot1_300x188.png
+++ b/dev/initdemo/documents_demo/ticket/TS1909-0002/dolibarr_screenshot1_300x188.png
--- a/dev/initdemo/documents_demo/ticket/TS1909-0002/thumbs/dolibarr_screenshot1_300x188_mini.png
+++ b/dev/initdemo/documents_demo/ticket/TS1909-0002/thumbs/dolibarr_screenshot1_300x188_mini.png
--- a/dev/initdemo/documents_demo/ticket/TS1909-0002/thumbs/dolibarr_screenshot1_300x188_small.png
+++ b/dev/initdemo/documents_demo/ticket/TS1909-0002/thumbs/dolibarr_screenshot1_300x188_small.png
--- a/dev/initdemo/documents_demo/users/0/1/thumbs/mariecurie_mini.jpg
+++ b/dev/initdemo/documents_demo/users/0/1/thumbs/mariecurie_mini.jpg
--- a/dev/initdemo/documents_demo/users/0/1/thumbs/mariecurie_small.jpg
+++ b/dev/initdemo/documents_demo/users/0/1/thumbs/mariecurie_small.jpg
--- a/dev/initdemo/documents_demo/users/1/0/IMG_0013.jpg
+++ b/dev/initdemo/documents_demo/users/1/0/IMG_0013.jpg
--- a/dev/initdemo/documents_demo/users/1/0/thumbs/IMG_0013_mini.jpg
+++ b/dev/initdemo/documents_demo/users/1/0/thumbs/IMG_0013_mini.jpg
--- a/dev/initdemo/documents_demo/users/1/0/thumbs/IMG_0013_small.jpg
+++ b/dev/initdemo/documents_demo/users/1/0/thumbs/IMG_0013_small.jpg
--- a/dev/initdemo/documents_demo/users/1/0/thumbs/alberteinstein_mini.jpg
+++ b/dev/initdemo/documents_demo/users/1/0/thumbs/alberteinstein_mini.jpg
--- a/dev/initdemo/documents_demo/users/1/0/thumbs/alberteinstein_small.jpg
+++ b/dev/initdemo/documents_demo/users/1/0/thumbs/alberteinstein_small.jpg
--- a/dev/initdemo/documents_demo/users/1/0/alberteinstein.jpg
+++ b/dev/initdemo/documents_demo/users/1/0/alberteinstein.jpg
--- a/dev/initdemo/documents_demo/users/1/thumbs/alberteinstein_mini.jpg
+++ b/dev/initdemo/documents_demo/users/1/thumbs/alberteinstein_mini.jpg
--- a/dev/initdemo/documents_demo/users/1/thumbs/alberteinstein_small.jpg
+++ b/dev/initdemo/documents_demo/users/1/thumbs/alberteinstein_small.jpg
--- a/dev/initdemo/documents_demo/users/0/1/mariecurie.jpg
+++ b/dev/initdemo/documents_demo/users/0/1/mariecurie.jpg
--- a/dev/initdemo/documents_demo/users/10/thumbs/mariecurie_mini.jpg
+++ b/dev/initdemo/documents_demo/users/10/thumbs/mariecurie_mini.jpg
--- a/dev/initdemo/documents_demo/users/10/thumbs/mariecurie_small.jpg
+++ b/dev/initdemo/documents_demo/users/10/thumbs/mariecurie_small.jpg
--- a/dev/initdemo/documents_demo/users/11/person4.jpeg
+++ b/dev/initdemo/documents_demo/users/11/person4.jpeg
--- a/dev/initdemo/documents_demo/users/11/thumbs/person4_mini.jpeg
+++ b/dev/initdemo/documents_demo/users/11/thumbs/person4_mini.jpeg
--- a/dev/initdemo/documents_demo/users/11/thumbs/person4_small.jpeg
+++ b/dev/initdemo/documents_demo/users/11/thumbs/person4_small.jpeg
--- a/dev/initdemo/documents_demo/users/12/person6.jpeg
+++ b/dev/initdemo/documents_demo/users/12/person6.jpeg
--- a/dev/initdemo/documents_demo/users/12/thumbs/person6_mini.jpeg
+++ b/dev/initdemo/documents_demo/users/12/thumbs/person6_mini.jpeg
--- a/dev/initdemo/documents_demo/users/12/thumbs/person6_small.jpeg
+++ b/dev/initdemo/documents_demo/users/12/thumbs/person6_small.jpeg
--- a/dev/initdemo/documents_demo/users/13/person7.jpeg
+++ b/dev/initdemo/documents_demo/users/13/person7.jpeg
--- a/dev/initdemo/documents_demo/users/13/thumbs/person7_mini.jpeg
+++ b/dev/initdemo/documents_demo/users/13/thumbs/person7_mini.jpeg
--- a/dev/initdemo/documents_demo/users/13/thumbs/person7_small.jpeg
+++ b/dev/initdemo/documents_demo/users/13/thumbs/person7_small.jpeg
--- a/dev/initdemo/documents_demo/users/14/person3.jpeg
+++ b/dev/initdemo/documents_demo/users/14/person3.jpeg
--- a/dev/initdemo/documents_demo/users/14/thumbs/person3_mini.jpeg
+++ b/dev/initdemo/documents_demo/users/14/thumbs/person3_mini.jpeg
--- a/dev/initdemo/documents_demo/users/14/thumbs/person3_small.jpeg
+++ b/dev/initdemo/documents_demo/users/14/thumbs/person3_small.jpeg
--- a/dev/initdemo/documents_demo/users/16/person1.jpeg
+++ b/dev/initdemo/documents_demo/users/16/person1.jpeg
--- a/dev/initdemo/documents_demo/users/16/thumbs/person1_mini.jpeg
+++ b/dev/initdemo/documents_demo/users/16/thumbs/person1_mini.jpeg
--- a/dev/initdemo/documents_demo/users/16/thumbs/person1_small.jpeg
+++ b/dev/initdemo/documents_demo/users/16/thumbs/person1_small.jpeg
--- a/dev/initdemo/documents_demo/users/17/person5.jpeg
+++ b/dev/initdemo/documents_demo/users/17/person5.jpeg
--- a/dev/initdemo/documents_demo/users/17/thumbs/person5_mini.jpeg
+++ b/dev/initdemo/documents_demo/users/17/thumbs/person5_mini.jpeg
--- a/dev/initdemo/documents_demo/users/17/thumbs/person5_small.jpeg
+++ b/dev/initdemo/documents_demo/users/17/thumbs/person5_small.jpeg
--- a/dev/initdemo/documents_demo/users/8/1/ldestailleur_200x200.jpg
+++ b/dev/initdemo/documents_demo/users/8/1/ldestailleur_200x200.jpg
--- a/dev/initdemo/documents_demo/users/8/1/thumbs/ldestailleur_200x200_mini.jpg
+++ b/dev/initdemo/documents_demo/users/8/1/thumbs/ldestailleur_200x200_mini.jpg
--- a/dev/initdemo/documents_demo/users/18/thumbs/ldestailleur_200x200_small.jpg
+++ b/dev/initdemo/documents_demo/users/18/thumbs/ldestailleur_200x200_small.jpg
--- a/dev/initdemo/documents_demo/users/19/person2.jpeg
+++ b/dev/initdemo/documents_demo/users/19/person2.jpeg
--- a/dev/initdemo/documents_demo/users/19/thumbs/person2_mini.jpeg
+++ b/dev/initdemo/documents_demo/users/19/thumbs/person2_mini.jpeg
--- a/dev/initdemo/documents_demo/users/19/thumbs/person2_small.jpeg
+++ b/dev/initdemo/documents_demo/users/19/thumbs/person2_small.jpeg
--- a/dev/initdemo/documents_demo/users/2/0/daviddoe.png
+++ b/dev/initdemo/documents_demo/users/2/0/daviddoe.png
--- a/dev/initdemo/documents_demo/users/2/0/thumbs/daviddoe_mini.png
+++ b/dev/initdemo/documents_demo/users/2/0/thumbs/daviddoe_mini.png
--- a/dev/initdemo/documents_demo/users/2/0/thumbs/daviddoe_small.png
+++ b/dev/initdemo/documents_demo/users/2/0/thumbs/daviddoe_small.png
--- a/dev/initdemo/documents_demo/users/2/person9.jpeg
+++ b/dev/initdemo/documents_demo/users/2/person9.jpeg
--- a/dev/initdemo/documents_demo/users/2/thumbs/person9_mini.jpeg
+++ b/dev/initdemo/documents_demo/users/2/thumbs/person9_mini.jpeg
--- a/dev/initdemo/documents_demo/users/2/thumbs/person9_small.jpeg
+++ b/dev/initdemo/documents_demo/users/2/thumbs/person9_small.jpeg
--- a/dev/initdemo/documents_demo/users/3/0/pierrecurie.jpg
+++ b/dev/initdemo/documents_demo/users/3/0/pierrecurie.jpg
--- a/dev/initdemo/documents_demo/users/3/0/thumbs/pierrecurie_mini.jpg
+++ b/dev/initdemo/documents_demo/users/3/0/thumbs/pierrecurie_mini.jpg
--- a/dev/initdemo/documents_demo/users/3/0/thumbs/pierrecurie_small.jpg
+++ b/dev/initdemo/documents_demo/users/3/0/thumbs/pierrecurie_small.jpg
--- a/dev/initdemo/documents_demo/users/4/person8.jpeg
+++ b/dev/initdemo/documents_demo/users/4/person8.jpeg
--- a/dev/initdemo/documents_demo/users/4/thumbs/person8_mini.jpeg
+++ b/dev/initdemo/documents_demo/users/4/thumbs/person8_mini.jpeg
--- a/dev/initdemo/documents_demo/users/4/thumbs/person8_small.jpeg
+++ b/dev/initdemo/documents_demo/users/4/thumbs/person8_small.jpeg
--- a/dev/initdemo/documents_demo/users/8/1/thumbs/ldestailleur_200x200_small.jpg
+++ b/dev/initdemo/documents_demo/users/8/1/thumbs/ldestailleur_200x200_small.jpg
--- a/dev/initdemo/documents_demo/users/9/1/eldy_php.jpg
+++ b/dev/initdemo/documents_demo/users/9/1/eldy_php.jpg
--- a/dev/initdemo/documents_demo/users/9/1/thumbs/eldy_php_mini.jpg
+++ b/dev/initdemo/documents_demo/users/9/1/thumbs/eldy_php_mini.jpg
--- a/dev/initdemo/documents_demo/users/9/1/thumbs/eldy_php_small.jpg
+++ b/dev/initdemo/documents_demo/users/9/1/thumbs/eldy_php_small.jpg
--- a/dev/initdemo/initdemo.sh
+++ b/dev/initdemo/initdemo.sh
@ -50,7 +50,7 @@ fi
 # ----------------------------- if no params on command line
 if [ "x$passwd" = "x" ]
 then
-	export dumpfile=`ls $mydir/mysqldump_dolibarr_*.sql | sort | tail -n 1`
+	export dumpfile=`ls -v $mydir/mysqldump_dolibarr_*.sql | tail -n 1`
 	export dumpfile=`basename $dumpfile`

 	# ----------------------------- input file
--- a/dev/initdemo/mysqldump_dolibarr_10.0.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_10.0.0.sql
--- a/dev/initdemo/savedemo.sh
+++ b/dev/initdemo/savedemo.sh
@ -38,7 +38,7 @@ passwd=$5;
 # ----------------------------- if no params on command line
 if [ "x$passwd" = "x" ]
 then
-	export dumpfile=`ls $mydir/mysqldump_dolibarr_*.sql | sort | tail -n 1`
+	export dumpfile=`ls -v $mydir/mysqldump_dolibarr_*.sql | tail -n 1`
 	export dumpfile=`basename $dumpfile`

 	# ----------------------------- input file
--- a/dev/initdemo/sftpget_and_loaddump.php
+++ b/dev/initdemo/sftpget_and_loaddump.php
@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <https://www.gnu.org/licenses/>.
- * or see http://www.gnu.org/
+ * or see https://www.gnu.org/
 *
 * Get a distant dump file and load it into a mysql database
 */
--- a/dev/initdemo/updatedemo.php
+++ b/dev/initdemo/updatedemo.php
@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <https://www.gnu.org/licenses/>.
- * or see http://www.gnu.org/
+ * or see https://www.gnu.org/
 *
 * Get a distant dump file and load it into a mysql database
 */
--- a/dev/namespacemig/aaa.class.php
+++ b/dev/namespacemig/aaa.class.php
@ -2,10 +2,14 @@

 namespace Dolibarr;

-
 global $globalaaa;
 $globalaaa = 'globalaaa';

+/**
+ * faaa
+ *
+ * @return string
+ */
 function faaa()
 {
 	return 'faaa';
@ -15,9 +19,12 @@ class Aaa
 {
 	const AAA='aaa';

+	/**
+	 * do
+	 * @return void
+	 */
 	public function do()
 	{
 		echo 'doaaa'."\n";
 	}
 }
-
--- a/Show More
+++ b/Show More