Merge

FIX: #6813 No numbering model for supplier proposal module

.editorconfig

@@ -15,3 +15,5 @@ indent_style = tab
 indent_style = tab
 [*.xml]
 indent_style = tab
+[*.md]
+trim_trailing_whitespace = false

.github/CONTRIBUTING.md

@@ -49,6 +49,13 @@ Use clear commit messages with the following structure:
 LONGDESC
 ```
 
+We provide a [.gitmessage](/.gitmessage) file to help you fit the template.
+
+You can add it to your git configuration using:
+```
+git config --local commit.template .gitmessage
+```
+
 #### Keyword
 In uppercase if you want to have the log comment appears into the generated ChangeLog file.
 
@@ -100,9 +107,9 @@ Otherwise, please be a bit verbose about what you're providing.
 Your Pull Request must pass the Continuous Integration checks.
 Also, some code changes need a prior approbation:
 
-* if you want to include a new external library (into htdocs/includes directory), please ask before to the project leader to see if such a library can be accepted.
+* if you want to include a new external library (into htdocs/includes directory), please ask before to the project manager (@eldy) to see if such a library can be accepted.
 
-* if you add a new table, you must first create a page on http://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Than ask the project leader if the new data model you plan to add can be accepted as you suggest.
+* if you add a new table, you must first create a page on http://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Than ask the project manager (@eldy) if the new data model you plan to add can be accepted as you suggest.
 
 ### Resources
 [Developer documentation](http://wiki.dolibarr.org/index.php/Developer_documentation)

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,41 @@
+# 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*
+- *remove any unused sub-section*
+
+
+# Bug
+[*Short description*]
+
+## Environment
+- **Version**: [*Affected Dolibarr version(s)*]
+- **OS**: [*Server OS type and version*]
+- **Web server**: [*Webserver type and version*]
+- **PHP**: [*PHP version*]
+- **Database**: [*Database type and version*]
+- **URL(s)**: [*Affected URL(s)*]
+
+## Expected and actual behavior
+[*Verbose description*]
+
+## Steps to reproduce the behavior
+[*Verbose description*]
+
+## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)
+[*Files*]
+
+
+
+# Feature Request
+[*Short description*]
+
+## Use case
+[*Verbose description*]
+
+## Suggested implementation
+[*Verbose description*]
+
+## Suggested steps
+[*List of tasks to achieve goal*]

.github/PULL_REQUEST_TEMPLATE.md

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

.gitmessage

@@ -0,0 +1,7 @@
+
+# ^=[ Subject: One line short summary ]=========^|
+# ~ Subject template: [KEYWORD] [ISSUENUM] DESC ~|
+
+# ^=[ Blank: Follow the Subject with a blank line, do NOT remove ]====^|
+
+# ^=[ Details: Describe what changed and explain why it changed ]=====^|

.scrutinizer.yml

@@ -9,6 +9,7 @@ filter:
         - dev/*
         - doc/*
         - test/*
+        - htdocs/includes/*
     paths: 
         - htdocs/*
         - scripts/*

.travis.yml

@@ -50,7 +50,6 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
-  - php: '7.0'
   - php: nightly
   # FIXME
   #- env: DB=postgresql
@@ -79,7 +78,11 @@ before_install:
 install:
 - |
   echo "Updating Composer"
+  rm $TRAVIS_BUILD_DIR/composer.json
+  rm $TRAVIS_BUILD_DIR/composer.lock
   composer self-update
+  composer -n init
+  composer -n config vendor-dir htdocs/includes
   echo
 
 - |
@@ -100,14 +103,15 @@ install:
 
 - |
   echo "Installing PHP CodeSniffer"
-  composer require squizlabs/php_codesniffer ^2
+  composer -n require squizlabs/php_codesniffer ^2
   echo
 
 - |
-  echo "Adding Composer binaries to the path"
+  echo "Adding path of binaries tools installed by composer to the PATH"
   export PATH="$TRAVIS_BUILD_DIR/htdocs/includes/bin:$PATH"
   echo
   
+
 before_script:
 - |
   echo Start travis
@@ -162,11 +166,11 @@ before_script:
     echo "MySQL"
     mysql -e 'DROP DATABASE IF EXISTS travis;'
     mysql -e 'CREATE DATABASE IF NOT EXISTS travis;'
-    mysql -D travis < dev/initdata/mysqldump_dolibarr_3.5.0.sql
+    mysql -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
   fi
   # FIXME: find a way to import a MySQL dump into PostgreSQL
   #if [ "$DB" = 'postgresql' ]; then
-  #  pgsql travis < dev/initdata/mysqldump_dolibarr_3.5.0.sql
+  #  pgsql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
   #fi
   # TODO: SQLite
   echo
@@ -197,6 +201,7 @@ before_script:
   echo "Create documents directory and set permissions"
   # and admin/temp subdirectory needed for unit tests
   mkdir -p documents/admin/temp
+  echo "first line" > documents/dolibarr.log
   echo
 
 - |
@@ -265,49 +270,67 @@ script:
 - |
   echo "Upgrading Dolibarr"
   # Ensure we catch errors
-  set -e
+  set +e
   cd htdocs/install
   php upgrade.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360.log
-  php upgrade2.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360-2.log
-  php step5.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360-3.log
+  php upgrade2.php 3.5.0 3.6.0 > $TRAVIS_BUILD_DIR/upgrade350360-2.log
+  php step5.php 3.5.0 3.6.0 > $TRAVIS_BUILD_DIR/upgrade350360-3.log
   php upgrade.php 3.6.0 3.7.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade360370.log
-  php upgrade2.php 3.6.0 3.7.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade360370-2.log
-  php step5.php 3.6.0 3.7.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade360370-3.log
+  php upgrade2.php 3.6.0 3.7.0 > $TRAVIS_BUILD_DIR/upgrade360370-2.log
+  php step5.php 3.6.0 3.7.0 > $TRAVIS_BUILD_DIR/upgrade360370-3.log
   php upgrade.php 3.7.0 3.8.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade370380.log
-  php upgrade2.php 3.7.0 3.8.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade370380-2.log
-  php step5.php 3.7.0 3.8.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade370380-3.log
+  php upgrade2.php 3.7.0 3.8.0 > $TRAVIS_BUILD_DIR/upgrade370380-2.log
+  php step5.php 3.7.0 3.8.0 > $TRAVIS_BUILD_DIR/upgrade370380-3.log
   php upgrade.php 3.8.0 3.9.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade380390.log
-  php upgrade2.php 3.8.0 3.9.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade380390-2.log
-  php step5.php 3.8.0 3.9.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade380390-3.log
+  php upgrade2.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-2.log
+  php step5.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-3.log
+  php upgrade.php 3.9.0 4.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade390400.log
+  php upgrade2.php 3.9.0 4.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade390400-2.log
+  php step5.php 3.9.0 4.0.0 > $TRAVIS_BUILD_DIR/upgrade390400-3.log
   cd -
   set +e
   echo
+  #cat $TRAVIS_BUILD_DIR/upgrade390400-2.log
+  #cat /tmp/dolibarr_install.log
   
 - |
   echo "Unit testing"
-  # Ensure we catch errors
+  # Ensure we catch errors. Set this to +e if you want to go to the end to see log file.
   set -e
   phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php
   set +e
-  echo
+
+- |
+  #echo "Output dolibarr.log"
+  #echo cat documents/dolibarr.log
+
+after_script:
+- |
+  # Dolibarr log file
+  #echo "After script"
+  #cat documents/dolibarr.log
+
 
 after_success:
+- |
+  echo Success
 
 after_failure:
 - |
-  if [ "$DEBUG" = true ]; then
+  echo Failure
+  # This part of code seems to be never executed, error or not ???
   echo "Debugging informations"
   # Upgrade log files
   cat *.log
-    # Dolibarr log file
-    cat documents/dolibarr.log
+  echo "Debugging informations"
   # Apache log file
   sudo cat /var/log/apache2/error.log
+  # Dolibarr log file
+  cat documents/dolibarr.log
+  if [ "$DEBUG" = true ]; then
     # MariaDB log file
     sudo cat /var/log/mysql/error.log
     # TODO: PostgreSQL log file
     echo
   fi
 
-after_script:
-

.tx/config

@@ -170,7 +170,7 @@ source_file = htdocs/langs/en_US/interventions.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.languages]
+[dolibarr.languages-not-res]
 file_filter = htdocs/langs/<lang>/languages.lang
 source_file = htdocs/langs/en_US/languages.lang
 source_lang = en_US
@@ -356,6 +356,12 @@ source_file = htdocs/langs/en_US/withdrawals.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.website]
+file_filter = htdocs/langs/<lang>/website.lang
+source_file = htdocs/langs/en_US/website.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.workflow]
 file_filter = htdocs/langs/<lang>/workflow.lang
 source_file = htdocs/langs/en_US/workflow.lang

COPYRIGHT

@@ -14,7 +14,7 @@ Component              Version       License                     GPL Compatible
 PHP libraries:
 AdoDb-Date             0.36          Modified BSD License        Yes             Date convertion (not into rpm package)
 ChromePHP              4.1.0         Apache Software License 2.0 Yes             Return server log to chrome browser console
-CKEditor               4.3.3         LGPL-2.1+                   Yes             Editor WYSIWYG
+CKEditor               4.5.8         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
 FPDI                   1.5.2         Apache Software License 2.0 Yes             PDF templates management
@@ -27,9 +27,10 @@ PHPExcel               1.8.1         LGPL-2.1+                   Yes
 php-iban               1.4.7         LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
 PHPoAuthLib            0.8.2         MIT License                 Yes             Library to provide oauth1 and oauth2 to different service
 PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
-Restler                3.0           LGPL-3+                     Yes             Library to develop REST Web services
+Restler                3.0.0RC6      LGPL-3+                     Yes             Library to develop REST Web services
 TCPDF                  6.2.12        LGPL-3+                     Yes             PDF generation
 TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
+Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
 
 JS libraries:
 jQuery                 1.11.3        MIT License                 Yes             JS library
@@ -39,7 +40,7 @@ jQuery blockUI         2.70.0        GPL and MIT License         Yes
 jQuery Colorpicker     1.1           MIT License                 Yes             JS library for color picker for a defined list of colors
 jQuery DataTables      1.9.4         BSD                         Yes             JS library for tables output
 jQuery FileUpload      5.0.3         GPL and MIT License         Yes             JS library to upload files
-jQuery Flot            0.7           MIT License                 Yes             JS library to build graph
+jQuery Flot            0.8.3         MIT License                 Yes             JS library to build graph
 jQuery JCrop           0.9.8         GPL and MIT License         Yes             JS library plugin Crop (to crop images)
 jQuery Jeditable       1.7.1         GPL and MIT License         Yes             JS library plugin jeditable (to edit in place)
 jQuery jNotify         1.1.00        Apache Software License 2.0 Yes             JS library plugin jNotify (to use ajax popups)
@@ -61,6 +62,8 @@ http://www.gnu.org/licenses/licenses.en.html
 Copyright
 ---------
 
+Copyright (C) 2016
+
 Copyright (C) 2015
 - Laurent Destailleur <eldy@users.sourceforge.net>
 - Marcos García <marcosgdf@gmail.com>

ChangeLog

@@ -6,12 +6,399 @@ WARNING:
 
 Do not try to make any Dolibarr upgrade if you are running Mysql version 5.5.40.
 Mysql version 5.5.40 has a very critical bug making your data beeing definitely lost.
-You may also experience troubles with Mysql 5.5.41/42/43 with error "Lost connection"
-during migration.
+You may also experience troubles with Mysql 5.5.41/42/43 with error "Lost connection" during
+migration.
 Upgrading to any other version or any other database system is abolutely required BEFORE trying
 make a Dolibarr upgrade.
 
 
+***** ChangeLog for 4.0.6 to 4.0.5 *****
+FIX: #6613 Default subject for Supplier proposal emails is filled with a non-existing key
+FIX: #6623 User card shows "Return to list" link even if the user has no rights to list users
+FIX: #6636 Complete fix
+FIX: #6669 User with no permission to edit customer invoices can see a edit button in project entry
+FIX: #6671 Cannot remove thirdparty type with "#" in its name
+FIX: #6673 Missing "nature" table header in thirdparty list
+FIX: #6675 Restricted user with no agenda permissions can see a button to create appointment in thirdparty contact list
+FIX: #6677 Expired contracts dashboard box does not show the name of the thirdparty
+FIX: #6679 User with restricted supplier invoice permissions can edit project, payment conditions, payment mode
+FIX: #6680 User with restricted supplier invoice permissions sees "reopen" button even if he has no permission to do it
+FIX: #6813
+FIX: Correction with author and validator user on orders
+FIX: doactions hook missing in invoice model page
+FIX: dont get empty "Incoterms : - " string if no incoterm
+FIX: dont lose supplier ref if no supplier price in database
+FIX: forgotten parameter for right multicompany use
+FIX: global $dateSelector isn't the good one, then date selector on objectline_create tpl was hidden
+FIX: limit+1 dosn't show Total line
+FIX: supplier order line were always created with rang = 0
+
+
+***** ChangeLog for 4.0.5 to 4.0.4 *****
+FIX: #6234
+FIX: #6259
+FIX: #6330
+FIX: #6360
+FIX: #6411
+FIX: #6443
+FIX: #6444
+FIX: #6453
+FIX: #6503: SQL error in "Last pending payment invoices"
+FIX: #6505 Project elements page shows greyed-out links even if the option to show actions not available is disabled
+FIX: #6507: Statistics counter show wrong total Contract numbers when the user does not have full access
+FIX: #6533 #6590
+FIX: #6619 Template invoices list do not respect restricted thirdparty user rights
+FIX: #6621 Documents tab shows greyed out upload form even if the option to show actions not available is disabled
+FIX: add entity param to document link
+FIX: Can use quote into supplier ref on order line add
+FIX: Change the customer code only if error on duplicate
+FIX: Creation of credit note on invoice with deposit stole the discount.
+FIX: delete bank class lines when we delete bank_categ
+FIX: deletion of bank tag
+FIX: detail of deposit and credit not was not visible into final invoice
+FIX: Error management during bank account creation
+FIX: error management in bank account deletion.
+FIX: event status is not modified when assign an user
+FIX: forgotten fk_facture_fourn attribute on supplierinvoice line object
+FIX: If bank module on, field must be required to register payment of expense report.
+FIX: load multicurrency informations on supplier order and bill lines fetch
+FIX: Missing total on project overview.
+FIX: multicurrency_subprice
+FIX: param billed when we change page
+FIX: protection against infinite loop on hierarchy
+FIX: Supplier Order list filter by project
+FIX: the dolCopyDir fails if target dir does not exists.
+FIX: use param for http links
+
+***** ChangeLog for 4.0.4 to 4.0.3 *****
+FIX: #6227 Document models table header "Unit" is shown in 2 lines in Spanish
+FIX: #6230
+FIX: #6237
+FIX: #6245 Thirdparty link in supplier invoices list, links to "comm/card" instead of "fourn/card" page
+FIX: #6253 Supplier invoice list filter does not respect "thirdparty" filter
+FIX: #6277
+FIX: project list and ajax completion return wrong list.
+FIX: bug margin calculation by user with multicompany
+FIX: Can make a stock transfert on product not on sale/purchase.
+FIX: extrafield input for varchar was not working with special char within (ie double quotes)
+FIX: javascript error
+FIX: link for not found photo when using gravatar. Must use external url.
+FIX: Protection so even if link is output for external user, links is disabled.
+FIX: repair tool was ko to restore extrafields with type select.
+FIX: Security access problem with external users on projects/tasks
+FIX: We must not drop extrafield column if there is still record on other entities.
+FIX: regression with sedning email when introducing security options to restrict nb of email sending.
+t 
+***** ChangeLog for 4.0.3 to 4.0.2 *****
+FIX: #5853 $conf->global->$calc==0 || $conf->global->$calc==1
+FIX: #5958 no discount on supplier command made by replenishment
+FIX: #5966 Bug: getNomUrl tooltips show Proposal info even if user has no rights to read them
+FIX: #5972 #5734
+FIX: #6007
+FIX: #6010
+FIX: #6029
+FIX: #6043 - Payment mode not visible on supplier invoice list
+FIX: #6051
+FIX: #6062
+FIX: #6088
+FIX: A draft can be deleted by a user with create permission.
+FIX: bad permission to see contract on home page
+FIX: bad permission to see contract statistics
+FIX: Bcc must not appears to recipient when using SMTPs lib
+FIX: Consistent description for add or edit product
+FIX: delete contract extrafields on contract deletion
+FIX: Deposits and credit notes weren't added in the received and pending columns
+FIX: export extrafields must not include separe type
+FIX: Export of opportunity status must be code, not id.
+FIX: False positive on services not activated
+FIX: Filter was wrong or lost during navigation
+FIX: HT and TTC price should always be displayed together
+FIX: if a supplier price reference is changed after creating an order, we can't clone order.
+FIX: in export. Error when using a separate extrafields.
+FIX: Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of tracking email.
+FIX: javascript error when using on mobile/smartphone
+FIX: javascript xss injection and a translation
+FIX: Label of project is in field title not label.
+FIX: List of people able to validate an expense report was not complete.
+FIX: Missing field
+FIX: Module gravatar was not triggered on thirdparty and contact card
+FIX: Must use external link into a forged email content.
+FIX: Pb in management of date end of projects
+FIX: Regression when deleting product
+FIX: rendering of output of estimated amount on project overview page.
+FIX: Sanitize title of ajax_dialog
+FIX: Security to restrict email sending was not efficient
+FIX: Setting supplier as client when accept a supplier proposal
+FIX: Some statistics not compatible with multicompany module.
+FIX: the time spent on project was not visible in its overwiew
+FIX: Update intervention lline crash with PgSQL
+FIX: wrong test on dict.php
+FIX: wrong var name
+
+***** ChangeLog for 4.0.2 compared to 4.0.1 *****
+FIX: #5340
+FIX: #5779
+FIX: #5849
+FIX: #5866
+FIX: #5907
+FIX: Addline if $txlocaltax1 is empty
+FIX: Avoid error 500 if phpexcel is disabled
+FIX: Avoid errors on debian
+FIX: Can edit the customer ref even if order is not draft.
+FIX: Documents not moved in new directory if we change reference of the task.
+FIX: Error when CATEGORIE_RECURSIV_ADD is enabled and new category is child of an already linked to object
+FIX: Extra fields of task not copied on project cloning
+FIX: Hidden option PRODUCT_MAX_VISIBLE_PHOTO
+FIX: Link on supplier invoice in widget was not clickable
+FIX: margin tab on customer card must filter on current entity invoices
+FIX: missing column into SQL on thirdparty list
+FIX: Nber of attached files were not reported in event report of email sent
+FIX: only show projects of related third if external user
+FIX: Search provider by price
+FIX: Solve backup when using mysqldump that return warning
+FIX: Sql error in widget of product for stock alerts
+FIX: updateligne if $txlocaltax1 is null
+
+***** ChangeLog for 4.0.1 compared to 4.0.0 *****
+FIX: #2853
+FIX: #2991
+FIX: #3128
+FIX: #5699
+FIX: #5734
+FIX: #5742 error on project list if an extra field separator is added.
+FIX: #5746 chrome php Try a fix. Not sure it solved all problems reported
+FIX: #5748 Bug: Error updating to 4.0.1 with Postgresql. Field must be varchar.
+FIX: #5750 Bug: CmailFile::server_parse enters an infinite loop if $server_response is false
+FIX: #5752 Bug VAT NPR not propagated during proposal cloning
+FIX: #5763 Bug: Cannot Create Supplier Price Request
+FIX: #5770 Dolibarr doesn't modify correctly the hour of a task
+FIX: #5776
+FIX: #5802 Incoterms not set
+FIX: #5813 Bug: Incoterms not being read correctly
+FIX: #5818
+FIX: alignement of intervention status
+FIX: Clean of search fields
+FIX: Creation of donation should go back on card after creation
+FIX: Date visible on project overview
+FIX: Execute a dedicated job from its id may results of launching other jobs too.
+FIX: Failed to export contact categories with contact extra fields
+FIX: inversion customer/supplier price
+FIX: link "back to list" was not visible.
+FIX: Lost filter on opportunities
+FIX: Mandatory field payment term was not css highlighted.
+FIX: Menu users not visible on dolidroid.
+FIX: SEC for HTB23302
+FIX: The email test sender in email setup was broken
+FIX: Translation of "Name" is not a good choice for floow-up.
+FIX: Update of maxnbrun on job list failed.
+FIX: Value of payment term and project are not set on correct default value when invoice generated from template.
+FIX: vat dictionary should allow enter and edit multiple values for localtaxes, separated by: (ex -19:-15)
+FIX: Vat not visible in dictionnary
+
+***** ChangeLog for 4.0.0 compared to 3.9.* *****
+For users:
+
+NEW: Add reccuring invoice feature and automatic generation of invoices.
+NEW: Add module "Loan" as stable.
+NEW: Add module "Supplier commercial proposal" (price request) is set to stable status.
+NEW: Experimental module Accountancy Expert
+NEW: Experimental module Multicurency
+NEW: Show into badge on tab head the number of dedicated contacts for all objects.
+NEW: Add a checkbox to select/unselect all lines on page that support mass actions (like invoice list page)
+NEW: Add a new method for margin calculation. Added margin on "cost price" to margin on WAP price and margin on "best supplier price".
+NEW: Add an explanation message on shipment page to explain you can't make shipment if order is not validated
+NEW: Add date_rum into table of thirdparty bank account.
+NEW: The probability of lead/opportunity can be defined per lead.
+NEW: Added Malta VAT into migration script
+NEW: #4972 Translated Charges sociales (type 0) and Charges sociales (type 1) in reports page
+NEW: Add Expense report into accountancy report
+NEW: Add Expense report to approve into workboard 
+NEW: Selection of boxes is move on top of home page
+NEW: Add filter on a keyword, status and nature into list of modules
+NEW: Add hidden option BANK_DISABLE_CHECK_DEPOSIT to disable check deposit feature.
+NEW: Add option MAIN_PUBLIC_NOTE_IN_ADDRESS
+NEW: add html id/class to locate value in the DOM html
+NEW: Add index on invoice status 
+NEW: Add constant MAIN_LOGTOHTML to 0 into other setup by default to save time when we need to make debug on hosted instance.
+NEW: Add list of billed
+NEW: Add minimum stock and desired stock into import/export profiles. 
+NEW: Add state into thirdparty export fields
+NEW: Add more trackable events (create, submit and receive supplier order).
+NEW: Add option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN
+NEW: Add picto on module list to show warning and if module is an external module.
+NEW: add product type filter on turnover report
+NEW: Add state into list of fields available for personalized fields of thirdparties
+NEW: Add statistics for interventions module
+NEW: Add statistics on number of projets on home page
+NEW: Add stats and late records into dashboard for supplier proposals.
+NEW: Add the admin info on combo of type of contact
+NEW: Add the event BILL_PAYED to list of supported events for module notification.
+NEW: Add total weight and volume on PDF 
+NEW: Add hidden option to hide column qty ordered on shipments.
+NEW: Add view of virtual stock into product list (when appropriate)
+NEW: Add warning on tasks when they are late (add also the warning tolerance parameter)
+NEW: Add weight/volume for one product into shipment export
+NEW: Add width and height on product table
+NEW: allow a document to be linked to project from another customer on config
+NEW: allow project to be shared across entities (for multicompany module)
+NEW: All variant of ckeditor config can be tested into the setup page of module.
+NEW: Can change dynamically number of records visible into lists.
+NEW: Can change type of extrafields for some combinations.
+NEW: Can define number of first and last line into import wizard.
+NEW: Can edit next execution date of a cron job.
+NEW: Can edit value date of a vat payment after recording it.
+NEW: Can filter modules on publisher
+NEW: Can filter on employee status when building emailing from users
+NEW: Can reopen an closed shipment
+NEW: Can search on shipments into the quick search box
+NEW: Can select dynamicaly number of lines to show on page on product, shipment, contact, orders, thirdparties 
+NEW: Can select fields to show on supplier orders list.
+NEW: Can select fields to show on list also for list of customer orders, shipments and invoices.
+NEW: Can select fields to show on proposal lists.
+NEW: Can select language from combo list on page to overwrite a translation
+NEW: Can select number of lines on page list for projects and tasks.
+NEW: Can use ^ and $ (to say start with or end with like regex syntax) into search fields when search field is text. Bonus: ^$ can filter all lines with field not defined.
+NEW: Clean and enhance code for cron engine
+NEW: Can decrease stock on shipment closing/classifying (only if module lot is not enabled for the moment)
+NEW: Disabled users are striked.
+NEW: Enhance navigation of project module
+NEW: fichinter lines ordered by rang AND DATE
+NEW: hidden conf to use input file multiple from mail form
+NEW: hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED allow supplier order even if no supplier price defined
+NEW: Hidden option MAIN_LANDING_PAGE to choose the first page to show after login works as a "global" option (llx_const) and as a "per user" option (llx_user_param).
+NEW: Holiday is a now a RH module. All RH module provides by default visilibity on users of its hierarchy.
+NEW: If error is reported during migration process, you can ignore it to avoid to be locked.
+NEW: if nb total of lines provided in print barre_liste, display in title
+NEW: If option to see non stable modules is on, add a filter into module list to filter on level (deprecated, experimental, development)
+NEW: Include number of linked files into badge counter of "Linked files" tab.
+NEW: Include sales representative into export of thirdparties
+NEW: Indicator on workboard are red/green if late or not.
+NEW: Into GED module, filename is truncated only if there is not enough space into table
+NEW: Introduce a predefined job to run database backup
+NEW: Introduce option MAIN_WEIGHT_DEFAULT_UNIT and MAIN_VOLUME_DEFAULT_UNIT to force output unit for weight and volume.
+NEW: Introduce position of records into dictionnary of type of contacts
+NEW: Link on user in leave context reach to leave tab.
+NEW: List of user in agenda view per user show photo thumb
+NEW: Margins module - Check/update buying price on invoice lines
+NEW: Merge all admin tools (system and module admin tools) into same entry "Admin tools", so now things are clear: All features restricted to an admin user is inside "setup" (for setup) or "admin tools" (for action tools) instead of 3 different entries.
+NEW: Merge all boxes "related objects" into one. This save a lot of room on most card and avoid often horizontal scoll.
+NEW: Moved code that deals with bank categories to BankCateg. Created BankCateg::fetchAll function
+NEW: Move Expense report menu from module to menu files
+NEW: Move HRM dictionary from module to core dictionaries
+NEW: Mutualize code to manage email substitution variables. Show available variables into page to edit email templates.
+NEW: Mutualize code: Use one call of function "addThumbs", when possible, to generate thumbs files instead of several call of "vignette" function.
+NEW: On translation admin page, admin can overwrite a translation value.
+NEW: Option MAIN_LIST_FILTER_ON_DAY is supported on proposal list
+NEW: Add reputation field for price supplier
+NEW: Rest API token is no more reset at each call. We can reset it with param reset=1 on login call.
+NEW: Selection of fields is available on member list.
+NEW: Show a badge with number of withdraw requests done on the withdraw tab of invoice.
+NEW: Add option to show detail per warehouse into reassort
+NEW: Show total number of modules into the module list
+NEW: Survey system has now a status like other objects. You can close or reopen a survey.
+NEW: The note on time spent can be entered when using the view per day.
+NEW: Use ellipsis truncation on too large left menu text
+NEW: When a new field to show into lists is selected, the form is automatically submited and field added.
+NEW: When creating a template invoice from a draft invoice, if there is link to contract on draft invoice, link is kept on template invoice.
+NEW: When emailing is not sent completely, show progression.
+
+For developers:
+
+NEW: Add a css class style called 'reposition', so when clicking on a link with this class will move scrollbarr to be placed at same page location.
+NEW: TimeZone can be supplied to mktime
+NEW: hook in shipment card
+NEW: Deprecated Societe::set_prospect_level, Societe::set_commnucation_level, Societe::set_OutstandingBill functions
+NEW: A module can add, into its import profiles, a sql request to execute at end of import. This allow to update dernormalized data after import.
+NEW: Add hook pdf_build_address 
+NEW: Add a parameter on graph function to show a generic graph when no data are available.
+NEW: Add $object in parameter of pdf_build_address so we could include hook into the function.
+NEW: Add a tool for developers to purge database with no loose of setup
+NEW: Can disable a module by renaming dir of module into module.disabled (this save time for maintenance when working with FTP).
+NEW: Created AccountLine::insert function and started using it for transaction creation
+NEW: Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown
+NEW: Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country
+NEW: prepare for additional warehouse statuses
+NEW: project sharing in select_projetcs_list function
+NEW: Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead
+NEW: Removed unused FormOrder::selectSourcesCommande function
+NEW: Renamed ActionComm::add function to ActionComm::create
+NEW: Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
+NEW: Rename path for generiN
+NEW: More phpunit tests. Include some REST API into automatic tests.
+
+
+WARNING: 
+
+Dolibarr 4.0 should be compatible with PHP 7 but more feedbacks are still expected to confirm that.
+
+Following changes may create regression for some external modules, but were necessary to make
+Dolibarr better:
+- Function log() of class CommandeFournisseur has been removed. Using it is no more required.
+- Class Resource was renamed into DolResource to avoid conflict with a reserved PHP word.
+- Method commonobject->add_thumb() has been renamed into commonobject->addThumbs().
+- Method select_type_comptes_financiers() has been renamed into selectTypeOfBankAccount() 
+- Property ->client that was deprecated 6 years ago, is replaced in all core code with ->thirdparty.
+- File '/core/tpl/document_actions_pre_headers.tpl.php' were renamed into '/core/actions_linkedfiles.inc.php'.
+So if you included it into your module, change your code like this to be compatible with all version:
+  $res=@include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
+  if (! $res) include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';
+
+
+
+***** ChangeLog for 3.9.4 compared to 3.9.3 *****
+FIX: #2853
+FIX: #3128
+FIX: #4447
+FIX: #5128 if create method return duplicated code error not use GETPOST in order to get a new code
+FIX: #5340
+FIX: #5473
+FIX: #5474 Country_id of "Don" object is still empty
+FIX: #5534
+FIX: #5535 bad dependency.
+FIX: #5537 AJAX project search does not work properly
+FIX: #5540 getFormMail is not registered as addReplace hook
+FIX: #5544 Disabled Contact still appear in lists to send emails
+FIX: #5549 getNomUrl tooltips show Order info even if user has no rights to read them
+FIX: #5568
+FIX: #5594
+FIX: #5629 PgSQL Interger string stylish error
+FIX: #5651
+FIX: #5660
+FIX: #5853 $conf->global->$calc==0 || $conf->global->$calc==1
+FIX: #5907
+FIX: #5966 Bug: getNomUrl tooltips show Proposal info even if user has no rights to read them
+FIX: #6051
+FIX: #6088
+FIX: Can correct stock of lot using eatby or sell by date
+FIX: Can make a movement on "out of sell" products
+FIX: cannot update bank account on invoice if module order not activated
+FIX: Can't create withdrawal document
+FIX: delete contract extrafields on contract deletion
+FIX: Direction of movement lost if an error occurs
+FIX: Error when CATEGORIE_RECURSIV_ADD is enabled and new category is daughter of an already linked to object
+FIX: export extrafields must not include separe type
+FIX: External user must not be able to edit its discounts
+FIX: Failed to export contact categories with contact extra fields
+FIX: header title in commercial area
+FIX: HT and TTC price should always be displayed together
+FIX: incoterms
+FIX: incoterms do not output into crabe invoice PDF
+FIX: in PgSQL no quote "word style" is permitted around column name
+FIX: Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of tracking email.
+FIX: margin tab on customer card must filter on current entity invoices
+FIX: missing column into SQL on thridparty list
+FIX: only show projects of related third if external user
+FIX: PgSQL Module Ressource list crash #5637
+FIX: php Strict
+FIX: Regression when deleting product
+FIX: Security to restrict email sending was not efficient
+FIX: tag for date rfc in odt substitution
+FIX: Update intervention lline crash with PgSQL
+FIX: update limit stock on product stock
+FIX: vat dictionary should allow enter and edit multiple values for localtaxes, separated by: (ex -19:-15)
+FIX: wrong test on dict.php
+
+
 ***** ChangeLog for 3.9.4 compared to 3.9.3 *****
 FIX: #2853
 FIX: #3128
@@ -206,7 +593,6 @@ FIX: VAT rate can be negative. Example spain selling to morroco.
 FIX: When cloning an order the order result from clone must be now
 FIX: When using option Price per level, when adding a predefined product, the vat for customer was not correctly set.
 
-
 ***** ChangeLog for 3.9.0 compared to 3.8.* *****
 For users:
 NEW: A new and more modern look for "eldy" theme.

README-FR.md

@@ -3,7 +3,7 @@
 Dolibarr ERP & CRM est un logiciel moderne pour gérer votre activité (société, association, auto-entrepreneurs, artisans). 
 Il est simple d'utilisation et modulaire, vous permettant de n'activez que les fonctions dont vous avez besoin (contacts, fournisseurs, factures, commandes, stocks, agenda, ...).
  
-![ScreenShot](http://www.dolibarr.org/images/dolibarr_screenshot1_640x480.png)
+![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_640x480.png)
 
 
 
@@ -23,7 +23,7 @@ Ubuntu) ou DoliRpm (la version tout-en-un de Dolibarr pour Fedora, Redhat,
 OpenSuse, Mandriva ou Mageia).
 
 Vous pouvez les télécharger depuis la rubrique *download* du portail officiel: 
-http://www.dolibarr.org/
+https://www.dolibarr.org/
 
 Si vous avez déjà installé un serveur Web avec PHP et une base de donnée (Mysql),
 vous pouvez installer Dolibarr avec cette version de la manière suivante:
@@ -139,13 +139,13 @@ Suivez le projet Dolibarr project sur les réseaux francophones
 
 - Facebook: <https://www.facebook.com/dolibarr.fr>
 - Google+: <https://plus.google.com/+DolibarrFrance>
-- Twitter: <http://www.twitter.com/dolibarr_france>
+- Twitter: <https://www.twitter.com/dolibarr_france>
 
 ou sur les réseaux anglophones
 
 - [Facebook](https://www.facebook.com/dolibarr)
 - [Google+](https://plus.google.com/+DolibarrOrg)
-- [Twitter](http://www.twitter.com/dolibarr)
+- [Twitter](https://www.twitter.com/dolibarr)
 - [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
 - [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
 - [GitHub](https://github.com/Dolibarr/dolibarr)

README.md

@@ -2,15 +2,15 @@
 
 ![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg) ![Downloads per day](https://img.shields.io/sourceforge/dm/dolibarr.svg)
 
-Dolibarr ERP & CRM is a modern software to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda, ...).
+Dolibarr ERP & CRM is a modern software package to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda, ...).
 
-It's an Open Source software (wrote in PHP language) designed for small and medium companies, foundation and freelances.
+It's an Open Source software (wrote in PHP language) designed for small, medium or large companies, foundations and freelances.
 
 You can freely use, study, modify or distribute it according to its Free Software licence.
 
 You can use it as a standalone application or as a web application to be able to access it from the Internet or a LAN.
 
-![ScreenShot](http://www.dolibarr.org/images/dolibarr_screenshot1_640x400.png)
+![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_640x400.png)
 
 ## LICENSE
 
@@ -24,7 +24,7 @@ Other licenses apply for some included dependencies. See [COPYRIGHT](https://git
 
 ### Download
 
-Releases can be downloaded from [official website](http://www.dolibarr.org/).
+Releases can be downloaded from [official website](https://www.dolibarr.org/).
 
 ### Simple setup
 
@@ -133,7 +133,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 
 ### Extending
 
-Dolibarr can be extended with a lot of other external modules from third party developers available at the [DoliStore](http://www.dolistore.com).
+Dolibarr can be extended with a lot of other external modules from third party developers available at the [DoliStore](https://www.dolistore.com).
 
 ## FUTURE
 
@@ -151,7 +151,7 @@ Administrator, user, developer and translator's documentations are available alo
 
 ## CONTRIBUTING
 
-See file [CONTRIBUTING](https://github.com/Dolibarr/dolibarr/blob/develop/CONTRIBUTING.md)
+See file [CONTRIBUTING](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)
 
 ## CREDITS
 
@@ -165,7 +165,7 @@ Follow Dolibarr project on:
 
 - [Facebook](https://www.facebook.com/dolibarr)
 - [Google+](https://plus.google.com/+DolibarrOrg)
-- [Twitter](http://www.twitter.com/dolibarr)
+- [Twitter](https://www.twitter.com/dolibarr)
 - [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
 - [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
 - [GitHub](https://github.com/Dolibarr/dolibarr)

build/composer/README

@@ -0,0 +1,10 @@
+
+To test upgrade of a lib with composer:
+
+composer update --no-dev --no-autoloader --dry-run ccampbell/chromephp
+
+To upgrade a lib with composer:
+
+composer update --no-dev --no-autoloader ccampbell/chromephp
+
+

build/debian/README.howto

@@ -14,8 +14,8 @@ with format .DEB (for Debian, Ubuntu, ...).
 # To build a debian package, you need first
 # With Ubuntu 12.04
 # apt-get install debhelper dpkg-source gpg lintian git-buildpackage pkg-php-tools schroot sbuild dh-linktree dh-make-php
-# With Debian 7
-# apt-get install debhelper dpkg gnupg lintian git-buildpackage pkg-php-tools schroot sbuild dh-linktree dh-make-php
+# With Ubuntu 14.04 ou Debian 7
+# apt-get install debhelper dpkg gnupg lintian git-buildpackage pkg-php-tools schroot sbuild dh-linktree dh-make-php packaging-dev
 
 
 # To generate gpg key for email used into changelog
@@ -49,6 +49,7 @@ Other example:
 export DEBFULLNAME="Laurent Destailleur" 
 export DEBEMAIL="eldy@destailleur.fr"
 
+export QUILT_PATCHES=debian/patches
 
 # To use Alioth.debian.org
 * Create an account login
@@ -162,6 +163,8 @@ Chroot env is stored into /srv/chroot directory.
 
 Pour lister les env chroot
 > schroot -l
+or
+> ls /srv/chroot
 
 Puis pour se connecter et préparer l'environnement 
 > schroot -c name_of_chroot
@@ -169,7 +172,7 @@ Puis pour se connecter et préparer l'environnement
 > vi /usr/sbin/policy-rc.d     and replace return code 101 (not allowed) into 0 (ok)
 > apt-get install links mysql-client
 
-Pour tester un package
+To test a package
 > On host server, stop any server on port 80 and 3306 (same port will be used by chroot env)
 > cp ../build-area/* /srv/chroot/unstable/tmp
 > sudo schroot -c name_of_chroot
@@ -210,14 +213,21 @@ If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VER
 
 * Some files are removed from archive by the get-orig-source.sh 
 
+* Modify the tag file to replace sRGB.icc with correct free version and rename file into
+tcpdf_x.y.z+dfsgw.orig.tar.xz
+(x.y.z = version, w start from 1 and is increased for each new import)
+
 * Staying into git root directory, run
-> git-import-orig -vv ../tcpdf_x.y.z+dfsg.orig.tar.xz --debian-branch=[master|jessie] --upstream-branch=[upstream|upstream-3.5.x]
+> git-import-orig -vv ../tcpdf_x.y.z+dfsgw.orig.tar.xz --debian-branch=[master|jessie] --upstream-branch=[upstream|upstream-3.5.x]
+and enter version when requested with format
+x.y.z+dfsgw
+(x.y.z = version, w start from 1 and is increased for each new import)
 
 Note: If there was errors solved manually, you may need to make a git commit
 
 * Add an entry into debian/changelog
-> dch -v x.y.z+dfsg-1 "My comment" will add entry.
-For example: dch -v x.y.z+dfsg-1 "New upstream release." for a new version
+> dch -v x.y.z+dfsgw-1 "My comment" will add entry.
+For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version
 Then modify changelog to replace "version" or "unstable" with "UNRELEASED".
 
 Warning: Date must have format reported by "date -R"
@@ -225,7 +235,9 @@ Warning: Name and email must match value into debian/control file (Entry added h
 
 * We try to build package
 > rm -fr ../build-area; 
-> git-buildpackage -us -uc --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-3.5.x]
+> git-buildpackage -us -uc --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-x.y.z]
+ou
+> git-buildpackage -us -uc --git-ignore-branch --git-upstream-branch=[upstream|upstream-x.y.z]
 
 Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-3.5.x]
 Note: You can use git-buildpackage -us -uc --git-ignore-new  if you want to test build with uncommited file
@@ -233,6 +245,9 @@ Note: You can use git-buildpackage -us -uc -d                if you want to test
 Note: Package is built into directory ../build-area
 Note: To compare 2 packages: debdiff package1.dsc package2.dsc
 
+* Test package
+> cp ../build-area/* /srv/chroot/unstable/tmp
+See rest of process into dedicated chapter "To test a package" to test it with debian unstable env
 
 * If package .deb is ok:
 Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit
@@ -290,8 +305,8 @@ x.y.z+dfsgw
 
 Note: If there was errors solved manually after get-orig-sources.sh, you may need to make a git commit
 
-* Fix debian/* files used to build package.
-Add an entry into debian/changelog
+* Update/fix debian/* files used to build package.
+At least, add an entry into debian/changelog
 > dch -v x.y.z+dfsgw-v "My comment" will add entry.
 For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version (x.y.z = version, w start from 1 and increased for each new import)
 Then check/modify changelog to replace "version" or "unstable" with "UNRELEASED".
@@ -300,17 +315,24 @@ Then check/modify also the user/date signature:
 - Name and email must match value into debian/control file (Entry added here is used by next step).
 
 
-To update dolibarr debian package when only files into debian has changed, or if you include manually backport:
+To update dolibarr debian package when only files into debian has changed:
 
 * Change files and commit.
 * Add a tag debian/x.y.z+dfsgw-2 (increase the last 1 into 2, 3...)
 
 
+To update dolibarr debian package when only files not into debian has changed:
+
+* Manually, add patches into debian/patches and update file debian/series, or do the 2 steps with "quilt import filepatch.patch"
+* You can test patching of serie with "quilt push" (autant de fois que de patch). Avec "quilt pop -a", on revien a l'état du upstream sans les patch.
+
 Once files has been prepared, it's time to test:
 
 * Try to build package
 > rm -fr ../build-area;
-> git-buildpackage -us -uc --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-3.5.x]
+> git-buildpackage -us -uc --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-3.5.x|3.5.5]
+ou
+> git-buildpackage -us -uc --git-ignore-branch --git-upstream-branch=[upstream|upstream-3.5.x|3.5.5]
 
 Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-3.5.x]
 Note: You can use git-buildpackage -us -uc --git-ignore-new  if you want to test build with uncommited file
@@ -319,6 +341,8 @@ Note: Package is built into directory ../build-area
 Note: To compare 2 packages: debdiff package1.dsc package2.dsc
 
 * Test package (see dedicated chapter to test it with debian unstable env)
+> cp ../build-area/* /srv/chroot/unstable/tmp
+See rest of process into dedicated chapter "To test a package" to test it with debian unstable env
 
 * If package .deb is ok:
 Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit
@@ -380,6 +404,6 @@ Cons are:
 - The patch include more than the only one security reported fxes
 
 So I just need to know if it's ok to push such a version 3.5.7 (fixes for 3.5.* branch) instead of only one fix for only the few (the only) reported debian bugs,
-since it provides more stability and is or me a more secured process.
+since it provides more stability and is for me a more secured process.
 "
 

build/debian/apache/.htaccess

@@ -6,3 +6,16 @@ Require all denied
 Order deny, allow
 Denied from all
 </IfVersion>
+
+
+# OPTIMIZE: To use cache on static pages (A259200 = 1 month, A7200 = 2 hours, A691600 = 8 days = recommanded for static resources).
+# Note that you must also enable the module mod_expires.
+#ExpiresActive On
+#ExpiresByType image/x-icon A2592000
+#ExpiresByType image/gif A2592000
+#ExpiresByType image/png A2592000
+#ExpiresByType image/jpeg A2592000
+#ExpiresByType text/css A2592000
+#ExpiresByType text/javascript A2592000
+#ExpiresByType application/x-javascript A2592000
+#ExpiresByType application/javascript A2592000

build/debian/control

@@ -13,7 +13,7 @@ Architecture: all
 Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
     php5-cli, 
 # Required PHP extensions
-    php5-mysql | php5-mysqli, php5-curl, php5-gd, php5-ldap, php5-geoip,
+    php5-mysql | php5-mysqli, php5-curl, php5-gd, php5-ldap,
 # Required PHP libraries
     php-pear, php-mail-mime, 
 #    php-tcpdf, libfpdi-php,
@@ -31,10 +31,10 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm |
     ${misc:Depends},
     ${perl:Depends}
 Recommends: apache2 | lighttpd | httpd
-Suggests: www-browser
+Suggests: www-browser, php5-geoip
 Description: Web based software to manage a company or foundation
- Dolibarr ERP & CRM is an easy to use open source/free software for small 
- and medium companies, foundations or freelances. It includes different 
+ Dolibarr ERP & CRM is an easy to use open source/free software package for 
+ companies, foundations or freelances. It includes different 
  features for Enterprise Resource Planning (ERP) and Customer Relationship
  Management (CRM) but also for different other activities.
  .

build/debian/copyright

@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Dolibarr
 Upstream-Contact: Laurent Destailleur <eldy@users.sourceforge.net>
-Source: http://www.dolibarr.org/files/stable/standard/
+Source: https://www.dolibarr.org/files/stable/standard/
 
 Files: *
 Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>

build/debian/dolibarr.lintian-overrides

@@ -5,3 +5,6 @@ dolibarr: desktop-command-not-in-package usr/share/applications/dolibarr.desktop
 # We use <IfVersion> to include the correct configuration for each apache version
 dolibarr: apache2-deprecated-auth-config Order
 dolibarr: apache2-deprecated-auth-config Allow
+# Ignore warning required for a good install process
+dolibarr: apache2-reverse-dependency-calls-wrapper-script postinst a2enmod
+dolibarr: apache2-reverse-dependency-calls-wrapper-script postinst a2enconf

build/debian/source/lintian-overrides

@@ -0,0 +1,10 @@
+# Remove warning, we want to keep both standard and minified sources.
+dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jquery/*
+dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jsgantt/*
+dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jstz/*
+# Those are false positives, the files are their own sources since
+# they are not minified
+source-is-missing htdocs/includes/jsgantt/jsgantt.js *
+source-is-missing htdocs/includes/jquery/plugins/colorpicker/jquery.colorpicker.js *
+source-is-missing htdocs/includes/jquery/plugins/select2/select2.js *
+source-is-missing htdocs/includes/jquery/plugins/select2/select2_locale_ar.js *

build/doxygen/doxygen_footer.html

@@ -4,17 +4,14 @@ File added into doxygen generated documentation
 
 
 <!-- Google analytics -->
-<script type="text/javascript">
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
 
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-9049390-1']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
+  ga('create', 'UA-9049390-16', 'auto');
+  ga('send', 'pageview');
 
 </script>
 <!-- End google analytics -->
@@ -22,7 +19,7 @@ File added into doxygen generated documentation
 
 <hr class="footer" />
 <address class="footer"><small>Generated on $datetime
-for <a href="http://www.dolibarr.org">$projectname</a> by Doxygen $doxygenversion </small></address>
+for <a href="https://www.dolibarr.org">$projectname</a> by Doxygen $doxygenversion </small></address>
 
 
 <!--  Google AdSense -->
@@ -35,11 +32,20 @@ google_ad_width = 468;
 google_ad_height = 60;
 //-->
 </script>
-<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
+<script type="text/javascript" src="https://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
 </div>
 <!-- End google adsense -->
 <br>
 
 </div>
+
+<!-- Twitter ad collector -->
+<script src="//platform.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>

build/doxygen/doxygen_header.html

@@ -1,6 +1,4 @@
-<!-- 
-File added into doxygen generated documentation
--->
+<!-- File added into doxygen generated documentation -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -14,7 +12,23 @@ File added into doxygen generated documentation
 <link href="tabs.css" rel="stylesheet" type="text/css" />
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <!-- End from dolibarr.org -->
+
+<!-- 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 -->
 </head>
+
 <body>
 <div id="top">
 

build/exe/doliwamp/Languages/MyCatalan.isl

@@ -20,7 +20,7 @@ DoYouWantToStart=Vol iniciar el proc
 TechnicalParameters=Par<61>metres t<>cnics
 IfFirstInstall=Si es tracta de la primera instal laci<63>, haur<75> d'especificar alguns par<61>metres t<>cnics. Si no els ent<6E>n, no sabeu o va a procedir a una actualitzaci<63>, deixi els camps amb els valors proposats per defecte.
 
-; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
+; WARNING !!! STRINGS HERE MUST BE LOWER THAN 70 CHARACTERS
 SMTPServer=Servidor SMTP (El seu o el del seu ISP, <20>nicament primera instal.laci<63>) :
 ApachePort=Puerto Apache (<28>nicament primera instal.laci<63>, normalment <20>s el 80) :
 MySqlPort=Puerto Mysql (<28>nicament primera instal.laci<63>, normalment <20>s el 3306) :
@@ -31,6 +31,7 @@ FailedToDeleteLock=FailedToDeleteLock=Error en l'eliminaci
 PortAlreadyInUse=Sembla que el port %1 ja est<73> sent utilitzat. Es recomana cancel<65>lar, tornar enrere i especificar un altre valor per al port% 2. Cancel<65>lar i escollir un altre valor?
 
 FirefoxDetected=S'ha detectat Firefox al seu ordinador. Voleu activar per defecte com a navegador per Dolibarr?
+ChromeDetected=S'ha detectat Chrome al seu ordinador. Voleu activar per defecte com a navegador per Dolibarr?
 ChooseDefaultBrowser=Esculli el seu navegador per defecte. Si no est<73> segur, simplement feu clic a Obrir:
 
 LaunchNow=Llan<61>ar ara Dolibarr

build/exe/doliwamp/Languages/MyEnglish.isl

@@ -31,6 +31,7 @@ FailedToDeleteLock=Failed to delete the file %1/www/dolibarr/install.lock. You c
 PortAlreadyInUse=Port %1 seems to be already in use. You should cancel to go back and choose another value for %2 port. Cancel choice and choose another value ?
 
 FirefoxDetected=Firefox has been detected on your computer. Would you like to use it as the default browser for Dolibarr ?
+ChromeDetected=Chrome has been detected on your computer. Would you like to use it as the default browser for Dolibarr ?
 ChooseDefaultBrowser=Please choose your default browser. If you are not sure, just click Open :
 
 LaunchNow=Launch Dolibarr now

build/exe/doliwamp/Languages/MyFrench.isl

@@ -21,8 +21,8 @@ TechnicalParameters=Param
 IfFirstInstall=S'il s'agit de la premi<6D>re installation, merci de sp<73>cifier ces quelques param<61>tres techniques. Si vous ne les comprennez pas, <20>tes non s<>r, ou proc<6F>dez <20> une mise <20> jour, laissez les champs avec les valeurs propos<6F>es par d<>faut.
 
 
-; WARNING !!! STRINGS FOR THIS 4 STRINGS MUST BE LOWER THAN 60 CHARACTERS
-SMTPServer=Serveur SMTP (le votre ou celui de votre FAI, premi<6D>re installation uniquement) :
+; WARNING !!! STRINGS FOR THIS 4 STRINGS MUST BE LOWER THAN 70 CHARACTERS
+SMTPServer=Serveur SMTP (le votre ou de votre FAI, premi<6D>re installation uniquement):
 ApachePort=Port Apache (premi<6D>re installation uniquement, le choix standard est 80):
 MySqlPort=Port Mysql (premi<6D>re installation uniquement, le choix standard est 3306):
 MySqlPassword=Mot de passe serveur+base MySql de root (premi<6D>re installation uniquement):
@@ -32,6 +32,7 @@ FailedToDeleteLock=Echec de la suppression du fichier %1/www/dolibarr/install.lo
 PortAlreadyInUse=Le port %1 semble d<>j<EFBFBD> utilis<69>. Il est recommand<6E> d'annuler pour revenir en arri<72>re et sp<73>cifier une autre valeur pour le port %2. Annuler le choix et choisir une autre valeur ?
 
 FirefoxDetected=Firefox a <20>t<EFBFBD> d<>tect<63> sur votre ordinateur. Voulez-vous en faire votre navigateur par d<>faut pour Dolibarr ?
+ChromeDetected=Chrome a <20>t<EFBFBD> d<>tect<63> sur votre ordinateur. Voulez-vous en faire votre navigateur par d<>faut pour Dolibarr ?
 ChooseDefaultBrowser=Merci de choisir votre navigateur par d<>faut. Si vous n'<27>tes pas s<>r, cliquez simplement sur Ouvrir :
 
 LaunchNow=Lancer Dolibarr maintenant

build/exe/doliwamp/Languages/MySpanish.isl

@@ -20,7 +20,7 @@ DoYouWantToStart=
 TechnicalParameters=Par<61>metros t<>cnicos
 IfFirstInstall=Si se trata de la primera instalaci<63>n, deber<65> especificar algunos par<61>metros t<>cnicos. Si no los entiende, no est<73> seguro o va a proceder a una actualizaci<63>n, deje los campos con los valores propuestos por defecto.
 
-; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
+; WARNING !!! STRINGS HERE MUST BE LOWER THAN 70 CHARACTERS
 SMTPServer=Servidor SMTP (El suyo o el de su ISP, <20>nicamente primera instalaci<63>n) :
 ApachePort=Puerto Apache (<28>nicamente primera instalaci<63>n, normalmente es el 80) :
 MySqlPort=Puerto Mysql (<28>nicamente primera instalaci<63>n, normalmente es el 3306) :
@@ -31,6 +31,7 @@ FailedToDeleteLock=Error en la eliminaci
 PortAlreadyInUse=Parece que el puerto %1 ya esta siendo usado. Se recomienda cancelar, volver atras y especificar otro valor para el puerto %2. <20>Cancelar y escojer otro valor?
 
 FirefoxDetected=Se ha detectado Firefox en su ordenador. Desea activarlo por defecto como navegador para Dolibarr ?
+ChromeDetected=Se ha detectado Chrome en su ordenador. Desea activarlo por defecto como navegador para Dolibarr ?
 ChooseDefaultBrowser=Escoja su navegador por defecto. Si no est<73> seguro, simplementa haga clic en Abrir :
 
 LaunchNow=Lanzar ahora Dolibarr

build/exe/doliwamp/dolibarr.conf.install

@@ -1,6 +1,6 @@
 Alias /dolibarr "WAMPROOT/www/dolibarr/htdocs/" 
 
-# NOTE:
+# NOTE FOR APACHE 2.2:
 # To restrict access to dolibarr from outside set lines
 #
 #	Order Deny,Allow
@@ -12,10 +12,18 @@ Alias /dolibarr "WAMPROOT/www/dolibarr/htdocs/"
 #	Order Allow,Deny 
 #	Allow from all
 #
+# NOTE FOR APACHE 2.3:
+# To restrict access to dolibarr from outside set lines
+#
+#   Require local
+#
+# instead of
+#
+#	Require all granted
+#
 
 <Directory "WAMPROOT/www/dolibarr/htdocs/">
 	Options Indexes FollowSymLinks MultiViews
 	AllowOverride all
-	Order Allow,Deny 
-	Allow from all
+	Require all granted
 </Directory>

build/exe/doliwamp/doliwamp.iss

@@ -32,7 +32,7 @@ AppPublisherURL=http://www.nltechno.com
 AppSupportURL=http://www.dolibarr.org
 AppUpdatesURL=http://www.dolibarr.org
 AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql softwares.
-AppCopyright=Copyright (C) 2008-2015 Laurent Destailleur, NLTechno
+AppCopyright=Copyright (C) 2008-2016 Laurent Destailleur, NLTechno
 DefaultDirName=c:\dolibarr
 DefaultGroupName=Dolibarr
 ;LicenseFile=COPYING
@@ -42,6 +42,7 @@ SolidCompression=yes
 WizardImageFile=build\exe\doliwamp\doliwamp.bmp
 WizardSmallImageFile=build\exe\doliwamp\doliwampsmall.bmp
 SetupIconFile=doc\images\dolibarr.ico
+;To say the installer must be ran as admin
 PrivilegesRequired=admin
 DisableProgramGroupPage=yes
 ChangesEnvironment=no
@@ -80,7 +81,7 @@ Name: "desktopicon"; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:
 Name: "{app}\logs"
 Name: "{app}\tmp"
 Name: "{app}\dolibarr_documents"
-Name: "{app}\bin\apache\apache2.2.11\logs"
+Name: "{app}\bin\apache\apache2.4.9\logs"
 
 [Files]
 ; Stop/start
@@ -99,27 +100,28 @@ Source: "build\exe\doliwamp\builddemosslfiles.bat.install"; DestDir: "{app}\"; F
 Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversion;
 ; PhpMyAdmin, Apache, Php, Mysql
 ; Put here path of Wampserver applications
-; Value OK: apache 2.2.6, php 5.2.5 (5.2.11, 5.3.0 and 5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45 or 5.1.36
-; Value OK: apache 2.2.11, php 5.3.0 (if no php_exif, php_pgsql, php_zip), mysql 5.0.45 or 5.1.36
-Source: "C:\Program Files\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log,darkblue_orange"
-Source: "C:\Program Files\Wamp\bin\apache\apache2.2.11\*.*"; DestDir: "{app}\bin\apache\apache2.2.11"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
-Source: "C:\Program Files\Wamp\bin\php\php5.3.0\*.*"; DestDir: "{app}\bin\php\php5.3.0"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
+; Value OK: apache 2.2.6, php 5.2.5 (5.2.11, 5.3.0 and 5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45
+; Value OK: apache 2.2.11, php 5.3.0 (if no php_exif, php_pgsql, php_zip), mysql 5.0.45
+; Value ???: apache 2.4.19, php 5.5.12, mysql 5.0.45 instead of 5.6.17 (wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe)
+Source: "C:\Program Files\Wamp\apps\phpmyadmin4.1.14\*.*"; DestDir: "{app}\apps\phpmyadmin4.1.14"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log,darkblue_orange"
+Source: "C:\Program Files\Wamp\bin\apache\apache2.4.9\*.*"; DestDir: "{app}\bin\apache\apache2.4.9"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
+Source: "C:\Program Files\Wamp\bin\php\php5.5.12\*.*"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
 Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
 ; Mysql data files (does not overwrite if exists)
 Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db"
 ; Dolibarr
 Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,nltechno*\*,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php"
-Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,dbmodel\*,fpdf\*,initdata\*,iso-normes\*,licence\*,phpcheckstyle\*,phpunit\*,samples\*,test\*,uml\*,vagrant\*,xdebug\*"
+Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,dbmodel\*,fpdf\*,initdata\*,initdemo\*,iso-normes\*,licence\*,phpcheckstyle\*,phpunit\*,samples\*,test\*,uml\*,vagrant\*,xdebug\*"
 Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*,images\dolibarr_screenshot2.png,images\dolibarr_screenshot3.png,images\dolibarr_screenshot4.png,images\dolibarr_screenshot5.png,images\dolibarr_screenshot6.png,images\dolibarr_screenshot7.png,images\dolibarr_screenshot8.png,images\dolibarr_screenshot9.png,images\dolibarr_screenshot10.png,images\dolibarr_screenshot11.png,images\dolibarr_screenshot12.png"
 Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php"
 Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,default.properties,install.lock"
 ; Config files
 Source: "build\exe\doliwamp\phpmyadmin.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\dolibarr.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\config.inc.php.install"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.2.11\conf"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\config.inc.php.install"; DestDir: "{app}\apps\phpmyadmin4.1.14"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.9\conf"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.3.0"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\index.php.install"; DestDir: "{app}\www"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\install.forced.php.install"; DestDir: "{app}\www\dolibarr\htdocs\install"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\openssl.conf"; DestDir: "{app}"; Flags: ignoreversion;
@@ -145,6 +147,16 @@ Name: "{userdesktop}\Dolibarr Help center"; Filename: "{app}\rundolihelp.bat"; W
 ;Name: "{userstartup}\DoliWamp server"; Filename: "{app}\startdoliwamp.bat"; WorkingDir: "{app}"; Flags: runminimized; IconFilename: {app}\www\dolibarr\doc\images\dolibarr.ico
 
 
+[Registry]
+; Add "run as admin" flag. Same than command line: reg add "HKCU\Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" /v "<Path to your exe>" /t REG_SZ /d RUNASADMIN
+Root: "HKLM"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"; ValueType: string; ValueName: "{app}\startdoliwamp.bat"; ValueData: "RUNASADMIN";
+Root: "HKLM"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"; ValueType: string; ValueName: "{app}\stopdoliwamp.bat"; ValueData: "RUNASADMIN";
+Root: "HKLM32"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"; ValueType: string; ValueName: "{app}\startdoliwamp.bat"; ValueData: "RUNASADMIN";
+Root: "HKLM32"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"; ValueType: string; ValueName: "{app}\stopdoliwamp.bat"; ValueData: "RUNASADMIN";
+Root: "HKLM64"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"; ValueType: string; ValueName: "{app}\startdoliwamp.bat"; ValueData: "RUNASADMIN"; Check: IsWin64
+Root: "HKLM64"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"; ValueType: string; ValueName: "{app}\stopdoliwamp.bat"; ValueData: "RUNASADMIN"; Check: IsWin64
+
+
 [Code]
 
 //variables globales
@@ -195,10 +207,10 @@ end;
 procedure InitializeWizard();
 begin
   //version des applis, a modifier pour chaque version de WampServer 2
-  apacheVersion := '2.2.11';
-  phpVersion := '5.3.0' ;
+  apacheVersion := '2.4.9';
+  phpVersion := '5.5.12' ;
   mysqlVersion := '5.0.45';
-  phpmyadminVersion := '3.2.0.1';
+  phpmyadminVersion := '4.1.14';
 
   smtpServer := 'localhost';
   apachePort := '80';
@@ -232,9 +244,9 @@ begin
         if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\MSCRM','SMTPServer', value) then
         begin
           if value <> '' then smtpServer:=value;
-        end
-      end
-    end
+        end;
+      end;
+    end;
   end;
 
   if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\NLTechno\DoliWamp','apachePort', value) then
@@ -255,14 +267,13 @@ begin
 
   // Prepare an object calle "Page" of type wpInstalling.
   // Object will be show later in NextButtonClick function.
-  Page := CreateInputQueryPage(wpInstalling,
-  CustomMessage('TechnicalParameters'), '',
-  CustomMessage('IfFirstInstall'));
+  Page := CreateInputQueryPage(wpInstalling, CustomMessage('TechnicalParameters'), '', CustomMessage('IfFirstInstall'));
 
   // TODO Add control differently if first install or update
   if firstinstall
   then
   begin
+    // False means it's not a password edit
     Page.Add(CustomMessage('SMTPServer'), False);
     Page.Add(CustomMessage('ApachePort'), False);
     Page.Add(CustomMessage('MySqlPort'), False);
@@ -270,6 +281,7 @@ begin
   end
   else
   begin
+    // False means it's not a password edit
     Page.Add(CustomMessage('SMTPServer'), False);
     Page.Add(CustomMessage('ApachePort'), False);
     Page.Add(CustomMessage('MySqlPort'), False);
@@ -309,8 +321,7 @@ function NextButtonClick(CurPageID: Integer): Boolean;
 var myResult: Integer;
 var res: Boolean;
 var paramok: Boolean;
-var datadirold: String;
-var datadirnew: String;
+var datadir: String;
 var exedirold: String;
 var exedirnew: String;
 var themessage: String;
@@ -329,11 +340,23 @@ begin
     winPath := ExpandConstant('{win}');
     pathWithSlashes := path;
     StringChange (pathWithSlashes, '\','/');
-    datadirold := pathWithSlashes+'/bin/mysql/mysql5.0.45/data';
-    datadirnew := pathWithSlashes+'/bin/mysql/data';
+    datadir := pathWithSlashes+'/bin/mysql/data';
     exedirold := pathWithSlashes+'/bin/mysql/mysql5.0.45';
     exedirnew := pathWithSlashes+'/bin/mysql/mysql5.0.45';
 
+
+    //----------------------------------------------
+    // Test if msvcr110 DLL has been installed
+    //----------------------------------------------
+	
+    if not FileExists ('c:/windows/system32/msvcr110.dll') and not FileExists ('c:/windows/sysWOW64/msvcr110.dll') and not FileExists ('c:/winnt/system32/msvcr110.dll') and not FileExists ('c:/winnt/sysWOW64/msvcr110.dll') then
+    begin
+      // TODO Copy file or ask to install package ?
+      //CustomMessage('YouWillInstallDoliWamp')+#13#13
+      MsgBox('The package vcredist_x86.exe must have been installed first. It seems it is not. Please install it first from <a href="http://ccc">http://www.microsoft.com/en-us/download/details.aspx?id=30679</a> then restart DoliWamp installation/upgrade.',mbInformation,MB_OK);
+    end;
+
+
     // If we have a new database version, we should only copy old my.ini file into new directory
     // and change only all basedir= strings to use new version. Like this, data dir is still correct.
     // Install of service and stop/start scripts are already rebuild by installer.
@@ -401,7 +424,7 @@ begin
     begin
       themessage := FmtMessage(CustomMessage('FailedToDeleteLock'),[pathWithSlashes]);
  		  MsgBox(themessage,mbInformation,MB_OK);
-    end
+    end;
 
 
 		// Check if parameters already defined in conf.php file
@@ -522,6 +545,20 @@ begin
 	    begin
 	      //navigateur
 	      browser := 'iexplore.exe';
+	      
+	      if browser = 'iexplore.exe' then
+	      begin
+	        if FileExists (pfPath+'/Google/Chrome/Application/chrome.exe')  then
+	        begin
+	          if MsgBox(CustomMessage('ChromeDetected'),mbConfirmation,MB_YESNO) = IDYES then
+	          begin
+	            browser := pfPath+'/Google/Chrome/Application/chrome.exe';
+	          end;
+	        end;
+	      end;
+
+	      if browser = 'iexplore.exe' then
+	      begin
 		    if FileExists (pfPath+'/Mozilla Firefox/firefox.exe')  then
 		    begin
 		      if MsgBox(CustomMessage('FirefoxDetected'),mbConfirmation,MB_YESNO) = IDYES then
@@ -529,6 +566,8 @@ begin
 		        browser := pfPath+'/Mozilla Firefox/firefox.exe';
 		      end;
 		    end;
+		  end;
+	      
 	      if browser = 'iexplore.exe' then
 	      begin
             if FileExists (pfPath+'/Internet Explorer/iexplore.exe')  then
@@ -558,7 +597,7 @@ begin
 	      StringChangeEx (srcContents, 'WAMPAPACHEPORT', myporta, True);
 	      StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
 	      SaveStringToFile(destFileA,srcContents, False);
-	    end
+	    end;
 
 
       if MsgBox(CustomMessage('DoliWampWillStartApacheMysql'),mbConfirmation,MB_YESNO) = IDYES then
@@ -581,7 +620,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPPHPMYADMINVERSION', phpmyadminVersion, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end
+		    end;
 		    DeleteFile(srcFile);
 		
 		
@@ -593,7 +632,9 @@ begin
 		    destFile := pathWithSlashes+'/alias/dolibarr.conf';
 		    srcFile := pathWithSlashes+'/alias/dolibarr.conf.install';
 		
-		    if not FileExists (destFile) and FileExists(srcFile) then
+		    if FileExists(srcFile) then
+		    begin
+		      if not FileExists (destFile) then
 		      begin
   		        LoadStringFromFile (srcFile, srcContents);
 		
@@ -602,6 +643,18 @@ begin
 		
 		        SaveStringToFile(destFile, srcContents, False);
 		      end
+		      else
+		      begin
+		        // We must replace to use format 2.4 of apache
+	            DeleteFile(destFile);
+  		        LoadStringFromFile (srcFile, srcContents);
+		
+		        StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
+		        StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
+		
+		        SaveStringToFile(destFile, srcContents, False);
+		      end;
+		    end;
 		    DeleteFile(srcFile);
 		
 		
@@ -614,14 +667,25 @@ begin
 		    destFile := pathWithSlashes+'/apps/phpmyadmin'+phpmyadminVersion+'/config.inc.php';
 		    srcFile := pathWithSlashes+'/apps/phpmyadmin'+phpmyadminVersion+'/config.inc.php.install';
 		
-		    if not FileExists (destFile) and FileExists (srcFile) then
+		    if FileExists(srcFile) then
+		    begin
+	  	      if not FileExists (destFile) then
 		      begin
-	        // sinon on prends le fichier par defaut
 	            LoadStringFromFile (srcFile, srcContents);
 	            StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
 	            StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
 	            SaveStringToFile(destFile,srcContents, False);
 		      end
+		      else
+		      begin
+		        // We must replace to use format 2.4 of apache
+	            DeleteFile(destFile);
+	            LoadStringFromFile (srcFile, srcContents);
+	            StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
+	            StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
+	            SaveStringToFile(destFile,srcContents, False);
+		      end;
+		    end;
 		
 		
 		
@@ -644,7 +708,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end
+		    end;
 		
 		
 		
@@ -663,9 +727,10 @@ begin
 		      //installDir et version de php
 		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
 		      StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
+		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end
+		    end;
 		
 		
 		
@@ -697,7 +762,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPAPACHEPORT', myporta, True);
 		      StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
 		      SaveStringToFile(destFile, srcContents, False);
-		    end
+		    end;
 		
 		
 		
@@ -720,7 +785,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end
+		    end;
 		
 		
 		
@@ -736,32 +801,12 @@ begin
 		      LoadStringFromFile (srcFile, srcContents);
 		
 		      //version de apache et mysql
+		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
 		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
 		      StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end
-		
-		
-		
-		    //----------------------------------------------
-		    // Create file install_services_auto.bat (always)
-		    //----------------------------------------------
-		
-		    destFile := pathWithSlashes+'/install_services_auto.bat';
-		    srcFile := pathWithSlashes+'/install_services_auto.bat.install';
-		
-		    if FileExists (srcFile) then
-		    begin
-		      LoadStringFromFile (srcFile, srcContents);
-		
-		      //version de apache et mysql
-		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
-		      StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
-		
-		      SaveStringToFile(destFile,srcContents, False);
-		    end
-		
+		    end;
 		
 		
 		
@@ -777,11 +822,12 @@ begin
 		      LoadStringFromFile (srcFile, srcContents);
 		
 		      //version de apache et mysql
+		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
 		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
 		      StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end
+		    end;
 		
 		
 		
@@ -802,7 +848,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end
+		    end;
 		
 		
 		    //----------------------------------------------
@@ -823,7 +869,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end
+		    end;
 		
 		
 		    //----------------------------------------------
@@ -844,7 +890,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end
+		    end;
 		    
 		
 		    //----------------------------------------------
@@ -863,7 +909,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end
+		    end;
 
 		
 		    //----------------------------------------------
@@ -880,7 +926,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPSMTP', mysmtp, True);
               StringChangeEx (srcContents, 'WAMPPHPVERSION', phpVersion, True);
 		      SaveStringToFile(destFile,srcContents, False);
-		    end
+		    end;
 		
 		    //----------------------------------------------
 		    // Create file php.ini in apache (if not exists)
@@ -896,7 +942,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPSMTP', mysmtp, True);
               StringChangeEx (srcContents, 'WAMPPHPVERSION', phpVersion, True);
 		      SaveStringToFile(destFile,srcContents, False);
-		    end
+		    end;
 		
 		
 		
@@ -938,7 +984,7 @@ begin
 
       	res := False;
 		  	
-		  end
+		  end;
       
     end
     else
@@ -948,9 +994,9 @@ begin
 		  	
 		  	res := False;
 
-    end
+    end;
     
-  end
+  end;
 
 
   Result := res;
@@ -965,7 +1011,6 @@ end;
 procedure DeinitializeSetup();
 begin
 //  DeleteFile(path+'\install_services.bat');
-//  DeleteFile(path+'\install_services_auto.bat');
 end;
 
 

build/exe/doliwamp/httpd.conf.install

@@ -66,19 +66,23 @@ Listen WAMPAPACHEPORT
 #
 LoadModule actions_module modules/mod_actions.so
 LoadModule alias_module modules/mod_alias.so
+LoadModule allowmethods_module modules/mod_allowmethods.so
 LoadModule asis_module modules/mod_asis.so
 LoadModule auth_basic_module modules/mod_auth_basic.so
 #LoadModule auth_digest_module modules/mod_auth_digest.so
 #LoadModule authn_anon_module modules/mod_authn_anon.so
 #LoadModule authn_dbm_module modules/mod_authn_dbm.so
-LoadModule authn_default_module modules/mod_authn_default.so
 LoadModule authn_file_module modules/mod_authn_file.so
+LoadModule authz_core_module modules/mod_authz_core.so
 #LoadModule authz_dbm_module modules/mod_authz_dbm.so
-LoadModule authz_default_module modules/mod_authz_default.so
+#LoadModule authz_default_module modules/mod_authz_default.so
 LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
 LoadModule authz_host_module modules/mod_authz_host.so
 LoadModule authz_user_module modules/mod_authz_user.so
 LoadModule autoindex_module modules/mod_autoindex.so
+LoadModule buffer_module modules/mod_buffer.so
+LoadModule cache_module modules/mod_cache.so
+LoadModule cache_disk_module modules/mod_cache_disk.so
 #LoadModule cern_meta_module modules/mod_cern_meta.so
 LoadModule cgi_module modules/mod_cgi.so
 #LoadModule dav_module modules/mod_dav.so
@@ -96,23 +100,23 @@ LoadModule isapi_module modules/mod_isapi.so
 LoadModule log_config_module modules/mod_log_config.so
 LoadModule mime_module modules/mod_mime.so
 #LoadModule mime_magic_module modules/mod_mime_magic.so
+LoadModule negotiation_module modules/mod_negotiation.so
 #LoadModule proxy_module modules/mod_proxy.so
 #LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
 #LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
 #LoadModule proxy_connect_module modules/mod_proxy_connect.so
 #LoadModule proxy_http_module modules/mod_proxy_http.so
 #LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
-LoadModule negotiation_module modules/mod_negotiation.so
 LoadModule rewrite_module modules/mod_rewrite.so
 LoadModule setenvif_module modules/mod_setenvif.so
 #LoadModule speling_module modules/mod_speling.so
+#LoadModule ssl_module modules/mod_ssl.so
 LoadModule status_module modules/mod_status.so
 #LoadModule unique_id_module modules/mod_unique_id.so
 LoadModule userdir_module modules/mod_userdir.so
 #LoadModule usertrack_module modules/mod_usertrack.so
 LoadModule vhost_alias_module modules/mod_vhost_alias.so
-#LoadModule ssl_module modules/mod_ssl.so
-LoadModule php5_module "WAMPROOT/bin/php/phpWAMPPHPVERSION/php5apache2_2.dll"
+LoadModule php5_module "WAMPROOT/bin/php/phpWAMPPHPVERSION/php5apache2_4.dll"
 
 #
 # ExtendedStatus controls whether Apache will generate "full" status
@@ -123,9 +127,9 @@ ExtendedStatus On
 
 <Location /server-status>
 SetHandler server-status
-Order Deny,Allow
-Deny from all
-Allow from localhost, 127.0.0.1
+Require local
+#Require ip 1.2.3.4
+#Require host 1.2.3.4
 </Location>
 
 
@@ -211,9 +215,7 @@ KeepAliveTimeout 30
 <Directory />
     Options FollowSymLinks
     AllowOverride None
-    Order deny,allow
-    Deny from all
-    Satisfy all
+    Require all denied
 </Directory>
 
 #
@@ -253,9 +255,13 @@ KeepAliveTimeout 30
     # Controls who can get stuff from this server.
     #
 #   onlineoffline tag - don't remove
-    Order Deny,Allow
-    Deny from all
-    Allow from 127.0.0.1
+	
+	Require all granted
+    
+    <RequireAny>
+		Require ip 127.0.0.1
+		Require host localhost
+	</RequireAny>
 
 </Directory>
 
@@ -272,8 +278,7 @@ KeepAliveTimeout 30
 # viewed by Web clients. 
 #
 <FilesMatch "^\.ht">
-    Order allow,deny
-    Deny from all
+    Require all denied
 </FilesMatch>
 
 #
@@ -359,8 +364,7 @@ LogLevel warn
 <Directory "cgi-bin">
     AllowOverride None
     Options None
-    Order allow,deny
-    Allow from all
+    Require all granted
 </Directory>
 
 # 
@@ -410,7 +414,7 @@ LogLevel warn
 # keep browsers from trying to display binary files as though they are
 # text.
 #
-DefaultType text/plain
+#DefaultType text/plain
 
 <IfModule mime_module>
     #
@@ -745,7 +749,7 @@ SSLCertificateKeyFile "WAMPROOT/myserver.key"
 # You can also set this with constant MAIN_OPTIMIZE_SPEED and bit 2 set. 
 #TODO
 
-# OPTIMIZE: To use cache on static pages (A259200 = 1 month).
+# OPTIMIZE: To use cache on static pages (A259200 = 1 month, A7200 = 2 hours, A691600 = 8 days = recommanded for static resources).
 # Note that you must also enable the module mod_expires.
 #ExpiresActive On
 #ExpiresByType image/x-icon A2592000

build/exe/doliwamp/install_services.bat.install

@@ -8,6 +8,8 @@ echo ---- Execute install_services.bat >> doliwamp.log 2>>&1
 REM NET STOP doliwampapache
 REM NET STOP doliwampmysqld 
 
+cd "WAMPROOT"
+
 REM Apache x.x
 .\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k install -n doliwampapache
 REM reg add HKLM\SYSTEM\CurrentControlSet\Services\doliwampapache /V Start /t REG_DWORD /d 3 /f
@@ -19,3 +21,5 @@ REM Mysql 5.1+
 REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --install doliwampmysqld
 
 echo ---- End script >> doliwamp.log 2>>&1
+
+REM pause

build/exe/doliwamp/my.ini.install

@@ -69,7 +69,7 @@ port=WAMPMYSQLPORT
 
 
 #Path to installation directory. All paths are usually resolved relative to this.
-basedir=WAMPROOT/bin/mysql/mysql5.0.45
+basedir=WAMPROOT/bin/mysql/mysqlWAMPMYSQLVERSION
 
 #log file
 log-error=WAMPROOT/logs/mysql.log
@@ -77,10 +77,6 @@ log-error=WAMPROOT/logs/mysql.log
 #Path to the database root
 datadir=WAMPROOT/bin/mysql/data
 
-# The default character set that will be used when a new schema or table is
-# created and no character set is defined
-default-character-set=latin1
-
 # The default storage engine that will be used when create new tables when
 default-storage-engine=INNODB
 
@@ -101,13 +97,6 @@ max_connections=255
 # slowdown instead of a performance improvement.
 query_cache_size=8M
 
-# The number of open tables for all threads. Increasing this value
-# increases the number of file descriptors that mysqld requires.
-# Therefore you have to make sure to set the amount of open files
-# allowed to at least 4096 in the variable "open-files-limit" in
-# section [mysqld_safe]
-table_cache=510
-
 # Maximum size for internal (in-memory) temporary tables. If a table
 # grows larger than this value, it is automatically converted to disk
 # based table This limitation is for a single table. There can be many
@@ -125,18 +114,6 @@ thread_cache_size=12
 
 #*** MyISAM Specific options
 
-# The maximum size of the temporary file MySQL is allowed to use while
-# recreating the index (during REPAIR, ALTER TABLE or LOAD DATA INFILE.
-# If the file-size would be bigger than this, the index will be created
-# through the key cache (which is slower).
-myisam_max_sort_file_size=100G
-
-# If the temporary file used for fast index creation would be bigger
-# than using the key cache by the amount specified here, then prefer the
-# key cache method.  This is mainly used to force long character keys in
-# large tables to use the slower key cache method to create the index.
-myisam_max_extra_sort_file_size=100G
-
 # If the temporary file used for fast index creation would be bigger
 # than using the key cache by the amount specified here, then prefer the
 # key cache method.  This is mainly used to force long character keys in
@@ -170,13 +147,6 @@ sort_buffer_size=203K
 # and speed up some things.
 #skip-innodb
 
-# Additional memory pool that is used by InnoDB to store metadata
-# information.  If InnoDB requires more memory for this purpose it will
-# start to allocate it from the OS.  As this is fast enough on most
-# recent operating systems, you normally do not need to change this
-# value. SHOW INNODB STATUS will display the current amount used.
-innodb_additional_mem_pool_size=2M
-
 # If set to 1, InnoDB will flush (fsync) the transaction logs to the
 # disk at each commit, which offers full ACID behavior. If you are
 # willing to compromise this safety, and you are running small
@@ -226,7 +196,7 @@ port=WAMPMYSQLPORT
 
 
 #Path to installation directory. All paths are usually resolved relative to this.
-basedir=WAMPROOT/bin/mysql/mysql5.0.45
+basedir=WAMPROOT/bin/mysql/mysqlWAMPMYSQLVERSION
 
 #log file
 log-error=WAMPROOT/logs/mysql.log
@@ -234,10 +204,6 @@ log-error=WAMPROOT/logs/mysql.log
 #Path to the database root
 datadir=WAMPROOT/bin/mysql/data
 
-# The default character set that will be used when a new schema or table is
-# created and no character set is defined
-default-character-set=latin1
-
 # The default storage engine that will be used when create new tables when
 default-storage-engine=INNODB
 
@@ -258,13 +224,6 @@ max_connections=255
 # slowdown instead of a performance improvement.
 query_cache_size=8M
 
-# The number of open tables for all threads. Increasing this value
-# increases the number of file descriptors that mysqld requires.
-# Therefore you have to make sure to set the amount of open files
-# allowed to at least 4096 in the variable "open-files-limit" in
-# section [mysqld_safe]
-table_cache=510
-
 # Maximum size for internal (in-memory) temporary tables. If a table
 # grows larger than this value, it is automatically converted to disk
 # based table This limitation is for a single table. There can be many
@@ -282,18 +241,6 @@ thread_cache_size=12
 
 #*** MyISAM Specific options
 
-# The maximum size of the temporary file MySQL is allowed to use while
-# recreating the index (during REPAIR, ALTER TABLE or LOAD DATA INFILE.
-# If the file-size would be bigger than this, the index will be created
-# through the key cache (which is slower).
-myisam_max_sort_file_size=100G
-
-# If the temporary file used for fast index creation would be bigger
-# than using the key cache by the amount specified here, then prefer the
-# key cache method.  This is mainly used to force long character keys in
-# large tables to use the slower key cache method to create the index.
-myisam_max_extra_sort_file_size=100G
-
 # If the temporary file used for fast index creation would be bigger
 # than using the key cache by the amount specified here, then prefer the
 # key cache method.  This is mainly used to force long character keys in
@@ -327,13 +274,6 @@ sort_buffer_size=203K
 # and speed up some things.
 #skip-innodb
 
-# Additional memory pool that is used by InnoDB to store metadata
-# information.  If InnoDB requires more memory for this purpose it will
-# start to allocate it from the OS.  As this is fast enough on most
-# recent operating systems, you normally do not need to change this
-# value. SHOW INNODB STATUS will display the current amount used.
-innodb_additional_mem_pool_size=2M
-
 # If set to 1, InnoDB will flush (fsync) the transaction logs to the
 # disk at each commit, which offers full ACID behavior. If you are
 # willing to compromise this safety, and you are running small

build/exe/doliwamp/phpmyadmin.conf.install

@@ -1,22 +1,29 @@
 Alias /phpmyadmin "WAMPROOT/apps/phpmyadminWAMPPHPMYADMINVERSION/" 
 
-# to give access to phpmyadmin from outside 
-# replace the lines
+# NOTE FOR APACHE 2.2:
+# To grant access to dolibarr from outside set lines
+#
+#	Order Allow,Deny 
+#	Allow from all
+#
+# instead of
 #
 #	Order Deny,Allow
 #	Deny from all
 #	Allow from 127.0.0.1
 #
-# by
+# NOTE FOR APACHE 2.3:
+# To grant access to dolibarr from outside set lines
 #
-#        Order Allow,Deny 
-#   Allow from all
+#	Require all granted
+#
+# instead of
+#
+#	Require local
 #
 
 <Directory "WAMPROOT/apps/phpmyadminWAMPPHPMYADMINVERSION/">
     Options Indexes FollowSymLinks MultiViews
     AllowOverride all
-        Order Deny,Allow
-	Deny from all
-	Allow from 127.0.0.1
+    Require local
 </Directory>

build/exe/doliwamp/startdoliwamp.bat

@@ -10,9 +10,11 @@ NET START doliwampapache >> doliwamp.log 2>>&1
 echo NET START doliwampmysqld >> doliwamp.log 2>>&1
 NET START doliwampmysqld >> doliwamp.log 2>>&1
 
+REM You can also check logs into c:/dolibarr/logs if start fails
+
 echo Please wait...
 echo ---- End script >> doliwamp.log 2>>&1
 
 REM sleep is not a Windows commande
-REM sleep 1
-ping 1.1.1.1 -n 1 -w 1000 > nul
+REM sleep 2
+ping 127.0.0.1 -n 2 -w 1000 > nul

build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install

@@ -13,5 +13,6 @@ echo
 
 echo Running Mysql as user process (this process does not return so we use "start")
 start WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini --console
+REM start WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini --console
 
 pause

build/exe/doliwamp/stopdoliwamp.bat

@@ -16,3 +16,5 @@ echo ---- End script >> doliwamp.log 2>>&1
 REM sleep is not a Windows command
 REM sleep 1
 ping 1.1.1.1 -n 1 -w 1000 > nul
+
+REM pause

build/exe/doliwamp/uninstall_services.bat.install

@@ -3,10 +3,19 @@ REM --------------------------------------------------------
 REM This script install Apache and Mysql DoliWamp services
 REM --------------------------------------------------------
 
+cd "WAMPROOT"
+
 echo ---- Execute uninstall_services.bat >> doliwamp.log 2>>&1
 NET STOP doliwampapache
 .\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k uninstall -n doliwampapache
+
 NET STOP doliwampmysqld 
+REM Mysql 5.0-
 .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --remove doliwampmysqld
+REM Mysql 5.1+
+REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --remove doliwampmysqld
+
 REM wampmanager.exe -quit -id={doliwampserver}
 echo ---- End script >> doliwamp.log 2>>&1
+
+REM pause

build/generate_filelist_xml.php

@@ -32,11 +32,33 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
     exit;
 }
 
+require_once($path."../htdocs/master.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
-// Main
+
+/*
+ * Main
+ */
+
+if (empty($argv[1])) 
+{
+    print "Usage: ".$script_file." release=x.y.z\n";
+    exit -1;
+}
 parse_str($argv[1]);
+
+if ($release != DOL_VERSION)
+{
+    print 'Error: release is not version declared into filefunc.in.php.'."\n";
+    exit -1;
+}
+
 //$outputfile=dirname(__FILE__).'/../htdocs/install/filelist-'.$release.'.xml';
-$outputfile=dirname(__FILE__).'/../htdocs/install/filelist.xml';
+$outputdir=dirname(__FILE__).'/../htdocs/install';
+print 'Delete current files '.$outputdir.'/filelist*.xml'."\n";
+dol_delete_file($outputdir.'/filelist*.xml',0,1,1);
+
+$outputfile=$outputdir.'/filelist-'.$release.'.xml';
 $fp = fopen($outputfile,'w');
 fputs($fp, '<?xml version="1.0" encoding="UTF-8" ?>'."\n");
 fputs($fp, '<checksum_list version="'.$release.'">'."\n");

build/makepack-dolibarr.pl

@@ -53,7 +53,7 @@ if (-d "/usr/src/RPM")      { $RPMDIR="/usr/src/RPM"; } # mandrake
 
 
 use vars qw/ $REVISION $VERSION /;
-$VERSION="3.3";
+$VERSION="4.0";
 
 
 
@@ -159,6 +159,7 @@ $REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
 if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
 $FILENAMETGZ2="$PROJECT-$MAJOR.$MINOR.$REL1";
 $FILENAMERPM=$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm";
+$FILENAMERPMSRC=$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm";
 # For Deb
 $newbuild = $BUILD;
 $newbuild =~ s/(dev|alpha)/1/gi;                # dev
@@ -317,8 +318,13 @@ print "\n";
 if ($CHOOSEDTARGET{'-CHKSUM'})
 {
    	print 'Create xml check file with md5 checksum with command php '.$SOURCE.'/build/generate_filecheck_xml.php release='.$MAJOR.'.'.$MINOR.'.'.$BUILD."\n";
-  	$ret=`php $SOURCE/build/generate_filecheck_xml.php release=$MAJOR.$MINOR.$BUILD`;
+  	$ret=`php $SOURCE/build/generate_filelist_xml.php release=$MAJOR.$MINOR.$BUILD`;
   	print $ret."\n";
+  	# Copy to final dir
+  	$NEWDESTI=$DESTI;
+	print "Copy \"$SOURCE/htdocs/install/filelist-$MAJOR.$MINOR.$BUILD.xml\" to $NEWDESTI/signatures/filelist-$MAJOR.$MINOR.$BUILD.xml\n";
+    use File::Copy qw(copy);
+    copy "$SOURCE/htdocs/install/filelist-$MAJOR.$MINOR.$BUILD.xml", "$NEWDESTI/signatures/filelist-$MAJOR.$MINOR.$BUILD.xml";
 }
 
 
@@ -357,11 +363,17 @@ if ($nboftargetok) {
 		# Test that the ChangeLog is ok
 		$TMPBUILDTOCHECKCHANGELOG=$BUILD;
 		$TMPBUILDTOCHECKCHANGELOG =~ s/\-rc\d*//;
+		$TMPBUILDTOCHECKCHANGELOG =~ s/\-beta\d*//;
 		print "Check if ChangeLog is ok for version $MAJOR.$MINOR\.$TMPBUILDTOCHECKCHANGELOG\n";
 		$ret=`grep "ChangeLog for $MAJOR.$MINOR\.$TMPBUILDTOCHECKCHANGELOG" "$SOURCE/ChangeLog" 2>&1`;
 		if (! $ret)
 		{
 			print "Error: The ChangeLogFile was not updated. Run the following command before building package for $MAJOR.$MINOR.$BUILD:\n";
+		}
+		else
+		{
+			print "ChangeLog for $MAJOR.$MINOR\.$BUILD was found into '$SOURCE/ChangeLog. But you can regenerate it with commande:'\n";
+		}
 		if (! $BUILD || $BUILD eq '0-rc')	# For a major version
 		{
 			print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log `git rev-list --boundary '.$MAJOR.'.'.$MINOR.'..origin/develop | grep ^- | cut -c2- | head -n 1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
@@ -371,11 +383,9 @@ if ($nboftargetok) {
 			print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
 		}
 		print "\n";
-			exit;
-		}
-		else
+		if (! $ret)
 		{
-			print "ChangeLog for $MAJOR.$MINOR\.$BUILD was found into '$SOURCE/ChangeLog'\n";
+			exit;
 		}
 			
 		print 'Run git tag -a -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
@@ -464,6 +474,7 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/codetemplates`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/dbmodel`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/initdata`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/initdemo`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/iso-normes`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/ldap`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
@@ -507,6 +518,7 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/dolimed*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/dolimod*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/factory*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/forceproject*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/lead*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/management*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
@@ -601,8 +613,11 @@ if ($nboftargetok) {
 		if ($target eq 'TGZ') 
 		{
 			$NEWDESTI=$DESTI;
+			if ($NEWDESTI =~ /stable/)
+			{
 				mkdir($DESTI.'/standard');
 				if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; } 
+			}
 			
 			print "Remove target $FILENAMETGZ.tgz...\n";
 			unlink("$NEWDESTI/$FILENAMETGZ.tgz");
@@ -630,8 +645,11 @@ if ($nboftargetok) {
 		if ($target eq 'XZ') 
 		{
 			$NEWDESTI=$DESTI;
+			if ($NEWDESTI =~ /stable/)
+			{
 				mkdir($DESTI.'/standard');
 				if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; }
+			} 
 
 			print "Remove target $FILENAMEXZ.xz...\n";
 			unlink("$NEWDESTI/$FILENAMEXZ.xz");
@@ -664,8 +682,11 @@ if ($nboftargetok) {
 		if ($target eq 'ZIP') 
 		{
 			$NEWDESTI=$DESTI;
+			if ($NEWDESTI =~ /stable/)
+			{
 				mkdir($DESTI.'/standard');
 				if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; }
+			} 
 
 			print "Remove target $FILENAMEZIP.zip...\n";
 			unlink("$NEWDESTI/$FILENAMEZIP.zip");
@@ -702,8 +723,11 @@ if ($nboftargetok) {
 			if ($target =~ /FEDO/i) { $subdir="package_rpm_redhat-fedora"; }
 			if ($target =~ /MAND/i) { $subdir="package_rpm_mandriva"; }
 			if ($target =~ /OPEN/i) { $subdir="package_rpm_opensuse"; }
+			if ($NEWDESTI =~ /stable/)
+			{
 				mkdir($DESTI.'/'.$subdir);
 				if (-d $DESTI.'/'.$subdir) { $NEWDESTI=$DESTI.'/'.$subdir; }
+			} 
 
 			if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; }
 
@@ -711,8 +735,8 @@ if ($nboftargetok) {
 
 			print "Remove target ".$FILENAMERPM."...\n";
 			unlink("$NEWDESTI/".$FILENAMERPM);
-			print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm...\n";
-			unlink("$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm");
+			print "Remove target ".$FILENAMERPMSRC."...\n";
+			unlink("$NEWDESTI/".$FILENAMERPMSRC);
 
 			print "Create directory $BUILDROOT/$FILENAMETGZ2\n";
 			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`;
@@ -785,8 +809,11 @@ if ($nboftargetok) {
 		if ($target eq 'DEB') 
 		{
 			$NEWDESTI=$DESTI;
+			if ($NEWDESTI =~ /stable/)
+			{
 				mkdir($DESTI.'/package_debian-ubuntu');
 				if (-d $DESTI.'/package_debian-ubuntu') { $NEWDESTI=$DESTI.'/package_debian-ubuntu'; }
+			} 
 
 			$olddir=getcwd();
 
@@ -985,8 +1012,11 @@ if ($nboftargetok) {
 		if ($target eq 'APS') 
 		{
 			$NEWDESTI=$DESTI;
+			if ($NEWDESTI =~ /stable/)
+			{
 				mkdir($DESTI.'/package_aps');
 				if (-d $DESTI.'/package_aps') { $NEWDESTI=$DESTI.'/package_aps'; }
+			} 
 			
 			$newbuild = $BUILD;
 			$newbuild =~ s/(dev|alpha)/0/gi;                # dev
@@ -1068,8 +1098,11 @@ if ($nboftargetok) {
 		if ($target eq 'EXEDOLIWAMP')
 		{
 			$NEWDESTI=$DESTI;
+			if ($NEWDESTI =~ /stable/)
+			{
 				mkdir($DESTI.'/package_windows');
 				if (-d $DESTI.'/package_windows') { $NEWDESTI=$DESTI.'/package_windows'; }
+			} 
 
      		print "Remove target $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe...\n";
     		unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe";
@@ -1094,6 +1127,7 @@ if ($nboftargetok) {
             print "Move $SOURCE/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
             $ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`;
             
+            print "Remove tmp file $SOURCE/build/exe/doliwamp/doliwamp.tmp.iss\n";
             $ret=`rm "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
             
     		next;
@@ -1106,23 +1140,50 @@ if ($nboftargetok) {
 	{
 		if ($CHOOSEDPUBLISH{$target} < 0) { next; }
 	
-		print "\nList of files to publish\n";
+		print "\nList of files to publish (BUILD=$BUILD)\n";
 		%filestoscansf=(
+			"$DESTI/signatures/filelist-$MAJOR.$MINOR.$BUILD.xml"=>'none',				# none means it won't be published on SF
 			"$DESTI/package_rpm_generic/$FILENAMERPM"=>'Dolibarr installer for Fedora-Redhat-Mandriva-Opensuse (DoliRpm)',
+			"$DESTI/package_rpm_generic/$FILENAMERPMSRC"=>'none',						# none means it won't be published on SF
 			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)',
-			"$DESTI/package_debian-ubuntu/${FILENAMEDEBSHORT}.orig.tar.gz"=>'none',
+			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_amd64.changes"=>'none',		# none means it won't be published on SF
+			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}.dsc"=>'none',					# none means it won't be published on SF
+			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}.debian.tar.gz"=>'none',		# none means it won't be published on SF
+			"$DESTI/package_debian-ubuntu/${FILENAMEDEBSHORT}.orig.tar.gz"=>'none',		# none means it won't be published on SF
 			"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)',
 			"$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
 			"$DESTI/standard/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM'
 		);
 		%filestoscanstableasso=(
+			"$DESTI/signatures/filelist-$MAJOR.$MINOR.$BUILD.xml"=>'signatures',
 			"$DESTI/package_rpm_generic/$FILENAMERPM"=>'package_rpm_generic',
+			"$DESTI/package_rpm_generic/$FILENAMERPMSRC"=>'package_rpm_generic',
 			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'package_debian-ubuntu',
+			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_amd64.changes"=>'package_debian-ubuntu',
+			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}.dsc"=>'package_debian-ubuntu',
+			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}.debian.tar.gz"=>'package_debian-ubuntu',
+			"$DESTI/package_debian-ubuntu/${FILENAMEDEBSHORT}.orig.tar.gz"=>'package_debian-ubuntu',
 			"$DESTI/package_debian-ubuntu/${FILENAMEDEBSHORT}.orig.tar.gz"=>'package_debian-ubuntu',
 			"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'package_windows',
 			"$DESTI/standard/$FILENAMETGZ.tgz"=>'standard',
 			"$DESTI/standard/$FILENAMETGZ.zip"=>'standard'
 		);
+		if ($target eq 'ASSO' && $BUILD =~ /[a-z]/i)   { 	# Not stable
+			%filestoscansf=(
+				"$DESTI/$FILENAMERPM"=>'Dolibarr installer for Fedora-Redhat-Mandriva-Opensuse (DoliRpm)',
+				"$DESTI/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)',
+				"$DESTI/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)',
+				"$DESTI/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
+				"$DESTI/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM'
+			);
+			%filestoscanstableasso=(
+				"$DESTI/$FILENAMERPM"=>'',
+				"$DESTI/${FILENAMEDEB}_all.deb"=>'',
+				"$DESTI/$FILENAMEEXEDOLIWAMP.exe"=>'',
+				"$DESTI/$FILENAMETGZ.tgz"=>'',
+				"$DESTI/$FILENAMETGZ.zip"=>''
+			);
+		}
 
 		use POSIX qw/strftime/;
 		foreach my $file (sort keys %filestoscansf)
@@ -1162,9 +1223,10 @@ if ($nboftargetok) {
 				my $filesize = -s $file;
 				if (! $filesize) { next; }
 
-				print "\n";
-	    		
-	    		if ($target eq 'SF' && $filestoscan{$file} ne 'none') { 
+	    		if ($target eq 'SF') {
+	    			if ($filestoscan{$file} eq 'none') {
+	    				next;
+	    			} 
 	    			$destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD;
 	    		}
 	    		elsif ($target eq 'ASSO' and $NEWPUBLISH =~ /stable/) {
@@ -1181,6 +1243,8 @@ if ($nboftargetok) {
 	    			$filenameonly =~ s/.*\/[^\/]+\/([^\/])+$/$1/;  
 	    			$destFolder="$NEWPUBLISH/$dirnameonly";
 	    		}
+
+				print "\n";
 	    		print "Publish file ".$file." to ".$destFolder."\n";
 
 				# mkdir	   
@@ -1203,8 +1267,8 @@ if ($nboftargetok) {
 
 				$command="rsync -s -e 'ssh' \"$file\" \"".$destFolder."\"";
 				print "$command\n";	
-				my $ret=`$command 2>&1`;
-				print "$ret\n";
+				my $ret2=`$command 2>&1`;
+				print "$ret2\n";
 			}
 		}
 	}    

build/makepack-howto.txt

@@ -9,7 +9,8 @@ beta version of Dolibarr, step by step.
 
 - Check all files are commited.
 - Update version/info in ChangeLog. 
-To generate a changelog of a major new version x.y.0, you can do "cd ~/git/dolibarr_x.y; git log `git rev-list --boundary x.y..origin/develop | grep ^- | cut -c2- | head -n 1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
+To generate a changelog of a major new version x.y.0 (from develop repo), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
+To generate a changelog of a major new version x.y.0 (from x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
 To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
 - Update version number with x.y.z-w in htdocs/filefunc.inc.php
 - Commit all changes.
@@ -31,7 +32,8 @@ complete release of Dolibarr, step by step.
 
 - Check all files are commited.
 - Update version/info in ChangeLog. 
-To generate a changelog of a major new version x.y.0, you can do "cd ~/git/dolibarr_x.y; git log `git rev-list --boundary x.y..origin/develop | grep ^- | cut -c2- | head -n 1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
+To generate a changelog of a major new version x.y.0 (from develop repo), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
+To generate a changelog of a major new version x.y.0 (from x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
 To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
 - Update version number with x.y.z in htdocs/filefunc.inc.php
 - Commit all changes.

build/rpm/dolibarr_fedora.spec

@@ -34,7 +34,7 @@ AutoReqProv: no
 
 
 %description
-An easy to use CRM & ERP open source/free software for small  
+An easy to use CRM & ERP open source/free software package for small  
 and medium companies, foundations or freelances. It includes different 
 features for Enterprise Resource Planning (ERP) and Customer Relationship 
 Management (CRM) but also for different other activities.
@@ -192,6 +192,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
+%_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
 %_datadir/dolibarr/htdocs/paypal
@@ -206,6 +207,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/webservices
+%_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
 %_datadir/dolibarr/htdocs/*.patch
 %_datadir/dolibarr/htdocs/*.php

build/rpm/dolibarr_generic.spec

@@ -75,7 +75,7 @@ AutoReqProv: no
 
 
 %description
-An easy to use CRM & ERP open source/free software for small  
+An easy to use CRM & ERP open source/free software package for small  
 and medium companies, foundations or freelances. It includes different 
 features for Enterprise Resource Planning (ERP) and Customer Relationship 
 Management (CRM) but also for different other activities.
@@ -272,6 +272,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
+%_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
 %_datadir/dolibarr/htdocs/paypal
@@ -286,6 +287,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/webservices
+%_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
 %_datadir/dolibarr/htdocs/*.patch
 %_datadir/dolibarr/htdocs/*.php

build/rpm/dolibarr_mandriva.spec

@@ -33,7 +33,7 @@ AutoReqProv: no
 
 
 %description
-An easy to use CRM & ERP open source/free software for small  
+An easy to use CRM & ERP open source/free software package for small  
 and medium companies, foundations or freelances. It includes different 
 features for Enterprise Resource Planning (ERP) and Customer Relationship 
 Management (CRM) but also for different other activities.
@@ -189,6 +189,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
+%_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
 %_datadir/dolibarr/htdocs/paypal
@@ -203,6 +204,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/webservices
+%_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
 %_datadir/dolibarr/htdocs/*.patch
 %_datadir/dolibarr/htdocs/*.php

build/rpm/dolibarr_opensuse.spec

@@ -36,7 +36,7 @@ AutoReqProv: no
 
 
 %description
-An easy to use CRM & ERP open source/free software for small  
+An easy to use CRM & ERP open source/free software package for small  
 and medium companies, foundations or freelances. It includes different 
 features for Enterprise Resource Planning (ERP) and Customer Relationship 
 Management (CRM) but also for different other activities.
@@ -200,6 +200,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
+%_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
 %_datadir/dolibarr/htdocs/paypal
@@ -214,6 +215,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/webservices
+%_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
 %_datadir/dolibarr/htdocs/*.patch
 %_datadir/dolibarr/htdocs/*.php

composer.json

@@ -12,17 +12,26 @@
         "irc": "irc://chat.freenode.net/dolibarr",
         "source": "https://github.com/Dolibarr/dolibarr"
     },
+    "config": {
+        "vendor-dir": "htdocs/includes"
+    },
     "require": {
         "php": ">=5.3.0",
         "ext-curl": "*",
-        "ccampbell/chromephp": "^4.1",
-        "ckeditor/ckeditor": "dev-full/4.3.x#0b7c3f1",
-        "mike42/escpos-php": "dev-master",
+        "ccampbell/chromephp": "4.1.0",
+        "ckeditor/ckeditor": "dev-full/stable",
+        "mike42/escpos-php": "1.2.1",
         "mobiledetect/mobiledetectlib": "2.8.17",
         "phpoffice/phpexcel": "1.8.1",
-        "restler/framework": "^3.0",
+        "restler/framework": "3.0.0-RC6",
         "tecnickcom/tcpdf": "6.2.12"
     },
+    "require-dev": {
+        "jakub-onderka/php-parallel-lint": "^0",
+        "jakub-onderka/php-console-highlighter": "^0",
+        "phpunit/phpunit": "^4",
+        "squizlabs/php_codesniffer": "^2"
+    },
     "suggest": {
         "ext-mysqlnd": "To use with MySQL or MariaDB",
         "ext-mysqli": "To use with MySQL or MariaDB",
@@ -39,8 +48,5 @@
         "ext-xml": "Excel support",
         "firephp/firephp-core": "Logging to Firebug console support",
         "raven/raven": "Sentry logging server support"
-    },
-    "config": {
-        "vendor-dir": "htdocs/includes"
     }
 }

composer.lock

@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "d8229cbb9aea945c9ca803bbe54d7aa7",
-    "content-hash": "47929ed42fb67e5159ccec6a3a5a45eb",
+    "hash": "f666a32d1a59518b8ecc55899e829e79",
+    "content-hash": "8d110e7d8fca6eca1aa814ee35d0032b",
     "packages": [
         {
             "name": "ccampbell/chromephp",
@@ -52,16 +52,16 @@
         },
         {
             "name": "ckeditor/ckeditor",
-            "version": "dev-full/4.3.x",
+            "version": "dev-full/stable",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ckeditor/ckeditor-releases.git",
-                "reference": "0b7c3f1"
+                "reference": "4a7a6d717f9a408fa8f9ea53ef2dba4d64b83e91"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ckeditor/ckeditor-releases/zipball/252e512e911f21d880ea542fe162c4643885b317",
-                "reference": "0b7c3f1",
+                "url": "https://api.github.com/repos/ckeditor/ckeditor-releases/zipball/4a7a6d717f9a408fa8f9ea53ef2dba4d64b83e91",
+                "reference": "4a7a6d717f9a408fa8f9ea53ef2dba4d64b83e91",
                 "shasum": ""
             },
             "type": "library",
@@ -73,7 +73,7 @@
             ],
             "authors": [
                 {
-                    "name": "CKSource - Frederico Knabben",
+                    "name": "CKSource",
                     "homepage": "http://cksource.com"
                 }
             ],
@@ -89,29 +89,35 @@
                 "text",
                 "wysiwyg"
             ],
-            "time": "2014-02-26 15:43:10"
+            "time": "2016-05-12 15:36:04"
         },
         {
             "name": "mike42/escpos-php",
-            "version": "dev-master",
+            "version": "v1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mike42/escpos-php.git",
-                "reference": "63648d03d47b81e8f6c1020ac92f051a3f3b5793"
+                "reference": "cfea4c4fc95516ac953e1e5b623f854632afa2ee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mike42/escpos-php/zipball/63648d03d47b81e8f6c1020ac92f051a3f3b5793",
-                "reference": "63648d03d47b81e8f6c1020ac92f051a3f3b5793",
+                "url": "https://api.github.com/repos/mike42/escpos-php/zipball/cfea4c4fc95516ac953e1e5b623f854632afa2ee",
+                "reference": "cfea4c4fc95516ac953e1e5b623f854632afa2ee",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.5.*"
+                "phpunit/phpunit": "4.5.*",
+                "squizlabs/php_codesniffer": "2.*"
             },
             "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Mike42\\": "src/Mike42"
+                }
+            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
@@ -147,7 +153,7 @@
                 "print",
                 "receipt"
             ],
-            "time": "2015-12-04 10:23:55"
+            "time": "2016-04-25 01:14:07"
         },
         {
             "name": "mobiledetect/mobiledetectlib",
@@ -262,17 +268,17 @@
         },
         {
             "name": "restler/framework",
-            "version": "3.0.0",
+            "version": "3.0.0-RC6",
             "target-dir": "Luracast/Restler",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Luracast/Restler-Framework.git",
-                "reference": "6ee10b3e5dbc6376916fed55ec2340a37cce436b"
+                "reference": "bfe1139b233852b745c6a0ec14d7244ceb3b3fc6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Luracast/Restler-Framework/zipball/6ee10b3e5dbc6376916fed55ec2340a37cce436b",
-                "reference": "6ee10b3e5dbc6376916fed55ec2340a37cce436b",
+                "url": "https://api.github.com/repos/Luracast/Restler-Framework/zipball/bfe1139b233852b745c6a0ec14d7244ceb3b3fc6",
+                "reference": "bfe1139b233852b745c6a0ec14d7244ceb3b3fc6",
                 "shasum": ""
             },
             "require": {
@@ -281,23 +287,14 @@
             "replace": {
                 "luracast/restler": "3.*"
             },
-            "require-dev": {
-                "bshaffer/oauth2-server-php": "v1.0",
-                "luracast/explorer": "*",
-                "mustache/mustache": "dev-master",
-                "rodneyrehm/plist": "dev-master",
-                "symfony/yaml": "*",
-                "twig/twig": "v1.13.0",
-                "zendframework/zendamf": "dev-master"
-            },
             "suggest": {
-                "bshaffer/oauth2-server-php": "Restler can provide OAuth2 authentication using this library (see require-dev for details)",
-                "luracast/explorer": "Restler's very own api explorer (see require-dev for details)",
-                "mustache/mustache": "Restler can render HtmlView using mustache/handlebar templates (see require-dev for details)",
-                "rodneyrehm/plist": "Restler supports tho Apple plist xml format (see require-dev for details)",
-                "symfony/yaml": "Restler can produce content in yaml format as well (see require-dev for details)",
-                "twig/twig": "Restler can render HtmlView using twig templates (see require-dev for details)",
-                "zendframework/zendamf": "Support for the amf document format  (see require-dev for details)"
+                "bshaffer/oauth2-server-php": "If you want to use OAuth2 for authentication",
+                "illuminate/view": "If you want to use laravel blade templates with Html format",
+                "mustache/mustache": "If you want to use mustache/handlebar templates with Html format",
+                "rodneyrehm/plist": "If you need Apple plist binary/xml format",
+                "symfony/yaml": "If you need YAML format",
+                "twig/twig": "If you want to use twig templates with Html format",
+                "zendframework/zendamf": "If you need AMF format"
             },
             "type": "library",
             "extra": {
@@ -318,10 +315,6 @@
                 {
                     "name": "Luracast",
                     "email": "arul@luracast.com"
-                },
-                {
-                    "name": "Nick nickl- Lombard",
-                    "email": "github@jigsoft.co.za"
                 }
             ],
             "description": "Just the Restler Framework without the tests and examples",
@@ -332,7 +325,7 @@
                 "rest",
                 "server"
             ],
-            "time": "2015-08-04 07:52:49"
+            "time": "2016-02-28 15:57:37"
         },
         {
             "name": "tecnickcom/tcpdf",
@@ -403,7 +396,7 @@
     "minimum-stability": "stable",
     "stability-flags": {
         "ckeditor/ckeditor": 20,
-        "mike42/escpos-php": 20
+        "restler/framework": 5
     },
     "prefer-stable": false,
     "prefer-lowest": false,

dev/dolibarr_changes.txt

@@ -10,6 +10,16 @@ Replace "& new" by "new"
 
 
 
+CKEDITOR:
+---------
+* In ckeditor/ckeditor/contents.css
+Replace:
+	margin: 20px;
+With
+	margin: 5px;
+
+
+
 NUSOAP:
 -------
 * In file nusoap.php, to avoid a warning,
@@ -38,15 +48,16 @@ with:
     }
 
 
+
 TCPDF:
 ------
-* Removed all fonts except 
-    dejavusans* (used by greek, arab, persan, romanian, turkish), 
-    freemono* (russian), 
-    cid*+msungstdlight+stsongstdlight+uni2cid* (chinese), 
-    helvetica* (all other languages),
-    zapfdingbats.php (for special chars like form checkboxes)
+* To avoid to have QRcode changed because generated with a random mask, replace
+define('QR_FIND_FROM_RANDOM', 2);
+with
+define('QR_FIND_FROM_RANDOM', false);
+
 * Removed useless directories (examples, tools)
+
 * Fix
  	// initialize subsetchars
 	$subsetchars = array();
@@ -54,19 +65,18 @@ into
 	// initialize subsetchars
 	$subsetchars = array_fill(0, 256, true);
 
-* Made freemono the default monotype font because we removed courier
+* Optionnaly, removed all fonts except 
+    dejavusans* (used by greek, arab, persan, romanian, turkish), 
+    freemono* (russian), 
+    cid*+msungstdlight+stsongstdlight+uni2cid* (chinese), 
+    helvetica* (all other languages),
+    zapfdingbats.php (for special chars like form checkboxes)
+
+* Optionnaly, made freemono the default monotype font because we removed courier
 In htdocs/includes/tcpdf/tcpdf.php
 -       protected $default_monospaced_font = 'courier';
 +       protected $default_monospaced_font = 'freemono';
 
-* Renamed getmypid into dol_getmypid().
-
-
-To avoid to have QRcode changed because generated with a random mask, replace
-define('QR_FIND_FROM_RANDOM', 2);
-with
-define('QR_FIND_FROM_RANDOM', false);
-
 
 
 TCPDI:
@@ -81,7 +91,6 @@ require_once(dirname(__FILE__).'/../tecnickcom/tcpdf/include/tcpdf_filters.php')
 
 
 
-
 JSGANTT:
 --------
 * Replace in function JSGantt.taskLink
@@ -107,8 +116,15 @@ JQUERYFILETREE:
 RESTLER:
 --------
 
+* Add 2 lines into 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;
-
-
+		...
         

dev/fixdosfiles.sh

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

dev/initdata/README

@@ -1,17 +1,5 @@
-README (English)
---------------------------------
+README
+------
 
-*** Demo
-
-Scripts in this directory can be used to reinit a demo database.
-WARNING: This will erase current database with data into initdemo.sql.
-
-Do a chmod 700 initdemo.sh
-then run ./initdemo.sh to launch Graphic User Interface.
-
-Install of package "dialog" is required.
-
-
-*** Other
-
-Other scripts can be used to load data test.
+Scripts in this directory can be used to load or purge data of a database instance.
+WARNING: Some of this script may delete definitely data.

dev/initdata/README-FR

@@ -1,20 +0,0 @@
-README (French)
---------------------------------
-
-*** Demo
-
-Ce script permet de reinitialiser une base de donnée Dolibarr avec des
-données de demo.
-ATTENTION: Ceci efface les données en cours de la base avec les données
-du fichier initdemo.sql.
-
-Faite un chmod 700 initdemo.sh
-puis ./initdemo.sh pour lancer l'interface graphique.
-
-L'installation du package "dialog" est indispensable.
-
-
-*** Autre
-
-Les autres scripts peuvent être utilisé pour charger en base des données de tests
-générés automatiquement.

dev/initdata/generate-invoice.php

@@ -19,7 +19,7 @@
  */
 
 /**
- *      \file       dev/intdata/generate-invoice.php
+ *      \file       dev/initdata/generate-invoice.php
  *		\brief      Script example to inject random customer invoices (for load tests)
  */
 
@@ -90,7 +90,7 @@ $result=0;
 while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 {
 	$i++;
-	$socid = rand(1, $num_socs);
+	$socid = mt_rand(1, $num_socs);
 
 	print "Invoice ".$i." for socid ".$socid;
 
@@ -105,14 +105,14 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 		$result=$facture->validate($user);
 		if ($result)
 		{
-			$nbp = rand(2, 5);
+			$nbp = mt_rand(2, 5);
 			$xnbp = 0;
 			while ($xnbp < $nbp)
 			{
-				$prodid = rand(1, $num_prods);
+				$prodid = mt_rand(1, $num_prods);
 				$product=new Product($db);
 				$result=$product->fetch($prodids[$prodid]);
-				$result=$facture->addline($product->description, $product->price, rand(1,5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type);
+				$result=$facture->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type);
 			    if ($result < 0)
                 {
                     dol_print_error($db,$propal->error);

dev/initdata/generate-order.php

@@ -165,7 +165,7 @@ for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
     $com = new Commande($db);
 
     $com->socid         = 4;
-    $com->date_commande  = $dates[rand(1, count($dates)-1)];
+    $com->date_commande  = $dates[mt_rand(1, count($dates)-1)];
     $com->note           = 'A comment';
     $com->source         = 1;
     $com->fk_project     = 0;
@@ -179,14 +179,14 @@ for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
 		$result=$com->valid($user);
 		if ($result > 0)
 		{
-            $nbp = rand(2, 5);
+            $nbp = mt_rand(2, 5);
             $xnbp = 0;
             while ($xnbp < $nbp)
             {
-                $prodid = rand(1, $num_prods);
+                $prodid = mt_rand(1, $num_prods);
                 $product=new Product($db);
                 $result=$product->fetch($prodids[$prodid]);
-                $result=$com->addline($product->description, $product->price, rand(1,5), 0, 0, 0, $prodids[$prodid], 0, 0, 0,  $product->price_base_type, $product->price_ttc, '', '', $product->type);
+                $result=$com->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0, 0, 0,  $product->price_base_type, $product->price_ttc, '', '', $product->type);
                 if ($result < 0)
                 {
                     dol_print_error($db,$propal->error);

dev/initdata/generate-product.php

@@ -85,12 +85,12 @@ for ($s = 0 ; $s < GEN_NUMBER_PRODUIT ; $s++)
 {
     print "Product ".$s;
     $produit = new Product($db);
-    $produit->type = rand(0,1);
+    $produit->type = mt_rand(0,1);
     $produit->status = 1;
     $produit->ref = ($produit->type?'S':'P').time().$s;
     $produit->label = 'Label '.time().$s;
     $produit->description = 'Description '.time().$s;
-    $produit->price = rand(1,1000);
+    $produit->price = mt_rand(1,1000);
     $produit->tva_tx = "19.6";
     $ret=$produit->create($user);
     if ($ret < 0) print "Error $ret - ".$produit->error."\n";

dev/initdata/generate-proposal.php

@@ -117,7 +117,7 @@ $result=0;
 while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 {
 	$i++;
-	$socid = rand(1, $num_socs);
+	$socid = mt_rand(1, $num_socs);
 	print "Proposal ".$i." for socid ".$socid;
 
 	$soc = new Societe($db);
@@ -140,14 +140,14 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 	$result=$propal->create($user);
 	if ($result >= 0)
 	{
-		$nbp = rand(2, 5);
+		$nbp = mt_rand(2, 5);
 		$xnbp = 0;
 		while ($xnbp < $nbp)
 		{
-			$prodid = rand(1, $num_prods);
+			$prodid = mt_rand(1, $num_prods);
 			$product=new Product($db);
 			$result=$product->fetch($prodids[$prodid]);
-			$result=$propal->addline($product->description, $product->price, rand(1,5), 0, 0, 0, $prodids[$prodid], 0);
+			$result=$propal->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0);
 			if ($result < 0)
 			{
 				dol_print_error($db,$propal->error);

dev/initdata/generate-thirdparty.php

@@ -90,30 +90,30 @@ for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++)
     print "Company $s\n";
     $soc = new Societe($db);
     $soc->name = "Company num ".time()."$s";
-    $soc->town = $listoftown[rand(0, count($listoftown)-1)];
-    $soc->client = rand(1,2);		// Une societe sur 2 est prospect, l'autre client
-    $soc->fournisseur = rand(0,1);	// Une societe sur 2 est fournisseur
+    $soc->town = $listoftown[mt_rand(0, count($listoftown)-1)];
+    $soc->client = mt_rand(1,2);		// Une societe sur 2 est prospect, l'autre client
+    $soc->fournisseur = mt_rand(0,1);	// Une societe sur 2 est fournisseur
     $soc->code_client='CU'.time()."$s";
     $soc->code_fournisseur='SU'.time()."$s";
     $soc->tva_assuj=1;
     $soc->country_id=1;
     $soc->country_code='FR';
 	// Un client sur 3 a une remise de 5%
-    $user_remise=rand(1,3); if ($user_remise==3) $soc->remise_percent=5;
+    $user_remise=mt_rand(1,3); if ($user_remise==3) $soc->remise_percent=5;
 	print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_percent."\n";
     $soc->note_private = 'Company created by the script generate-societe.php';
     $socid = $soc->create();
 
     if ($socid >= 0)
     {
-        $rand = rand(1,4);
+        $rand = mt_rand(1,4);
         print "> Generates $rand contact(s)\n";
         for ($c = 0 ; $c < $rand ; $c++)
         {
             $contact = new Contact($db);
             $contact->socid = $soc->id;
             $contact->lastname = "Lastname".$c;
-            $contact->firstname = $listoflastname[rand(0, count($listoflastname)-1)];
+            $contact->firstname = $listoflastname[mt_rand(0, count($listoflastname)-1)];
             if ( $contact->create($user) )
             {
 

dev/initdata/import-products.php

@@ -0,0 +1,240 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * WARNING, THIS WILL LOAD MASS DATA ON YOUR INSTANCE
+ */
+
+/**
+ *      \file       dev/initdata/import-product.php
+ *		\brief      Script example to insert products from a csv file. 
+ *                  To purge data, you can have a look at purge-data.php
+ */
+
+// Test si mode batch
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
+    exit;
+}
+
+// Recupere root dolibarr
+$path=preg_replace('/import-products.php/i','',$_SERVER["PHP_SELF"]);
+require ($path."../../htdocs/master.inc.php");
+include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+$delimiter=',';
+$enclosure='"';
+$linelength=10000;
+$escape='/';
+
+// Global variables
+$version=DOL_VERSION;
+$confirmed=1;
+$error=0;
+
+
+/*
+ * Main
+ */
+
+@set_time_limit(0);
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
+
+$mode = $argv[1];
+$filepath = $argv[2];
+$filepatherr = $filepath.'.err';
+$defaultlang = empty($argv[3])?'en_US':$argv[3];
+$startlinenb = empty($argv[4])?1:$argv[4];
+$endlinenb = empty($argv[5])?0:$argv[5];
+
+if (empty($mode) || ! in_array($mode,array('test','confirm','confirmforced')) || empty($filepath)) {
+    print "Usage:  $script_file (test|confirm|confirmforced) filepath.csv [defaultlang] [startlinenb] [endlinenb]\n";
+    print "Usage:  $script_file test myfilepath.csv fr_FR 2 1002\n";
+    print "\n";
+    exit(-1);
+}
+if (! file_exists($filepath)) {
+    print "Error: File ".$filepath." not found.\n";
+    print "\n";
+    exit(-1);
+}
+
+$ret=$user->fetch('','admin');
+if (! $ret > 0)
+{
+	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+	exit;
+}
+$user->getrights();
+
+// Ask confirmation
+if (! $confirmed)
+{
+    print "Hit Enter to continue or CTRL+C to stop...\n";
+    $input = trim(fgets(STDIN));
+}
+
+// Open input and ouput files
+$fhandle = fopen($filepath, 'r');
+if (! $fhandle)
+{
+    print 'Error: Failed to open file '.$filepath."\n";
+    exit(1);
+}
+$fhandleerr = fopen($filepatherr, 'w');
+if (! $fhandleerr)
+{
+    print 'Error: Failed to open file '.$filepatherr."\n";
+    exit(1);
+}
+
+$langs->setDefaultLang($defaultlang);
+
+
+$db->begin();
+
+$i=0;
+$nboflines++;
+while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
+{
+    $i++;
+    $errorrecord=0;
+    
+    if ($startlinenb && $i < $startlinenb) continue;
+    if ($endlinenb && $i > $endlinenb) continue;
+    
+    $nboflines++;
+    
+    $produit = new Product($db);
+    $produit->type = 0;
+    $produit->status = 1;
+    $produit->ref = trim($fields[0]);
+    
+    print "Process line nb ".$i.", ref ".$produit->ref;
+    $produit->label = trim($fields[2]);
+    $produit->description = trim($fields[4]."\n".($fields[5] ? $fields[5].' x '.$fields[6].' x '.$fields[7] : ''));
+    $produit->volume = price2num($fields[8]);
+    $produit->volume_unit = 0;     
+    $produit->weight = price2num($fields[9]);
+    $produit->weight_units = 0;          // -3 = g
+
+    $produit->customcode = $fields[10];
+    $produit->barcode = $fields[1];
+
+    $produit->status = 1;
+    $produit->status_buy = 1;
+    
+    $produit->finished = 1;
+    
+    $produit->price_min = null;
+    $produit->price_min_ttc = null;
+    $produit->price = price2num($fields[11]);
+    $produit->price_ttc = price2num($fields[12]);
+    $produit->price_base_type = 'TTC';
+    $produit->tva_tx = price2num($fields[13]);
+    $produit->tva_npr = 0;
+    
+    $produit->cost_price = price2num($fields[16]);
+    
+    // Extrafields
+    $produit->array_options['options_ecotaxdeee']=price2num($fields[17]);
+    
+    $ret=$produit->create($user);
+    if ($ret < 0)
+    {
+        print " - Error in create result code = ".$ret." - ".$produit->errorsToString();
+        $errorrecord++;
+    }
+	else 
+	{
+	    print " - Creation OK with ref ".$produit->ref." - id = ".$ret;
+	}
+
+	dol_syslog("Add prices");
+	
+    // If we use price level, insert price for each level
+	if (! $errorrecord && 1)
+	{
+	    $ret1=$produit->updatePrice($produit->price_ttc, $produit->price_base_type, $user, $produit->tva_tx, $produit->price_min, 1, $produit->tva_npr, 0, 0, array());
+	    $ret2=$produit->updatePrice(price2num($fields[14]), 'HT', $user, $produit->tva_tx, $produit->price_min, 2, $produit->tva_npr, 0, 0, array());
+	    if ($ret1 < 0 || $ret2 < 0)
+        {
+            print " - Error in updatePrice result code = ".$ret1." ".$ret2." - ".$produit->errorsToString();
+            $errorrecord++;
+        }
+    	else 
+    	{
+    	    print " - updatePrice OK";
+    	}
+	}
+	
+	dol_syslog("Add multilangs");
+	
+	// Add alternative languages
+	if (! $errorrecord && 1)
+	{
+    	$produit->multilangs['fr_FR']=array('label'=>$produit->label, 'description'=>$produit->description, 'note'=>$produit->note_private);
+	    $produit->multilangs['en_US']=array('label'=>$fields[3], 'description'=>$produit->description, 'note'=>$produit->note_private);
+
+    	$ret=$produit->setMultiLangs($user);
+        if ($ret < 0)
+        {
+            print " - Error in setMultiLangs result code = ".$ret." - ".$produit->errorsToString();
+            $errorrecord++;
+        }
+    	else 
+    	{
+    	    print " - setMultiLangs OK";
+    	}
+	}
+	
+	print "\n";
+	
+	if ($errorrecord) 
+	{
+	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$produit->errorsToString()."\n");
+	    $error++;    // $errorrecord will be reset
+	}
+}
+
+
+
+
+
+// commit or rollback
+print "Nb of lines qualified: ".$nboflines."\n";
+print "Nb of errors: ".$error."\n";
+if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
+{
+    print "Rollback any changes.\n";
+    $db->rollback();
+}
+else
+{
+    print "Commit all changes.\n";
+    $db->commit();
+}
+
+$db->close();
+fclose($fhandle);
+fclose($fhandleerr);
+
+exit($error);

dev/initdata/import-thirdparties.php

@@ -0,0 +1,318 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * WARNING, THIS WILL LOAD MASS DATA ON YOUR INSTANCE
+ */
+
+/**
+ *      \file       dev/initdata/import-thirdparties.php
+ *		\brief      Script example to insert thirdparties from a csv file. 
+ *                  To purge data, you can have a look at purge-data.php
+ */
+
+// Test si mode batch
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
+    exit;
+}
+
+// Recupere root dolibarr
+$path=preg_replace('/import-thirdparties.php/i','',$_SERVER["PHP_SELF"]);
+require ($path."../../htdocs/master.inc.php");
+include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+$delimiter=',';
+$enclosure='"';
+$linelength=10000;
+$escape='/';
+
+// Global variables
+$version=DOL_VERSION;
+$confirmed=1;
+$error=0;
+
+
+/*
+ * Main
+ */
+
+@set_time_limit(0);
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
+
+$mode = $argv[1];
+$filepath = $argv[2];
+$filepatherr = $filepath.'.err';
+//$defaultlang = empty($argv[3])?'en_US':$argv[3];
+$startlinenb = empty($argv[3])?1:$argv[3];
+$endlinenb = empty($argv[4])?0:$argv[4];
+
+if (empty($mode) || ! in_array($mode,array('test','confirm','confirmforced')) || empty($filepath)) {
+    print "Usage:  $script_file (test|confirm|confirmforced) filepath.csv [startlinenb] [endlinenb]\n";
+    print "Usage:  $script_file test myfilepath.csv 2 1002\n";
+    print "\n";
+    exit(-1);
+}
+if (! file_exists($filepath)) {
+    print "Error: File ".$filepath." not found.\n";
+    print "\n";
+    exit(-1);
+}
+
+$ret=$user->fetch('','admin');
+if (! $ret > 0)
+{
+	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+	exit;
+}
+$user->getrights();
+
+// Ask confirmation
+if (! $confirmed)
+{
+    print "Hit Enter to continue or CTRL+C to stop...\n";
+    $input = trim(fgets(STDIN));
+}
+
+// Open input and ouput files
+$fhandle = fopen($filepath, 'r');
+if (! $fhandle)
+{
+    print 'Error: Failed to open file '.$filepath."\n";
+    exit(1);
+}
+$fhandleerr = fopen($filepatherr, 'w');
+if (! $fhandleerr)
+{
+    print 'Error: Failed to open file '.$filepatherr."\n";
+    exit(1);
+}
+
+//$langs->setDefaultLang($defaultlang);
+
+
+$db->begin();
+
+$i=0;
+$nboflines=0;
+while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
+{
+    $i++;
+    $errorrecord=0;
+
+    if ($startlinenb && $i < $startlinenb) continue;
+    if ($endlinenb && $i > $endlinenb) continue;
+
+    $nboflines++;
+    
+    $object = new Societe($db);
+    $object->state = $fields[6];
+    $object->client = $fields[7];
+    $object->fournisseur = $fields[8];
+    
+    $object->name = $fields[13]?trim($fields[13]):$fields[0];
+    $object->name_alias = $fields[0]!=$fields[13]?trim($fields[0]):'';
+    
+    $object->address = trim($fields[14]);
+    $object->zip = trim($fields[15]);
+    $object->town = trim($fields[16]);
+    $object->country_id = dol_getIdFromCode($db, trim($fields[21]), 'c_country', 'code', 'rowid');
+    $object->phone = trim($fields[22]);
+    $object->fax = trim($fields[23]);
+    $object->email = trim($fields[26]);
+    $object->idprof2 = trim($fields[29]);
+    $object->tva_intra = trim($fields[34]);
+    $object->default_lang = trim($fields[43]);
+
+    //$condpayment = dol_string_unaccent(trim($fields[36]));
+    if ($fields[36])
+    {
+        $condpayment = trim($fields[36]);
+        if ($condpayment == 'A la commande') $condpayment = 'A réception de commande';
+        if ($condpayment == 'A reception facture') $condpayment = 'Réception de facture';
+        $object->cond_reglement_id = dol_getIdFromCode($db, $condpayment, 'c_payment_term', 'libelle_facture', 'rowid');
+        if (empty($object->cond_reglement_id))
+        {
+            print " - Error cant find payment mode for ".$condpayment."\n";
+            $errorrecord++;
+        }
+    }
+
+    $object->code_client = $fields[9];
+    $object->code_fournisseur = $fields[10];
+
+    $labeltype = trim($fields[1]);
+    $object->typent_id = dol_getIdFromCode($db, $labeltype, 'c_typent', 'libelle');
+
+    // Set price level
+    $object->price_level = 1;
+    if ($labeltype == 'Revendeur') $object->price_level = 2;
+    
+    print "Process line nb ".$i.", name ".$object->name;
+
+
+    // Extrafields
+    $object->array_options['options_anastate']=price2num($fields[20]);
+    $object->array_options['options_anaregion']=price2num($fields[17]);
+
+    if (! $errorrecord)
+    {
+        $ret=$object->create($user);
+        if ($ret < 0)
+        {
+            print " - Error in create result code = ".$ret." - ".$object->errorsToString();
+            $errorrecord++;
+        }
+    	else 
+    	{
+    	    print " - Creation OK with name ".$object->name." - id = ".$ret;
+    	}
+    }
+
+    if (! $errorrecord)
+    {
+        dol_syslog("Set price level");
+	    $object->set_price_level($object->price_level, $user);
+    }
+
+	// Assign sales representative
+	if (! $errorrecord && $fields[3])
+	{
+    	$salesrep=new User($db);
+    	
+    	$tmp=explode(' ',$fields[3],2);
+    	$salesrep->firstname = trim($tmp[0]);
+    	$salesrep->lastname = trim($tmp[1]);
+    	if ($salesrep->lastname) $salesrep->login = strtolower(substr($salesrep->firstname, 0, 1)) . strtolower(substr($salesrep->lastname, 0));
+    	else $salesrep->login=strtolower($salesrep->firstname);
+    	$salesrep->login=preg_replace('/ /','',$salesrep->login);
+    	$salesrep->fetch(0,$salesrep->login);
+    
+    	$result = $object->add_commercial($user, $salesrep->id);
+    	if ($result < 0)
+    	{
+    	    print " - Error in create link with sale representative result code = ".$result." - ".$object->errorsToString();
+    	    $errorrecord++;
+    	}
+    	else
+    	{
+    	    print " - create link sale representative OK";
+    	}
+	}	
+	
+	dol_syslog("Add invoice contacts");
+	// Insert an invoice contact if there is an invoice email != standard email
+	if (! $errorrecord && $fields[27] && $fields[26] != $fields[27])
+	{
+	    $ret1=$ret2=0;
+	    
+	    $contact = new Contact($db);
+	    $contact->lastname = $object->name;
+	    $contact->address=$object->address;
+	    $contact->zip=$object->zip;
+	    $contact->town=$object->town;
+	    $contact->country_id=$object->country_id;
+	    $contact->email=$fields[27];
+	    $contact->socid=$object->id;
+	    
+	    $ret1=$contact->create($user);
+	    if ($ret1 > 0)
+	    {
+	        //$ret2=$contact->add_contact($object->id, 'BILLING');
+	    }
+	    if ($ret1 < 0 || $ret2 < 0)
+        {
+            print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
+            $errorrecord++;
+        }
+    	else 
+    	{
+    	    print " - create contact OK";
+    	}
+	}
+	
+	dol_syslog("Add delivery contacts");
+	// Insert a delivery contact
+	if (! $errorrecord && $fields[47])
+	{
+	    $ret1=$ret2=0;
+	    
+	    $contact2 = new Contact($db);
+	    $contact2->lastname = 'Service livraison - '.$fields[47];
+	    $contact2->address = $fields[48];
+	    $contact2->zip = $fields[50];
+	    $contact2->town = $fields[51];
+	    $contact2->country_id=dol_getIdFromCode($db, trim($fields[52]), 'c_country', 'code', 'rowid');
+	    $contact2->note_public=$fields[54];
+	    $contact2->socid=$object->id;
+	    
+	    // Extrafields
+	    $contact2->array_options['options_anazoneliv']=price2num($fields[53]);
+	    
+	    $ret1=$contact2->create($user);
+	    if ($ret1 > 0)
+	    {
+	        //$ret2=$contact2->add_contact($object->id, 'SHIPPING');
+	    }
+	    if ($ret1 < 0 || $ret2 < 0)
+        {
+            print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
+            $errorrecord++;
+        }
+    	else 
+    	{
+    	    print " - create contact OK";
+    	}
+	}
+	
+
+	print "\n";
+	
+	if ($errorrecord) 
+	{
+	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$object->errorsToString()."\n");
+	    $error++;    // $errorrecord will be reset
+	}
+}
+
+
+
+
+
+// commit or rollback
+print "Nb of lines qualified: ".$nboflines."\n";
+print "Nb of errors: ".$error."\n";
+if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
+{
+    print "Rollback any changes.\n";
+    $db->rollback();
+}
+else
+{
+    print "Commit all changes.\n";
+    $db->commit();
+}
+
+$db->close();
+fclose($fhandle);
+fclose($fhandleerr);
+
+exit($error);

dev/initdata/import-users.php

@@ -0,0 +1,181 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * WARNING, THIS WILL LOAD MASS DATA ON YOUR INSTANCE
+ */
+
+/**
+ *      \file       dev/initdata/import-thirdparties.php
+ *		\brief      Script example to insert thirdparties from a csv file. 
+ *                  To purge data, you can have a look at purge-data.php
+ */
+
+// Test si mode batch
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
+    exit;
+}
+
+// Recupere root dolibarr
+$path=preg_replace('/import-users.php/i','',$_SERVER["PHP_SELF"]);
+require ($path."../../htdocs/master.inc.php");
+include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+$delimiter=',';
+$enclosure='"';
+$linelength=10000;
+$escape='/';
+
+// Global variables
+$version=DOL_VERSION;
+$confirmed=1;
+$error=0;
+
+
+/*
+ * Main
+ */
+
+@set_time_limit(0);
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
+
+$mode = $argv[1];
+$filepath = $argv[2];
+$filepatherr = $filepath.'.err';
+//$defaultlang = empty($argv[3])?'en_US':$argv[3];
+$startlinenb = empty($argv[3])?1:$argv[3];
+$endlinenb = empty($argv[4])?0:$argv[4];
+
+if (empty($mode) || ! in_array($mode,array('test','confirm','confirmforced')) || empty($filepath)) {
+    print "Usage:  $script_file (test|confirm|confirmforced) filepath.csv [startlinenb] [endlinenb]\n";
+    print "Usage:  $script_file test myfilepath.csv 2 1002\n";
+    print "\n";
+    exit(-1);
+}
+if (! file_exists($filepath)) {
+    print "Error: File ".$filepath." not found.\n";
+    print "\n";
+    exit(-1);
+}
+
+$ret=$user->fetch('','admin');
+if (! $ret > 0)
+{
+	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+	exit;
+}
+$user->getrights();
+
+// Ask confirmation
+if (! $confirmed)
+{
+    print "Hit Enter to continue or CTRL+C to stop...\n";
+    $input = trim(fgets(STDIN));
+}
+
+// Open input and ouput files
+$fhandle = fopen($filepath, 'r');
+if (! $fhandle)
+{
+    print 'Error: Failed to open file '.$filepath."\n";
+    exit(1);
+}
+$fhandleerr = fopen($filepatherr, 'w');
+if (! $fhandleerr)
+{
+    print 'Error: Failed to open file '.$filepatherr."\n";
+    exit(1);
+}
+
+//$langs->setDefaultLang($defaultlang);
+
+
+$db->begin();
+
+$i=0;
+$nboflines=0;
+while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
+{
+    $i++;
+    $errorrecord=0;
+    
+    if ($startlinenb && $i < $startlinenb) continue;
+    if ($endlinenb && $i > $endlinenb) continue;
+    
+    $nboflines++;
+    
+    $object = new User($db);
+    $object->statut = 1;
+    
+    $tmp=explode(' ',$fields[3],2);
+    $object->firstname = trim($tmp[0]);
+    $object->lastname = trim($tmp[1]);
+    if ($object->lastname) $object->login = strtolower(substr($object->firstname, 0, 1)) . strtolower(substr($object->lastname, 0));
+    else $object->login=strtolower($object->firstname);
+    $object->login=preg_replace('/ /','',$object->login);
+    $object->password = 'init';
+    
+    print "Process line nb ".$i.", login ".$object->login;
+    
+    $ret=$object->create($user);
+    if ($ret < 0)
+    {
+        print " - Error in create result code = ".$ret." - ".$object->errorsToString();
+        $errorrecord++;
+    }
+	else 
+	{
+	    print " - Creation OK with login ".$object->login." - id = ".$ret;
+	}
+
+	print "\n";
+	
+	if ($errorrecord) 
+	{
+	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$object->errorsToString()."\n");
+	    $error++;    // $errorrecord will be reset
+	}
+}
+
+
+
+
+
+// commit or rollback
+print "Nb of lines qualified: ".$nboflines."\n";
+print "Nb of errors: ".$error."\n";
+if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
+{
+    print "Rollback any changes.\n";
+    $db->rollback();
+}
+else
+{
+    print "Commit all changes.\n";
+    $db->commit();
+}
+
+$db->close();
+fclose($fhandle);
+fclose($fhandleerr);
+
+exit($error);

dev/initdata/purge-data.php

@@ -0,0 +1,264 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * THIS SCRIPT DELETE ALL MAIN TABLE CONTENT
+ * WARNING, DO NOT USE ON A PRODUCTION INSTANCE
+ */
+
+/**
+ *      \file       dev/initdata/purge-data.php
+ *      \brief      Script to delete all main tables
+ */
+
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+
+// Test si mode batch
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit(-1);
+}
+
+// Recupere root dolibarr
+$path=preg_replace('/purge-data.php/i','',$_SERVER["PHP_SELF"]);
+require ($path."../../htdocs/master.inc.php");
+include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+
+$langs->load("main");
+$langs->load("errors");
+
+// Global variables
+$version=DOL_VERSION;
+$error=0;
+
+// List of sql to execute
+$sqls=array(
+    'user'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX."user_rights WHERE fk_user IN (SELECT rowid FROM ".MAIN_DB_PREFIX."user WHERE admin = 0 and login != 'admin')",
+        'DELETE FROM '.MAIN_DB_PREFIX."user WHERE admin = 0 and login != 'admin'",
+    ),
+    'bank'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'bank_account',
+        'DELETE FROM '.MAIN_DB_PREFIX.'bank_class',
+        'DELETE FROM '.MAIN_DB_PREFIX.'bank_url',
+        'DELETE FROM '.MAIN_DB_PREFIX.'bank',
+    ),
+    'contract'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'contratdet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'contrat',
+    ),
+    'invoice'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'paiement_facture',
+        'DELETE FROM '.MAIN_DB_PREFIX.'facture_rec',
+        'DELETE FROM '.MAIN_DB_PREFIX.'facturedet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'facture WHERE fk_facture_source IS NOT NULL',
+        'DELETE FROM '.MAIN_DB_PREFIX.'facture',
+    ),
+    'proposal'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'propaldet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'propal',
+    ),
+    'supplier_order'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'commande_fournisseur',
+    ),
+    'supplier_invoice'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det',
+        'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn',
+        'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposaldet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposal',
+    ),
+    'delivery'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'livraisondet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'livraison',
+    ),
+    'shipment'=>array(
+        '@delivery',
+        'DELETE FROM '.MAIN_DB_PREFIX.'expeditiondet_batch',
+        'DELETE FROM '.MAIN_DB_PREFIX.'expeditiondet_extrafields',
+        'DELETE FROM '.MAIN_DB_PREFIX.'expeditiondet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'expedition_extrafields',
+        'DELETE FROM '.MAIN_DB_PREFIX.'expedition',
+    ),
+    'order'=>array(
+        '@shipment',
+        'DELETE FROM '.MAIN_DB_PREFIX.'commandedet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'commande',
+    ),
+    'intervention'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'fichinterdet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'fichinter',
+    ),
+    'product'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'categorie_product',
+        'DELETE FROM '.MAIN_DB_PREFIX.'product_lang',
+        'DELETE FROM '.MAIN_DB_PREFIX.'product_price',
+        'DELETE FROM '.MAIN_DB_PREFIX.'product_fournisseur_price',
+        'DELETE FROM '.MAIN_DB_PREFIX.'product_stock',
+        'DELETE FROM '.MAIN_DB_PREFIX.'product',
+    ),
+    'project'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'projet_task_time',
+        'DELETE FROM '.MAIN_DB_PREFIX.'projet_task',
+        'DELETE FROM '.MAIN_DB_PREFIX.'projet',
+    ),
+    'contact'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'categorie_contact',
+        'DELETE FROM '.MAIN_DB_PREFIX.'socpeople',
+    ),
+    'thirdparty'=>array(
+        '@contact',
+        'DELETE FROM '.MAIN_DB_PREFIX.'cabinetmed_cons', 
+        'UPDATE '.MAIN_DB_PREFIX.'adherent SET fk_soc = NULL',
+        'DELETE FROM '.MAIN_DB_PREFIX.'categorie_fournisseur',
+        'DELETE FROM '.MAIN_DB_PREFIX.'categorie_societe',
+        'DELETE FROM '.MAIN_DB_PREFIX.'societe_remise_except',
+        'DELETE FROM '.MAIN_DB_PREFIX.'societe',
+    )
+);
+
+
+
+
+/*
+ * Main
+ */
+
+@set_time_limit(0);
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',',$argv));
+
+$mode = $argv[1];
+$option = $argv[2];
+
+if (empty($mode) || ! in_array($mode,array('test','confirm'))) {
+    print "Usage:  $script_file (test|confirm) (all|option)\n";
+    print "\n";
+    print "option can be ".join(',',array_keys($sqls))."\n";
+    exit(-1);
+}
+
+if (empty($option) || ! in_array($option, array_merge(array('all'),array_keys($sqls))) ) {
+    print "Usage:  $script_file (test|confirm) (all|option)\n";
+    print "\n";
+    print "option can be ".join(',',array_keys($sqls))."\n";
+    exit(-1);
+}
+
+
+$ret=$user->fetch('','admin');
+if (! $ret > 0)
+{
+	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+	exit;
+}
+$user->getrights();
+
+print "Purge all data for this database:\n";
+print "Server = ".$db->database_host."\n";
+print "Database name = ".$db->database_name."\n";
+print "Database port = ".$db->database_port."\n";
+print "User = ".$db->database_user."\n";
+print "\n";
+
+if (! $confirmed)
+{
+    print "Hit Enter to continue or CTRL+C to stop...\n";
+    $input = trim(fgets(STDIN));
+}
+
+
+/**
+ * Process sql requests of a family
+ * 
+ * @param   string  $family     Name of family key of array $sqls
+ * @return  int                 -1 if KO, 1 if OK
+ */
+function processfamily($family)
+{
+    global $db, $sqls;
+    
+    $error=0;
+    foreach($sqls[$family] as $sql)
+    {
+        if (preg_match('/^@/',$sql))
+        {
+            $newfamily=preg_replace('/@/','',$sql);
+            processfamily($newfamily);
+            continue;
+        }
+        
+        print "Run sql: ".$sql."\n";
+        $resql=$db->query($sql);
+        if (! $resql)
+        {
+            if ($db->errno() != 'DB_ERROR_NOSUCHTABLE')
+            {
+                $error++;
+            }
+        }
+    
+        if ($error)
+        {
+            print $db->lasterror();
+            $error++;
+            break;
+        }
+    }
+    
+    if ($error) return -1;
+    else return 1;
+}
+
+
+$db->begin();
+
+$oldfamily='';
+foreach($sqls as $family => $familysql)
+{
+    if ($option && $option != 'all' && $option != $family) continue;
+
+    if ($family != $oldfamily) print "Process action for family ".$family."\n";
+    $oldfamily = $family;
+
+    $result=processfamily($family);
+    if ($result < 0) 
+    {
+        $error++;
+        break;
+    }
+}
+
+if ($error || $mode != 'confirm')
+{
+    print "Rollback any changes.\n";
+    $db->rollback();
+}
+else
+{
+    print "Commit all changes.\n";
+    $db->commit();
+}
+
+$db->close();
+

dev/initdemo/README

@@ -0,0 +1,17 @@
+README
+------
+
+*** Demo
+
+Scripts in this directory can be used to reinit a demo database.
+WARNING: This will erase current database with data into initdemo.sql.
+
+Do a chmod 700 initdemo.sh
+then run ./initdemo.sh to launch Graphic User Interface.
+
+Install of package "dialog" is required.
+
+
+*** Other
+
+Other scripts into initdata can be used to load data test.