Merge remote-tracking branch 'origin/3.8' into 3.9

Conflicts:
	htdocs/compta/localtax/quadri_detail.php
	htdocs/core/lib/tax.lib.php

.gitattributes

@@ -31,3 +31,22 @@
 *.frm binary
 *.MYD binary
 *.MYI binary
+
+# Export ignores to generate clean production tarballs
+/build              export-ignore
+/dev                export-ignore
+/doc                export-ignore
+/test               export-ignore
+.buildpath          export-ignore
+/build.xml          export-ignore
+.codeclimate.yml    export-ignore
+Dockerfile          export-ignore
+.dockerignore       export-ignore
+.editorconfig       export-ignore
+.gitattributes      export-ignore
+.gitignore          export-ignore
+.mailmap            export-ignore
+.scrutinizer.yml    export-ignore
+.settings           export-ignore
+.travis.yml         export-ignore
+.tx                 export-ignore

.gitignore

@@ -17,4 +17,10 @@ doxygen_warnings.log
 *.iml
 Thumbs.db
 # Vagrant generated files
-.vagrant
+.vagrant
+# Composer installed repositories
+/htdocs/includes/**/.git
+# Composer autoloader and unwanted files
+htdocs/includes/autoload.php
+htdocs/includes/bin/
+htdocs/includes/composer/

.travis.yml

@@ -269,10 +269,16 @@ script:
   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 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 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 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
   cd -
   set +e
   echo
@@ -304,3 +310,4 @@ after_failure:
   fi
 
 after_script:
+

.tx/config

@@ -146,6 +146,12 @@ source_file = htdocs/langs/en_US/holiday.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.hrm]
+file_filter = htdocs/langs/<lang>/hrm.lang
+source_file = htdocs/langs/en_US/hrm.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.incoterm]
 file_filter = htdocs/langs/<lang>/incoterm.lang
 source_file = htdocs/langs/en_US/incoterm.lang
@@ -218,6 +224,12 @@ source_file = htdocs/langs/en_US/members.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.oauth]
+file_filter = htdocs/langs/<lang>/oauth.lang
+source_file = htdocs/langs/en_US/oauth.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.opensurvey]
 file_filter = htdocs/langs/<lang>/opensurvey.lang
 source_file = htdocs/langs/en_US/opensurvey.lang
@@ -278,6 +290,12 @@ source_file = htdocs/langs/en_US/propal.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.receiptprinter]
+file_filter = htdocs/langs/<lang>/receiptprinter.lang
+source_file = htdocs/langs/en_US/receiptprinter.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.resource]
 file_filter = htdocs/langs/<lang>/resource.lang
 source_file = htdocs/langs/en_US/resource.lang
@@ -314,6 +332,12 @@ source_file = htdocs/langs/en_US/suppliers.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.supplier_proposal]
+file_filter = htdocs/langs/<lang>/supplier_proposal.lang
+source_file = htdocs/langs/en_US/supplier_proposal.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.trips]
 file_filter = htdocs/langs/<lang>/trips.lang
 source_file = htdocs/langs/en_US/trips.lang

CONTRIBUTING.md

@@ -4,19 +4,18 @@ How to contribute to Dolibarr
 Bug reports and feature requests
 --------------------------------
 
-*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](http://www.dolibarr.org/forum).
+<a name="not-a-support-forum"></a>*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](http://www.dolibarr.org/forum).
 
-**NEW**
-
-Issues are now managed on [GitHub](https://github.com/Dolibarr/dolibarr/Issues).
+Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/Issues).
 
 1. Please [use the search engine](https://help.github.com/articles/searching-issues) to check if nobody's already reported your problem.
 2. [Create an issue](https://help.github.com/articles/creating-an-issue). Choose an appropriate title. Prepend appropriately with Bug or Feature Request.
-3. Report with as much detail as possible ([Use screenshots or even screencasts whenever possible](https://help.github.com/articles/issue-attachments)).
+4. Tell us the version you are using!
+3. Write a report with as much detail as possible (Use [screenshots](https://help.github.com/articles/issue-attachments) or even screencasts and provide logging and debugging informations whenever possible).
 
-We're still figuring out how to migrate old issues to GitHub. In the meantime, they are still available at [Doliforge](https://doliforge.org/projects/dolibarr).
 
-<a name=code></a>Code
+
+<a name="code"></a>Code
 ---------------------
 
 ### Basic workflow
@@ -27,7 +26,7 @@ We're still figuring out how to migrate old issues to GitHub. In the meantime, t
 4. Commit and push your changes.
 5. [Make a pull request](https://help.github.com/articles/creating-a-pull-request).
 
-### <a name=branches></a>Branches
+### <a name="branches"></a>Branches
 
 Unless you're fixing a bug, all pull requests should be made against the *develop* branch.
 
@@ -39,11 +38,47 @@ We officially support versions N, N − 1 and N − 2 for N the latest version a
 Choose your base branch accordingly.
 
 ### General rules
-Please don't edit the ChangeLog file. A project manager will update it from your commit messages.
+Please don't edit the ChangeLog file. File will be generated from your commit messages during release process by the project manager.
 
-### Commits
+### <a name="commits"></a>Commits
 Use clear commit messages with the following structure:
 
+```
+[KEYWORD] [ISSUENUM] DESC
+
+LONGDESC
+```
+
+#### Keyword
+In uppercase if you want to have the log comment appears into the generated ChangeLog file.
+
+The keyword can be ommitted if your commit does not fit in any of the following categories:
+- Fix: for a bug fix
+- Close: for closing a referenced feature request
+- New: for an unreferenced new feature (Opening a feature request and using close is prefered)
+
+#### Issuenum
+If your commit fixes a referenced bug or feature request.
+
+In the form of a # followed by the GitHub issue number.
+
+#### Desc
+A short description of the commit content.
+
+This should ideally be less than 50 characters.
+
+#### LongDesc
+A long description of the commit content.
+
+You can really go to town here and explain in depth what you've been doing.
+
+Feel free to express technical details, use cases or anything relevant to the current commit.
+
+This section can span multiple lines.
+
+Try to keep lines under 120 characters.
+
+#### Samples
 <pre>
 FIX|Fix #456 Short description (where #456 is number of bug fix, if it exists. In upper case to appear into ChangeLog)
 or
@@ -57,8 +92,17 @@ Long description (Can span accross multiple lines).
 </pre>
 
 ### Pull Requests
-When submitting a pull request, use same rule than Commits. With upper case keyword to appear into ChangeLog.
+When submitting a pull request, use same rule as [Commits](#commits) for the message.
 
+If your pull request only contains one commit, GitHub will be smart enough to fill it for you.
+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 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.
 
 ### Resources
 [Developer documentation](http://wiki.dolibarr.org/index.php/Developer_documentation)
@@ -67,18 +111,18 @@ Translations
 ------------
 The source language (en_US) is maintained in the repository. See the [Code](#code) section above.
 
-All other translations are managed online at [Transifex](https://www.transifex.com/projects/p/dolibarr).
+All other translations are managed online at [Transifex](https://www.transifex.com/dolibarr-association/dolibarr/).
 
 Join an existing translation team or create your own and translate into the interface.
 
 Your translations will be available in the next major release.
 
 ### Resources
-[Translator documentation](http://wiki.dolibarr.org/index.php/Developer_documentation)
+[Translator documentation](http://wiki.dolibarr.org/index.php/Translator_documentation)
 
 Documentation
 -------------
 The project's documentation is maintained on the [Wiki](http://wiki.dolibarr.org/index.php).
 
-*You need to create an account before being able to edit.*
+*Note*: to help prevent spam, you need to create an account before being able to edit.
 

COPYRIGHT

@@ -12,21 +12,24 @@ Dolibarr uses some external libraries released under different licenses. This is
 Component              Version       License                     GPL Compatible  Usage
 -------------------------------------------------------------------------------------
 PHP libraries:
-AdoDb-Date             0.33          Modified BSD License        Yes             Date convertion (not into rpm package)
-ChromePHP              4.3.3         Apache Software License 2.0 Yes             Return server log to chrome browser console
+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
+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
 GeoIP                  1.4           LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
-Mobiledetect           2.8.3         MIT License                 Yes             Detect mobile devices browsers
+Mobiledetect           2.8.17        MIT License                 Yes             Detect mobile devices browsers
 NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
 PEAR Mail_MIME         1.8.9         BSD                         Yes             NuSoap dependency
 odtPHP                 1.0.1         GPL-2+  b                   Yes             Library to build/edit ODT files
-PHPExcel               1.8.0         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
+PHPExcel               1.8.1         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
 php-iban               1.4.7         LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
+PHPoAuthLib            0.8.2         MIT License                 Yes             Library to provide oauth1 and oauth2 to different service
 PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
 Restler                3.0           LGPL-3+                     Yes             Library to develop REST Web services
-TCPDF                  6.2.6         LGPL-3+                     Yes             PDF generation
-EvalMath               1.0           BSD                         Yes             Safe math expressions evaluation
+TCPDF                  6.2.12        LGPL-3+                     Yes             PDF generation
+TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
 
 JS libraries:
 jQuery                 1.11.3        MIT License                 Yes             JS library
@@ -49,10 +52,10 @@ jQuery TableDnD        0.6           GPL and MIT License         Yes
 jQuery Timepicker      1.1.0         GPL and MIT License         Yes             JS library Timepicker addon for Datepicker
 jQuery Tiptip          1.3           GPL and MIT License         Yes             JS library for tooltips
 jsGantt                1.2           BSD License                 Yes             JS library (to build Gantt reports)
-JsTimezoneDetect       1.0.4         MIT Licence                 Yes             JS library to detect user timezone
+JsTimezoneDetect       1.0.6         MIT License                 Yes             JS library to detect user timezone
 
 For licenses compatibility informations:
-http://www.fsf.org/licensing/licenses/index_html
+http://www.gnu.org/licenses/licenses.en.html
 
 
 Copyright

ChangeLog

@@ -2,13 +2,343 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
-WARNING: Do not try to make any Dolibarr upgrade if you are running Mysql version 5.5.40.
+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 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 3.9.1 compared to 3.9.* *****
+FIX: #3815 Call to undefined function local_by_date()
+FIX: #4424 Missing email of user popup in supplier orders area
+FIX: #4442 Missing translation in Banks menu
+FIX: #4737 Bank transacion type selector translation is cropped
+FIX: #4742 Able to delete a supplier invoice with a registered payment
+FIX: #4743 UI glitch in project summary page
+FIX: #4747 Missing UI background when registering a supplier invoice payment
+FIX: #4748 Supplier invoice payment confirmation amount is not translated
+FIX: #4766 VAT not shown in supplier invoice popup
+FIX: #4784
+FIX: #4809 Duplicate functions with different content
+FIX: #4812
+FIX: #4839
+FIX: #4851 Project selector in supplier invoices shows the project label twice
+FIX: #4870
+FIX: #4874 SQL error when listing users
+FIX: #4880
+FIX: #4961
+FIX: #4989
+FIX: If oauth has never been activated two tables are missing and printing is not working
+FIX: A not enabled field for list must not into fields to add
+FIX: Bad color of message password changed
+FIX: Bad error and style message when changing its own login
+FIX: Bad function name call on delete
+FIX: Bad include and param for project numbering module call
+FIX: bad translation language loaded FIX: When changing thirdparty on event card, the showempty option of contact was lost. FIX: Bad placeholder shown on combo to select a thirdparty.
+FIX: Bad vat definition when using POS module
+FIX: Box disabled because bugged
+FIX: Can not select a commercial on the creation of a third
+FIX: Check of EAN13 barcode when mask was set to use 13 digits instead of 12
+FIX: correct display of minimum buying price
+FIX: Creation of thumb image for size "small" was not done.
+FIX: Damn, where was the project ref ?
+FIX: Default vat is not set correctly when an error occured and we use VAT identified by a code.
+FIX: dont retrieve new buying price on margin display
+FIX: Duplicate records into export
+FIX: Each time we edit a line, we loose the unit price.
+FIX: Email templates not compatible with Multicompany
+FIX: Export must use a left join to not loose lines
+FIX: fetchAllEMailTemplate
+FIX: Filter/search on extrafields on lists
+FIX: finished parameters not used
+FIX: Generated thumbs must always use the png format so using thumbs can work.
+FIX: Hook resprint  be printed
+FIX: image extension must be in lower case
+FIX: Missing clean of criteria
+FIX: Missing database escaping on supplier price insert/update
+FIX: Missing function
+FIX: Multiprice generator didn't recalculate prices if only the price_base_type property changes
+FIX: Not removing code into vatrate.
+FIX: Not showing sellprice properly on product list
+FIX: Parsing of amount to pay vat
+FIX: PHPCS
+FIX: PMP is deprecated at warehouse level
+FIX: real min buying price
+FIX: Same term to create than other objects
+FIX: Some records were lost into margin per product report
+FIX: systematic rounding causes prices to be updated without reason
+FIX: Template email must take care of positino column
+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.
+NEW: Introduce a new theme called "Material Design". 
+NEW: #3767 Allow changing multiple prices of a product at once
+NEW: Add a button to purge criteria in user list
+NEW: Add a filter field to restrict list of member when doing a LDAP list request. Use also this filter into ldap command line script making sync from ldap to dolibarr.
+NEW: Add all assigned users and all extrafields data in new event when we createFromClone
+NEW: Add hidden option to use standard position address in crabe model For electronic sending solutions
+NEW: Add a refresh button on page list of direct print jobs.
+NEW: Add a tab "document" in donation card
+NEW: Add cancel button on thirdparty create page
+NEW: Add chart of product statistics
+NEW: Add color on categories
+NEW: Add date value filter on account records list
+NEW: Add __PROJECT_NAME__ tag for customer invoice emails
+NEW: Add option PDF_ALLOW_HTML_FOR_FREE_TEXT to be able to enter pdf footer text with wysiwyg editor.
+NEW: Add fields into llx_cronjobs to be able to use job table to queue one shot jobs.
+NEW: Add filter on status on invoice list
+NEW: Add filter on status on shipments
+NEW: Add gender property managed on user card FIX: Better error messages when uploading photo of user when permission to write are not granted
+NEW: Add help tooltips on fields of dictionary edit pages.
+NEW: Add hidden option MAIN_MAILFORM_DISABLE_ENTERKEY to disable the key enter into the form to send email.
+NEW: Add $ID$ into extrafields management to allow use of current object id on filter for select list from table and checkbox list from table
+NEW: Add info page on product card
+NEW: Add into about page, a sample text to use to promote new version release (visible only if version is last stable)
+NEW: Add none/all selection into list of files for FTP browser module
+NEW: Add opportunity amount on project card.
+NEW: Add link "date of invoice" to select date of invoice when creating a payment in one click.
+NEW: Add planned workload and declared progress on project summary list on project home page (data aggregated from tasks of project)
+NEW: Add ref and label of project into export
+NEW: Add status into filters of graph
+NEW: Add tab document on salaries payment
+NEW: Add thumb of users into stats box on home page
+NEW: A link to the bugtracker report tool can be enabled in the GUI
+NEW: Better look for POS. More responsive design.
+NEW: Can add project search on left menu search area
+NEW: Can assign a task to yourself to have it appear on timesheet.
+NEW: Can close a project that has draft status with no need to switch it to validate status before.
+NEW: Can edit Background color for Top menu and Background color for table title line.
+NEW: Can edit email templates using WYSIWYG editor.
+NEW: Can edit list of prospect status for customers/prospects. Add a new entry into dictionary table to manage list fo status.
+NEW: Can filter on contact status in prospect list. Removed deprecated menu entry.
+NEW: Can filter proposal on a tag of a product.
+NEW: Can filter proposal, orders or invoices with criteria "contain at least one product with following tag"
+NEW: Can choose fields to show on project list.
+NEW: Can choose fields to show in product list. Extrafields are also supported.
+NEW: Can choose fields to show into the contact list. Extrafields are also supported.
+NEW: Can choose fields to show into list of users. Extrafields are also supported.
+NEW: Can set default value of event type when creating an event (if option "manage type of event" is used).
+NEW: Can upload files on leave requests. Use more standard permissions.
+NEW: Can use a "|" to make a OR search on several different criterias into search text filters of tables.
+NEW: Can use the * as a joker characters into search boxes of lists.
+NEW: Clean code into salary module, debug and add indexes 
+NEW: Can filter on user list and salary payments on user with naural search.
+NEW: Can clone agenda events.
+NEW: Color category is visible onto the thumb of tags on thirdparty, or products cards.
+NEW: Conf to use next product/service ref when we clone a product/service
+NEW: Contract module can be used to follow both sold and bought contracts/recurring subscriptions.
+NEW: Can change amount when creating withdraws requests.
+NEW: FEATURE PROPOSAL: on proposal, order or invoice creation from scratch, reload page after customer selection so its informations can be loaded
+NEW: Filter "active" by default on user list. Fix label of permission of project module.
+NEW: Forms are using the "tab look", even in creation mode.
+NEW: Free text for cheque deposit receipt can be HTML content.
+NEW: Hidden option THEME_ELDY_USE_HOVER is stable enough to become officialy visible into setup.
+NEW: If module salaries is on, you can set a hourly value for time consumed by users. When a user enter its time consumed on a project, a calculation is done to provide the cost for human services. This value appears into the "Overview" of project.
+NEW: Add import profile to import sales representatives of third parties.
+NEW: Increase length of bank code to 128 char #3704
+NEW: Into the overview of projects, the name of thirdparty appears into combo lists of elements to link to project.
+NEW: Introduce a "code" into table of vats to describe VAT. This will allow to suggest different vat lines with same value with ability to differentiate them.
+NEW: Introduce cost price on products.
+NEW: Introduce hidden option MAIN_LANDING_PAGE to decide the home page visible just after login.
+NEW: Introduce hidden option MAIN_REPLACE_TRANS_xx_XX to allow simple replacement of translated string on the fly. Prefer to use next method.
+NEW: Introduce table llx_overwrite_trans to be able to overwrite translations by simple database edition.
+NEW: Introduce use of cache for thumbs images of users to save bandwith.
+NEW: Experimental level multiprice generator based on per cent variations over base price.
+NEW: List of projects of a thirdparty are visible on a project tab for the thirdparty.
+NEW: Merge all left menu search boxes into one.
+NEW: Merge all search fields of an area page into one search box.
+NEW: Next ref on clone doesn't need conf, it's used if mask exists.
+NEW: Only arrow of current sorted field is visible into table views. This save a lot of space. You can click on the column title to sort. This make clickable area larger and click to sort is easier.
+NEW: On page to see/edit contact of an ojbect, the status of contact is visible (for both external and internal users).
+NEW: Option "encrypt password" into database is set to on by default on first install.
+NEW: Print event type on third party card tab agenda list (only if AGENDA_USE_EVENT_TYPE = 1)
+NEW: Provide an easier way to understand if an order can be shipped.
+NEW: Quick search filter works also on invoice, proposal, order, intervention, contract and expense reports.
+NEW: Replace category edition page on members with new select2 component.
+NEW: Show photo of logged user into login top right block. 
+NEW: If no photo is available for user, we show a generic photo depending on gender.
+NEW: Show photo of user into user list.
+NEW: Show which fields were used for search when doing a "generic search" from the "quick search" form on left menu.
+NEW: Statistic graphs on products offer a filter on product type (product / service or both)
+NEW: Syslog displays configuration errors
+NEW: The clicktodial module is now able to provide link "tel:" on phone numbers. So it is also possible to use clicktodial with a client solution like the "xivo" local client.
+NEW: The conditional IF into ODT templates works also on not defined var so we can show data only if defined. Close #3819
+NEW: The free text in PDF footers can now be a HTML content. So the WYSIWYG editor is on by default to edit it into module setup.
+NEW: The thirdparties tabs, the contacts tabs and the members tabs are now presented using a new "top banner", saving space and using a same way to show address, status and navigation arrows.
+NEW: Thumbs for statistics on main page are fully clicable (not only link inside the thumb)
+NEW: Translate extrafield's labels.
+NEW: Use new select2 component for juridical status, country and state selection.
+NEW: When creating order, proposal or invoice from thirdparty card, the project is asked during creation. A link to create project if it does not exists is also available. 
+NEW: Uniformize form creation of proposal to add public and private notes during creation like for order and invoice.
+NEW: More robust antiXSS engine.
+NEW: Compatibility with Mysql 5.7+
+
+For developers:
+NEW: The search box and the bookmarks are now rendered by the menu manager.
+NEW: Add a new widget $form->selectArrayAjax() to use combo list with content coming from an Ajax URL.
+NEW: Add doActions hook method call in contract card
+NEW: Added doActions hooks to user cards
+NEW: Add a new component to select categories/tags from the main edit page of product. The dedicated tab is also removed.
+NEW: upgrade jQuery Component Datable (and extras) to 1.10.7
+NEW: script to build API class from existing class
+NEW: Prepare database to store information per files (for example to define if an image can be used as a cover or not)
+NEW: log hooks loading
+NEW: Introduce property module_position so a module can decide where it appears into list of modules.
+NEW: Introduce function dolGetFirstLineOfText
+NEW: Introduce a method getDefaultCreateValueForField for developers to get a default value to use for a form in create mode. Implement it for public and private notes.
+NEW: A module can add its entries into cron module.
+NEW: Framework feature. To have a page being loaded at same scrollbar level after a click on a href link, just add the class "reposition" on this link.
+NEW: Add exemple of setup for multitail to render dolibarr log files
+NEW: Add restler framework. First step to build REST API into Dolibarr.
+NEW: Add css class and ids on column of detail lines to allow module to easily manipulate fields.
+NEW: Add hook in send mail
+NEW: Add hooks on list of members to allow an external module to add more fields into list view.
+NEW: Add hooks to allow an external module to complete list of events into calendar views.
+NEW: Add "productpricecard" hook and uniformize code
+NEW: Enhance also the prototype test_arrays to include select form before table.
+NEW: Enhance prototype, project list and proposal list with new hooks to have an external module able to add more fields.
+NEW: Enhance style engine. Add option to set color of links.
+NEW: ODT generators can now also set meta properties of ODT file.
+NEW: Add missing columns into llx_expedition to match other tables.
+NEW: A new function getImageFileNameForSize was also introduced to choose image best size according to usage to save bandwith.
+NEW: Support logging to a Sentry server
+NEW: Prepare database to have agenda able to store more detailed emails events. 
+
+WARNING: 
+
+Dolibarr 3.9 is not yet fully compatible with PHP 7 even if most features seems to work.
+
+Mysql minimum version is now 5.0.3 
+
+Following changes may create regression for some external modules, but were necessary to make
+Dolibarr better:
+- Deprecated Product::setPriceExpression. Use Product::update instead
+- Deprecated hidden option MAIN_USE_CUSTOM_TRANSLATION has been removed. Use table llx_overwrite_trans instead.
+- Trigger LINECONTRACT_INSERT has been renamed into LINECONTRACT_CREATE to match common denomination.
+- A lot hooks used into PDF generation were not correctly implemented. We had to fix this. The result si that
+the following hook were set as hook of type "replace". This means if your module implement such hooks, it must 
+return 0 to execute standard code or 1 to replace standard code (value to output should be set into resPrints instead).
+This is list of hooks modified:
+'pdf_getlinenum', 'pdf_getlineref', 'pdf_getlineref_supplier', 'pdf_getlinevatrate', 'pdf_getlineupexcltax',
+'pdf_getlineupwithtax', 'pdf_getlineqty', 'pdf_getlineqty_asked', 'pdf_getlineqty_shipped', 'pdf_getlineqty_keeptoship',
+'pdf_getlineunit', 'pdf_getlineremisepercent', 'pdf_getlineprogress', 'pdf_getlinetotalexcltax', 'pdf_getlinetotalwithtax'
+- Renamed Product::isservice and Product::isproduct to match PSR-2
+- Remove deprecated Product::hidden property
+
+
+ 
+***** ChangeLog for 3.8.4 compared to 3.8.3 *****
+FIX: #3694
+FIX: #3798 #2519 Cron jobs would never be executed
+FIX: #4155 Search Categories error
+FIX: #4239
+FIX: #4272 Error when trying to print the page "Linked objects" of a Thirdparty
+FIX: #4291 Correctly filter bank card GETPOSTs
+FIX: #4291 Correctly filter external calendar GETPOSTs
+FIX: #4341
+FIX: #4394 Untranslated label in list of expense reports
+FIX: #4414 Supplier invoices use FAC_FORCE_DATE_VALIDATION client invoices property
+FIX: #4418
+FIX: #4425 Missing "VAT" translation in supplier order popup
+FIX: #4434 Weird behaviour when enabling multiprices
+FIX: #4440 Wrong price is filled by Product::fetch into multiprices arrays
+FIX: #4453 SEPA Direct Debit generated XML shows a trailing comma in RmtInf field
+FIX: #4528
+FIX: #4556 desiredstock and seuil_stock_alerte cleared on modify product card
+FIX: #4580
+FIX: #4583 Incorrect call of Categories::containing throws a DoliDB error
+FIX: #4649 Wrong parameters order
+FIX: #4768
+FIX: #4785
+FIX: Add a test to show bugged module with a bad declaration of dictionaries to avoid to see clean module to be breaked.
+FIX: add Croatia into list of country in EEC
+FIX: add missing global def for ttc column
+FIX: ajax error with multicompany module
+FIX: Avoid errors when batch stock is negative
+FIX: bad field in select
+FIX: bad path
+FIX: bad transaction level due to code of situation invoices
+FIX: best sql request
+FIX: bookmark's user change after update if the user hasn't superadmin right
+FIX: call trigger LINEBILL_SUPPLIER_CREATE
+FIX: Can not disabled an opened service line in a contract
+FIX: can't clone event
+FIX: can't send mail to thirdparty contact if no mail defined on thirdparty card
+FIX: Check stock of batch on shippment
+FIX: code corrupting database
+FIX: compatibility with multicompany transversal mode
+FIX: compatibility with multicompany transversal mode and more security issue
+FIX: Contrat card don't consider user permissions to show active/unactive service button
+FIX: CVE CVE-2015-8685
+FIX: Deadlock situation. Can't edit anymore contract. FIX: List of automatic events was not visible.
+FIX: disable main.inc.php hooks
+FIX: do not show warning if account defined
+FIX: don't see the sales representative of anothers entities
+FIX: duration format
+FIX: Correct problem of rights beetween tax and salaries module
+FIX: Email templates not compatible with Multicompany
+FIX: $fileparams is not defined
+FIX: filter by socid if from customer card
+FIX: for avoid conflict with "global $m" in memory.lib.php
+FIX: for avoid division by 0
+FIX: hover css
+FIX: If option to hide automatic ECM is on, dont show menu.
+FIX: if we dont use SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE the hour is displayed on pdf
+FIX: Introduce hidden option to disable feature than hangs when too much data
+FIX: ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden constant
+FIX: issue when bank module is disabled FIX: missing entity filter for lines of payment
+FIX: list of leave request was not showing label correctly.
+FIX: MAIN_THIRDPARTY_CREATION_INDIVIDUAL syntax error in name
+FIX: markRate can be 100
+FIX: minor css error (pixel size must have "px"). Compatibility with old behaviour.
+FIX: missing field "label"
+FIX: missing signature and uniformize code between card and script
+FIX: missing traduction
+FIX: missing translation
+FIX: missing translation key
+FIX: nblignes not calculated after hook and hook can't modify this value. Usefull for modules
+FIX: no database structure change is allowed into minor versions
+FIX: no transaction in this place
+FIX: Noway to validate a leave request for some uer even if they have permission for.
+FIX: Option to disable meteo was not set correctly in edit mode
+FIX: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9)
+FIX: path to copyrighted files
+FIX: php unit to work both with old and new setup
+FIX: Purge of temp files was broken
+FIX: Relative discount decimals are not saved
+FIX: Removed a bugged list. Fixed another one to not count data of previous year.
+FIX: retrieve correct pu_ttc (set by printObjectLine function) like in 3.7
+FIX: search product in customer product prices doesn't work
+FIX: Some filters are lost when paging
+FIX: sql injection #4341
+FIX: sql injection even when code is on several lines
+FIX: sql request and total for time spen for current month
+FIX: Sql syntax error in doc_generic_task_odt
+FIX: Status filter don't work
+FIX: Strict Standards: Only variables should be passed by reference
+FIX: The part added with hidden option MAIN_DOC_USE_TIMING was included with a . instead of -. This make os think it is part of extension instead of file name.
+FIX: The third dashboard don't consider user permissions
+FIX: the view my task must show only task you are assigned to
+FIX: to allow phpunit of migration process for 3.4 to 3.5
+FIX: to allow phpunit of migration process for 3.5 to 3.6
+FIX: userlocaltax
+FIX: view of product image when using old path 
+FIX: size of image uploaded on user.
+FIX: We must ue the "small" size of imge to show on card pages.
+FIX: When we make a direct assignement on a task to a user, we must check he is also assigned to project (and if not assign it)
+FIX: wrong fk_parent_line in credit note with invoiceAvoirWithLines option
+FIX: wrong modelpdf var name
+FIX: wrong object name
+
 ***** ChangeLog for 3.8.3 compared to 3.8.2 *****
 FIX: #3805
 FIX: #3231 [Members] Public subscription page displays GeoIP error
@@ -212,6 +542,7 @@ FIX: When filter with empty status, by default get canceled status (-1)
 FIX: When update a member login for a member linked to a user, the login of user was not sync (not updated).
 FIX: Wizard for restore does not show import command
 
+
 ***** ChangeLog for 3.8 compared to 3.7.* *****
 For users:
 FIX: #2519
@@ -430,6 +761,42 @@ Dolibarr better:
 - Function get_exdir require now 6 parameters. This is to prepare a future feature.
 
 
+***** ChangeLog for 3.7.4 compared to 3.7.3 *****
+FIX: #3694
+FIX: #4239
+FIX: #4291 Correctly filter external calendar GETPOSTs
+FIX: #4341
+FIX: #4414 Supplier invoices use FAC_FORCE_DATE_VALIDATION client invoices property
+FIX: #4440 Wrong price is filled by Product::fetch into multiprices arrays
+FIX: add missing global def for ttc column
+FIX: Contrat card don't consider user permissions to show active/unactive service button
+FIX: CVE CVE-2015-8685
+FIX: Email templates not compatible with Multicompany
+Fix: for avoid division by 0
+FIX: ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden constant
+FIX: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9)
+FIX: sql injection even when code is on several lines
+FIX: The third dashboard don't consider user permissions
+
+***** ChangeLog for 3.7.3 compared to 3.7.2 *****
+FIX: #3734 Do not show empty links of deleted source objects in stock movement list
+FIX: #3890 Expected transactions bank account page, shows negative numbers
+FIX: #3928 Creating a Customer order and a Customer invoice from a project, does not inherit payment conditions and method of payment of customer card
+FIX: #3980 Search field in "product by supplier" list sends empty result 3.8 and 3.7
+FIX: #4081 Added missing translation
+FIX: #4097 Public holiday calculation
+FIX: #4242 Allow disabling dashes in documents
+FIX: #4243 sql injection
+FIX: Can use formated float number on old expense report module.
+FIX: Change object statut when closing shipment and remove erratic db commit
+FIX: Export with category contact extrafields
+FIX: NB task and percent progress in box project
+FIX: Not delete a product when have customer price
+FIX: Not deleting contrats on element_element table
+FIX: Not use localtaxes when invoice some orders
+FIX: Product link in project box
+FIX: Use "WHERE true" instead of "WHERE 1" #4132
+
 ***** ChangeLog for 3.7.2 compared to 3.7.1 *****
 FIX: #2957 : missing $langs object for trigger
 FIX: #2983 Load gravatar avatar images securely over HTTPS
@@ -543,9 +910,11 @@ FIX send mail, copy sendto don't read the list of contact
 FIX Properly escape untrusted data to prevent HTML injection.
 FIX send mail, copy sendto don't read the list of contact
 
-Path to save photos of products was moved in 3.7.0 to match path of other attached files. If you had loose
-your photo on the photo tab of products, you can set the constant "PRODUCT_USE_OLD_PATH_FOR_PHOTO" to
-restore old path.
+WARNING:
+
+Path to save photos of products was moved to match path of other attached files. If you had loose your photo
+on the photo tab of products, you can set the constant "PRODUCT_USE_OLD_PATH_FOR_PHOTO" to 1 (home - setup - other)
+to restore old path and get back working links without having to resubmit images.
 
 WARNING:
 
@@ -718,11 +1087,14 @@ You may also experience troubles with Mysql 5.5.41 with error "Lost connection"
 Upgrading to any other version or database system is abolutely required BEFORE trying to
 make a Dolibarr upgrade.
 
-WARNING: Following changes may create regression for some external modules, but was necessary to make
+WARNING: 
+
+Following changes may create regression for some external modules, but was necessary to make
 Dolibarr better:
 
 - Path to save photos of products was moved to match path of other attached files. If you had loose your photo
-  on the photo tab of products, you can set the constant "PRODUCT_USE_OLD_PATH_FOR_PHOTO" to restore old path.
+  on the photo tab of products, you can set the constant "PRODUCT_USE_OLD_PATH_FOR_PHOTO" to 1 (home - setup - other)
+  to restore old path and get back working links without having to resubmit images.
 - If you can't see trips and expenses records, check that you have the new permission "read all
   trips and expenses".
 - Deprecated module "oscommerce" were removed.
@@ -738,6 +1110,22 @@ Dolibarr better:
 - Replaced USER_UPDATE_SESSION trigger with an updateSession hook may break modules using it.
 
 
+
+***** ChangeLog for 3.6.7 compared to 3.6.6 *****
+FIX: #4291 Correctly filter external calendar GETPOSTs
+FIX: CVE CVE-2015-8685
+
+***** ChangeLog for 3.6.6 compared to 3.6.5 *****
+FIX: #3734 Do not show empty links of deleted source objects in stock movement list
+FIX: #4081 Added missing translation
+FIX: #4097 Public holiday calculation
+FIX: #4242 Allow disabling dashes in documents
+FIX: #4243 sql injection
+FIX: Add a protection to not make release if ChangeLog was not generated. Prepare package 3.6.5
+FIX: export with category contact extrafields
+FIX: Not delete a product when have customer price
+FIX: Not deleting contrats on element_element table
+
 ***** ChangeLog for 3.6.5 compared to 3.6.4 *****
 FIX: #2957 : missing $langs object for trigger
 FIX: #2983 Load gravatar avatar images securely over HTTPS
@@ -979,6 +1367,17 @@ removed. You must now use the 6 parameters way. See file modMyModule.class.php f
 - Remove add_photo_web() that is not used anymore by core code.
 
 
+***** ChangeLog for 3.5.8 compared to 3.5.7 *****
+FIX: #4291 Correctly filter external calendar GETPOSTs
+FIX: bad calculation for stock value
+FIX: bad stock valo
+FIX: change order date on clone (as everywhere else)
+FIX: CVE CVE-2015-8685
+FIX: The hours of date filter aren't correct
+FIX: #3442 Remove useless syslog
+FIX: #3448 Pass expected date format
+FIX: #3471 3.5 Rounding issue when dispatching non-integer
+
 ***** ChangeLog for 3.5.7 compared to 3.5.6 *****
 Fix: Paypal link were broken due to SSL v3 closed.
 Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains numbers
@@ -1544,7 +1943,7 @@ backport commit 384e3812eb73a15adafb472cacfb93397a54459b to fix W3C/edit contrac
 - Fix: [ bug #810 ] Cannot update ODT template path
 - Fix: [ bug #816 ] Sales journal does not reflect localtaxes
 - Fix: [ bug #817 ] Purchases journal does not reflect localtaxes
-- Fix: [ bug #824 ] MAIN_DB_PREFIX not use into dictionnary
+- Fix: [ bug #824 ] MAIN_DB_PREFIX not use into dictionary
 - Fix: [ bug #828 ] Error when code_region is not a number in llx_c_regions (with postgres)
 - Fix: [ bug #855 ] Holiday approval email in French
 - Fix: [ bug #856 ] (Holidays module) Mail error if destination user doesn't have an email
@@ -1563,7 +1962,7 @@ backport commit 384e3812eb73a15adafb472cacfb93397a54459b to fix W3C/edit contrac
 - Fix: [ bug #736 ] Missing column in llx_c_chargesociales  
 - Fix: Localtax2 for Spain must be based into buyer
 - Fix: [ bug #762 ] Bad profit calculation in Reporting
-- Fix: bug dictionnary with wrong prefix table
+- Fix: bug dictionary with wrong prefix table
 
 ***** ChangeLog for 3.3 compared to 3.2.* *****
 For users:
@@ -1651,7 +2050,7 @@ New experimental module:
 For developers:
 - New: Add webservice for thirdparty creation and list.
 - New: A module can overwrite templates parts.
-- New: Can add a link on title field of added dictionnary.
+- New: Can add a link on title field of added dictionary.
 - New: Uniformize code.
 - New: Add option WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER and 
        WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER.

README-FR.md

@@ -77,62 +77,75 @@ Voir fichier ChangeLog.
 
 ## CE QUE DOLIBARR PEUT FAIRE
 
-Modules principaux:
+### Modules principaux (tous optionnels):
+
 - Annuaires des prospects et/ou client et/ou fournisseurs
 - Gestion de catalogue de produits et services
-- Gestion de stock
+- Gestion des devis, propositions commerciales
+- Gestion des commandes
+- Gestion des factures clients/fournisseurs et paiements
+- Gestion des virements bancaires SEPA
 - Gestion des comptes bancaires
 - Agenda partagé
-- Gestion des commandes
-- Gestion des devis, propositions commerciales
-- Gestion des factures clients et fournisseurs
+- Suivi des opportunités et/ou projets (suivi de rentabilité incluant les factures, notes de frais, temps consommé valorisé, ...)
 - Gestion de contrats de services
-- Gestion des paiements
-- Gestion des virements bancaires
+- Gestion de stock
 - Gestion des expéditions
 - GED (Gestion Electronique de Documents)
 - EMailings de masse
 - Réalisation de sondages
 - Point de vente/Caisse enregistreuse
+- …
+
+### Autres modules:
 
-Autres modules:
 - Gestion de marque-pages
 - Gestion des promesses de dons
 - Gestion de la TVA NPR (non perçue récupérable - pour les utilisateurs français des DOM-TOM)
 - Rapports
 - Imports/Exports des données
 - Connectivité LDAP
-- Export PDF de tous les éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
 - De nombreuses autres fonctionnalités issues de modules officiels ou non (AWStats, Bittorrent, Gravatar, Google, Webcalendar...) 
+- …
+
+### Divers:
 
-Divers:
 - Application multi-utilisateurs avec différents niveaux de permissions par module.
+- Peux être multi-société par ajout du module externe multi-société.
+- Peux-être multi-devise par ajout du module externe multi-devise.
 - Plusieurs gestionnaires de menus (possibilité de différencier les menus pour les utilisateurs internes ou externes comme les clients ou fournisseurs).
 - Application simple à utiliser.
 - Plusieurs thèmes visuels.
 - Code simple et facilement personnalisable.
 - Requiert PHP et Mysql ou Postgresql (Voir versions exactes sur http://wiki.dolibarr.org/index.php/Prérequis). 
 - Compatible avec toutes les offres Cloud du marché respectant les prérequis MySQL et PHP ou Postgresql.
+- Export PDF de tous les éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
 
 
 ## CE QUE DOLIBARR NE PEUT PAS FAIRE (TACHES A FAIRE)
 
 Voici un liste de fonctionnalites pas encore gérées par Dolibarr:
-- Pas de compta analytique double-partie (uniquement gestion de trésorerie).
+- Pas encore de compta analytique double-partie (uniquement gestion de trésorerie).
 - Dolibarr ne gère qu'une seule monnaie à la fois (mono-devise).
-- Dolibarr ne gère en standard qu'une société/institution/association mère (mono-société). Pour en gérer plusieurs (comme vos filiales), il faut, soit faire plusieurs installations de Dolibarr, soit installer le module MultiCompany qui permet de gérer n société/institutions/associations dans une seule instance par une isolation logique des données.
 - Dolibarr ne contient pas de module de Gestion de la paie.
 - Les tâches du module de gestion de projets n'ont pas de dépendance entre elle.
 - Dolibarr ne contient pas de Webmail.
 - Dolibarr ne fait pas le café (pas encore). 
 
 
-## RESEAUX SOCIAUX
+## ACTUALITES ET RESEAUX SOCIAUX
 
-Suivez le projet Dolibarr project sur
+Suivez le projet Dolibarr project sur les réseaux francophones
 
-Facebook: <https://www.facebook.com/dolibarr.fr>
+- Facebook: <https://www.facebook.com/dolibarr.fr>
+- Google+: <https://plus.google.com/+DolibarrFrance>
+- Twitter: <http://www.twitter.com/dolibarr_france>
 
-Google+: <https://plus.google.com/+DolibarrFrance>
+ou sur les réseaux anglophones
 
-Twitter: <http://www.twitter.com/dolibarr_france>
+- [Facebook](https://www.facebook.com/dolibarr)
+- [Google+](https://plus.google.com/+DolibarrOrg)
+- [Twitter](http://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

@@ -1,10 +1,12 @@
 # DOLIBARR ERP & CRM
 
+![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, ...).
 
 It's an Open Source software (wrote in PHP language) designed for small and medium companies, foundation and freelances.
 
-You can freely use, study, modify or distribute it according to it's Free Software licence.
+You can freely use, study, modify or distribute it according to its Free Software licence.
 
 You can use it as a standalone application or as a web application to be able to access it from the Internet or a LAN.
 
@@ -14,9 +16,9 @@ You can use it as a standalone application or as a web application to be able to
 
 Dolibarr is released under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version (GPL-3+).
 
-See the [COPYING](COPYING) file for a full copy of the license.
+See the [COPYING](https://github.com/Dolibarr/dolibarr/blob/develop/COPYING) file for a full copy of the license.
 
-Other licenses apply for some included dependencies. See [COPYRIGHT](COPYRIGHT) for a full list.
+Other licenses apply for some included dependencies. See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) for a full list.
 
 ## INSTALLING
 
@@ -63,45 +65,28 @@ You can use a Web server and a supported database (MySQL recommended) to install
 
 *Note: migration process can safely be done multiple times.*
 
-## NEWS
+## WHAT'S NEW
 
-See the [ChangeLog](ChangeLog) file.
+See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
 
 ## FEATURES
 
-### General features
-- Users and groups with finely grained rights
-- Localization in most major languages
-- Very user friendly and easy to use
-- Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
-- Works with PHP 5.3+ and MySQL 4.1+ or PostgreSQL 8.1. (See requirements on the [Wiki](http://wiki.dolibarr.org/index.php/Prerequisite))
-- Compatible with all Cloud solutions that match MySQL, PHP or PostgreSQL prerequisites.
-- An easy to understand, maintain and code interfaces with your own information system (PHP with no heavy framework; trigger and hook architecture)
-- Support for country specific features:
-    - Spanish Tax RE and ISPF
-    - French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)
-    - Canadian double taxes (federal/province) and other countries using cumulative VAT
-    - Tunisian tax stamp
-    - Compatible with [European directives](http://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
--    ...
-
-### Main modules
+### Main modules (all optional)
 
 - Customers, Prospects and/or Suppliers directory
 - Products and/or Services catalog
-- Bank accounts management
-- Customer and Supplier Orders management
 - Commercial proposals management
-- Contracts management
-- Invoices management
+- Customer and Supplier Orders management
+- Invoices and payment management
+- Standing orders management (European SEPA)
+- Bank accounts management
+- Shared calendar
+- Opportunities and/or project management (following project benefit including invoices, expense reports, time spent, ...)
 - Projects management
-- Events management
-- Payments management
-- Standing orders management
+- Contracts management
 - Stock management
 - Shipping management
 - Interventions management
-- PDF or ODT generation for invoice, proposals, orders...
 - Agenda with ical and vcal export for third party tools integration
 - Electronic Document Management (EDM)
 - Foundations members management
@@ -127,6 +112,25 @@ See the [ChangeLog](ChangeLog) file.
 - Payment platforms integration (PayBox, PayPal)
 - …
 
+### Other general features
+- Multi-Users and groups with finely grained rights
+- Localization in most major languages
+- Can manage several companies by adding external module multi-company.
+- Can manage several currencies by adding external module multi-currency.
+- Very user friendly and easy to use
+- Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
+- Works with PHP 5.3+ and MySQL 4.1+ or PostgreSQL 8.1. (See requirements on the [Wiki](http://wiki.dolibarr.org/index.php/Prerequisite))
+- Compatible with all Cloud solutions that match MySQL, PHP or PostgreSQL prerequisites.
+- An easy to understand, maintain and code interfaces with your own information system (PHP with no heavy framework; trigger and hook architecture)
+- Support for country specific features:
+    - Spanish Tax RE and ISPF
+    - French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)
+    - Canadian double taxes (federal/province) and other countries using cumulative VAT
+    - Tunisian tax stamp
+    - Compatible with [European directives](http://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
+- PDF or ODT generation for invoice, proposals, orders...
+- …
+
 ### Extending
 
 Dolibarr can be extended with a lot of other external modules from third party developers available at the [DoliStore](http://www.dolistore.com).
@@ -135,10 +139,7 @@ Dolibarr can be extended with a lot of other external modules from third party d
 
 These are features that Dolibarr does **not** yet fully support:
 
-- Double-entry bookkeeping (only bank and treasury management)
-- Multiple currencies
-- Multiple companies
-    If you want to manage several companies or foundations, you must install the software several times (on same server or not) or use the MultiCompany addon module that allows to manage several companies in one Dolibarr instance (one database but with a logical isolation of datas)
+- Double-entry bookkeeping yet (only bank and treasury management)
 - Tasks dependencies in projects
 - Payroll module
 - Webmail
@@ -148,13 +149,17 @@ These are features that Dolibarr does **not** yet fully support:
 
 Administrator, user, developer and translator's documentations are available along with other community resources on the [Wiki](http://wiki.dolibarr.org).
 
+## CONTRIBUTING
+
+See file [CONTRIBUTING](https://github.com/Dolibarr/dolibarr/blob/develop/CONTRIBUTING.md)
+
 ## CREDITS
 
 Dolibarr is the work of many contributors over the years and uses some fine libraries.
 
-See [COPYRIGHT](COPYRIGHT) file.
+See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) file.
 
-## SOCIAL NETWORKS
+## NEWS AND SOCIAL NETWORKS
 
 Follow Dolibarr project on:
 

build/aps/configure.php

@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /*-----------------------------------------------------
  *

build/debian/README.howto

@@ -29,6 +29,9 @@ Files are saved int .gnupg directory
 [DEFAULT]
 pristine-tar = True
 
+[buildpackage]
+ignore-branch = True
+
 [git-buildpackage]
 sign-tags = True
 export-dir = ../build-area/
@@ -133,6 +136,19 @@ With only message
 tag 729538 +pending
 
 
+To remove status of a bug without "moreinfo" (bug can be processed)
+
+or replay to email 999999@bugs.debian.org + submitter of bug
+With a message starting with: 
+
+Control: tag -1 -moreinfo
+Thanks. Fixed into git.
+
+or replay to email control@bugs.debian.org
+With only message 
+tag 729538 -moreinfo
+
+
 
 ##### Testing a package into unstable env
 
@@ -239,7 +255,7 @@ http://packages.qa.debian.org/t/tcpdf.html
 
 ##### Create/Maintain dolibarr package
 
-To update dolibarr debian package when upstream version has changed
+To update dolibarr debian package when upstream (official version of external project) has changed:
 
 * You can git clone debian git repo
 > git clone git.debian.org:/git/collab-maint/dolibarr.git [dolibarr-debian]
@@ -284,10 +300,10 @@ 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
+To update dolibarr debian package when only files into debian has changed, or if you include manually backport:
 
 * Change files and commit.
-* Add a tag debian/x.y.z+dfsgw-2 (increase the last 1 into 2)
+* Add a tag debian/x.y.z+dfsgw-2 (increase the last 1 into 2, 3...)
 
 
 Once files has been prepared, it's time to test:
@@ -331,7 +347,7 @@ http://packages.qa.debian.org
 
 Use this to move from unstable to testing.
 
-reportbug -B debian
+reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
 Choose package "release.debian.org"
 Then "unblock"
 Then name of package "dolibarr"
@@ -345,15 +361,25 @@ After discussion with ..., it appears that security holes are enough to request
 
 Use this to request an update of a stable package
 
-reportbug -B debian
+reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
 Choose package "release.debian.org"
 Then "unblock"
 Then name of package "dolibarr"
 Fill message, for example:
-"Please unblock package dolibarr
-A security error CVE-2015-3935 was reported and is fixed into package 3.5.7.
-Note that package 3.5.7 contains not only fixed for bugs reported to debian. It includes other fixes, but they are all related to stability or security,
-so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935. 
-After discussion with ..., it appears that security holes are enough to request this unblock request."
+"
+A security error CVE-2015-3935 was reported for Dolibarr ERP CRM package. This bug is fixed into official package 3.5.7 of Dolibarr.
+Package 3.5.7 is a maintenance release compared to 3.5.5 and contains only fixes. But not only bugs reported to debian, it includes also other fixes (but they are all related to stability or security).
+I think it is a better solution to validate this maintenance release based on the new upstream version of Dolibarr than applying a patch of the only CVE-2015-3935.
+Pro are:
+- It fixes all debian reported bugs (including security one)
+- It fixes also stability bugs
+- Patches were already tested because deployed and used by several thousands of users.
+- It is easier for package maintener to include this official set of fixes than applying one patch after one patch for each debian report or backported each patch into a dedicated version.
+- Debian maintenance version matches with official project maintenance version (better when all fixes are not related to the way the software is packaged)
+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.
+"
 

build/debian/copyright

@@ -159,7 +159,7 @@ Comments:
  Those files are not shipped in the binary package as we
  configure Dolibarr to use Dejavu fonts from "fonts-dejavu-core".
   
-Files: docs/images/*
+Files: doc/images/*
 Copyright: Laurent Destailleur 
 License: CC-BY-SA-3.0
  You are free:
@@ -176,7 +176,7 @@ License: CC-BY-SA-3.0
  .
  For more information, see http://creativecommons.org/licenses/by-sa/3.0/
 
-Files: htdocs/includes/fpdi/*
+Files: htdocs/includes/fpdfi/*
 Copyright: 2004-2011 Setasign - Jan Slabon
 License: GPL-2+
  This program is free software; you can redistribute it

build/debian/dolibarr.desktop

@@ -22,5 +22,6 @@ Type=Application
 Categories=Office
 StartupNotify=true
 InitialPreference=5
+Keywords=erp,crm,billing,customer,supplier,stock,agenda,project,order,shipment
 #NoDisplay=true
 #OnlyShowIn=GNOME

build/debian/install.forced.php.install

@@ -26,7 +26,7 @@ $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one.
-// If we enable/disable libraries declaration during install, we must also check they are 
+// If during install, we enable/disable declaration to use non embedded libraries, we must also check they are 
 // - not removed from package (see rm in rules file),
 // - declared into dependencies (see Depends in control file)
 //$force_dolibarr_lib_TCPDF_PATH='';

build/debian/patches/use-etc-dolibarr-conf.patch

@@ -34,7 +34,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +$conffiletoshow = "/etc/dolibarr/conf.php";
  
  
- if (! defined('DONOTLOADCONF') && file_exists($conffile))
+ // Load conf file if it is already defined
 --- a/htdocs/support/inc.php
 +++ b/htdocs/support/inc.php
 @@ -69,8 +69,8 @@ $conffiletoshowshort = "conf.php";
@@ -47,4 +47,4 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +$conffiletoshow = "/etc/dolibarr/conf.php";
  
  
- if (! defined('DONOTLOADCONF') && file_exists($conffile))
+ // Load conf file if it is already defined

build/generate_filecheck_xml.php

@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /* Copyright (C) 2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  *

build/makepack-dolibarr.pl

@@ -148,9 +148,9 @@ $FILENAMEEXEDOLIWAMP = "DoliWamp-$MAJOR.$MINOR.$BUILD";
 $ARCH='noarch';
 $newbuild = $BUILD;
 $newbuild =~ s/(dev|alpha)/0.1.a/gi;			# dev (fedora)
-$newbuild =~ s/beta/0.2.beta1/gi;				# beta (fedora)
-$newbuild =~ s/rc./0.3.rc1/gi;					# rc (fedora)
-if ($newbuild !~ /-/) { $newbuild.='-0.3'; }	# finale (fedora)
+$newbuild =~ s/beta(.?)/0.2.beta/gi;			# beta (fedora)    (we want beta1, beta2, betax to be same package name)
+$newbuild =~ s/rc(.?)/0.3.rc/gi;				# rc (fedora)      (we want rc1, rc2, rcx to be same package name)
+if ($newbuild !~ /-/) { $newbuild.='-0.4'; }	# finale (fedora)
 #$newbuild =~ s/(dev|alpha)/0/gi;				# dev
 #$newbuild =~ s/beta/1/gi;						# beta
 #$newbuild =~ s/rc./2/gi;						# rc
@@ -162,10 +162,10 @@ $FILENAMERPM=$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm";
 # For Deb
 $newbuild = $BUILD;
 $newbuild =~ s/(dev|alpha)/1/gi;                # dev
-$newbuild =~ s/beta/2/gi;                       # beta
-$newbuild =~ s/rc./3/gi;                        # rc
-if ($newbuild !~ /-/) { $newbuild.='-3'; }      # finale is same than rc. 
-# now newbuild is 0-1 or 0-3 for example. Note that for native package (see debian/source/format), we should not use a dash part but to get a better version management
+$newbuild =~ s/beta(.?)/2/gi;                   # beta    			(we want beta1, beta2, betax to be same package name)
+$newbuild =~ s/rc(.?)/3/gi;                     # rc				(we want rc1, rc2, rcx to be same package name)
+if ($newbuild !~ /-/) { $newbuild.='-4'; }      # finale is same than rc. 
+# now newbuild is 0-1 or 0-4 for example. Note that for native package (see debian/source/format), we should not use a dash part but to get a better version management
 $build = $newbuild;
 $build =~ s/-.*$//g;
 # now build is 0 for example
@@ -354,15 +354,18 @@ if ($nboftargetok) {
 		chdir("$SOURCE");
 		
 		# Test that the ChangeLog is ok
-		$ret=`grep "ChangeLog for $MAJOR.$MINOR\.$BUILD" "$SOURCE/ChangeLog" 2>&1`;
+		$TMPBUILDTOCHECKCHANGELOG=$BUILD;
+		$TMPBUILDTOCHECKCHANGELOG =~ s/\-rc\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 first:\n";
-			if (! $BUILD)
+			print "Error: The ChangeLogFile was not updated. Run the following command before building package for $MAJOR.$MINOR.$BUILD:\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`.. --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 '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';
 			}
-			else
+			else			# For a maintenance release
 			{
 				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';
 			}
@@ -507,6 +510,8 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/timesheet*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/webmail*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/accountingexport*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/allscreen*`;
 		# Removed other test files
@@ -521,25 +526,27 @@ if ($nboftargetok) {
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl`;    # Avoid errors into rpmlint
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/template`;  # Package not valid for most linux distributions (errors reported into compile.js). Package should be embed by modules to avoid problems.
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpmailer`;                # Package not valid for most linux distributions (errors reported into file LICENSE). Package should be embed by modules to avoid problems.
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/adapters`;		# Keep this removal in case we embed libraries
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/adapters`;		# Keep this removal in case we embed libraries
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/samples`;		# Keep this removal in case we embed libraries
         #$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# _source must be kept into tarball
    	    
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`;	# Source of this flash is not available
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extensions/TableTools/swf`;	# Source of this flash is not available
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`;	    # Source of this flash is not available
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/select2/release.sh`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/doc`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/example`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/test`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/php-iban/docs`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/license.txt`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/license.txt`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/.gitattributes`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Classes/license.md`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PDF`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Examples`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/PHPExcel/Shared/PDF`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/PHPExcel/Shared/PCLZip`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/unitTests`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/license.md`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
@@ -547,6 +554,7 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/utils`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/savant`;
 	}
@@ -835,17 +843,28 @@ if ($nboftargetok) {
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/rpm`;
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/zip`;
 			# Removed duplicate license files
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/scayt/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/wsc/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/scayt/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/wsc/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source/plugins/wsc/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/plugins/scayt/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/plugins/wsc/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/php-iban/LICENSE`;
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/flot/LICENSE.txt`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/freefont-20120503/COPYING`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/datatables/extensions/ColReorder/License.txt`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/datatables/extensions/ColVis/License.txt`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/datatables/extensions/FixedColumns/License.txt`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/datatables/extensions/Responsive/License.txt`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/datatables/license.txt`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/select2/LICENSE`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/mike42/escpos-php/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/mobiledetect/mobiledetectlib/LICENSE.txt`;
+			
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/COPYING`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/COPYING`;
 			# Removed files we don't need
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source`;
 			
 			# Rename upstream changelog to match debian rules
 			$ret=`mv $BUILDROOT/$PROJECT.tmp/ChangeLog $BUILDROOT/$PROJECT.tmp/changelog`;
@@ -907,8 +926,11 @@ if ($nboftargetok) {
 			$ret=`chmod 755 $BUILDROOT/$PROJECT.tmp/debian/rules`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/translation/autotranslator.class.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/modMyModule.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_api_class.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_card.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_class.class.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_page.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_list.php`;
+			$ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_script.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_webservice_server.php`;
 			$cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
 			$ret=`$cmd`;
@@ -1086,6 +1108,14 @@ if ($nboftargetok) {
 			"$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
 			"$DESTI/standard/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM'
 		);
+		%filestoscanstableasso=(
+			"$DESTI/package_rpm_generic/$FILENAMERPM"=>'package_rpm_generic',
+			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'package_debian-ubuntu',
+			"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'package_windows',
+			"$DESTI/standard/$FILENAMETGZ.tgz"=>'standard',
+			"$DESTI/standard/$FILENAMETGZ.zip"=>'standard'
+		);
+
 		use POSIX qw/strftime/;
 		foreach my $file (sort keys %filestoscansf)
 		{
@@ -1128,13 +1158,22 @@ if ($nboftargetok) {
 	    		
 	    		if ($target eq 'SF') { 
 	    			$destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD;
-		    		print "Publish file ".$file." to $NEWPUBLISH/".$filestoscan{$file}."\n";
 	    		}
-	    		else
-	    		{
+	    		elsif ($target eq 'ASSO' and $NEWPUBLISH =~ /stable/) {
+	    			$destFolder="$NEWPUBLISH/$filestoscanstableasso{$file}";
+	    		} 
+	    		elsif ($target eq 'ASSO' and $NEWPUBLISH !~ /stable/) {
 	    			$destFolder="$NEWPUBLISH";
-		    		print "Publish file ".$file." to $NEWPUBLISH\n";
+	    		} 
+	    		else	# No more used
+	    		{
+	    			$dirnameonly=$file;
+	    			$dirnameonly =~ s/.*\/([^\/]+)\/[^\/]+$/$1/;  
+	    			$filenameonly=$file;
+	    			$filenameonly =~ s/.*\/[^\/]+\/([^\/])+$/$1/;  
+	    			$destFolder="$NEWPUBLISH/$dirnameonly";
 	    		}
+	    		print "Publish file ".$file." to ".$destFolder."\n";
 
 				# mkdir	   
 				#my $ssh = Net::SSH::Perl->new("frs.sourceforge.net");
@@ -1154,7 +1193,7 @@ if ($nboftargetok) {
 				print "$command\n";	
 				my $ret=`$command 2>&1`;
 
-				$command="rsync -s $OPTIONUPDATEDIST -e 'ssh' \"$file\" \"".$destFolder."\"";
+				$command="rsync -s -e 'ssh' \"$file\" \"".$destFolder."\"";
 				print "$command\n";	
 				my $ret=`$command 2>&1`;
 				print "$ret\n";

build/perl/virtualmin/dolibarr.pl

@@ -30,7 +30,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "3.7.2", "3.6.3", "3.5.6" );
+return ( "3.8.1", "3.7.1", "3.6.4", "3.5.7" );
 }
 
 sub script_dolibarr_category
@@ -163,7 +163,7 @@ return ("tar", "gunzip");
 }
 
 # script_dolibarr_install(&domain, version, &opts, &files, &upgrade-info)
-# Actually installs joomla, and returns either 1 and an informational
+# Actually installs dolibarr, and returns either 1 and an informational
 # message, or 0 and an error
 sub script_dolibarr_install
 {
@@ -206,6 +206,9 @@ $pgcharset = $tmpl->{'postgres_encoding'};
 $charset = $dbtype eq "mysql" ? $mycharset : $pgcharset;
 $collate = $dbtype eq "mysql" ? $mycollate : "C";
 
+# Install filename
+local $step = $version >= 3.8 ? "step" : "etape";
+
 $path = &script_path_url($d, $opts);
 if ($path =~ /^https:/ || $d->{'ssl'}) {
         $url = "https://$d->{'dom'}";
@@ -224,6 +227,10 @@ if (!$upgrade) {
 	&set_permissions_as_domain_user($d, 0666, $cfile);
 	&run_as_domain_user($d, "mkdir ".quotemeta($docdir));
 	&set_permissions_as_domain_user($d, 0777, $docdir);
+	if (!$version >= 3.7.2) {
+		&run_as_domain_user($d, "mkdir ".quotemeta($altdir));
+		&set_permissions_as_domain_user($d, 0777, $altdir);
+	}
 }
 else {
 	# Preserve old config file, documents and custom directory
@@ -259,7 +266,7 @@ if ($upgrade) {
 			  [ "versionfrom", $upgrade->{'version'} ],
 			  [ "versionto", $ver ],
 			 );
-	local $err = &call_dolibarr_wizard_page(\@params, "step5", $d, $opts);
+	local $err = &call_dolibarr_wizard_page(\@params, $step."5", $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
 	# Remove the installation directory.
@@ -282,15 +289,15 @@ else {
 			  [ "main_force_https", $opts->{'forcehttps'} ],
 			  [ "dolibarr_main_db_character_set", $charset ],
 			  [ "dolibarr_main_db_collation", $collate ],
-			  [ "usealternaterootdir", "1" ],
+			  [ "main_use_alt_dir", "1" ],
 			  [ "main_alt_dir_name", "custom" ],
 			 );
-	local $err = &call_dolibarr_wizard_page(\@params, "step1", $d, $opts);
+	local $err = &call_dolibarr_wizard_page(\@params, $step."1", $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
 	# Second page (Populate database)
 	local @params = ( [ "action", "set" ] );
-	local $err = &call_dolibarr_wizard_page(\@params, "step2", $d, $opts);
+	local $err = &call_dolibarr_wizard_page(\@params, $step."2", $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
 	# Third page (Add administrator account)
@@ -299,7 +306,7 @@ else {
 			  [ "pass", $dompass ],
 			  [ "pass_verif", $dompass ],
 	 		 );
-	local $err = &call_dolibarr_wizard_page(\@params, "step5", $d, $opts);
+	local $err = &call_dolibarr_wizard_page(\@params, $step."5", $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
 	# Remove the installation directory and protect config file.
@@ -324,14 +331,10 @@ local ($params, $page, $d, $opts) = @_;
 local $params = join("&", map { $_->[0]."=".&urlize($_->[1]) } @$params );
 local $ipage = $opts->{'path'}."/install/".$page.".php";
 local ($iout, $ierror);
-
 &post_http_connection($d, $ipage, $params, \$iout, \$ierror);
-print STDERR $iout;
-
 if ($ierror) {
 	return $ierror;
 	}
-
 return undef;
 }
 
@@ -347,8 +350,8 @@ local $derr = &delete_script_install_directory($d, $opts);
 return (0, $derr) if ($derr);
 
 # Remove all llx_ tables from the database
-# 4 times because of constraints
-for(my $i=0; $i<4; $i++) {
+# 10 times because of constraints
+for(my $i=0; $i<10; $i++) {
 	&cleanup_script_database($d, $opts->{'db'}, "llx_");
 	}
 
@@ -381,9 +384,10 @@ sub script_dolibarr_check_latest
 {
 local ($ver) = @_;
 local @vers = &osdn_package_versions("dolibarr",
-                $ver >= 3.2 ? "dolibarr\\-(3\\.[0-9\\.]+)\\.tgz" :
-                $ver >= 3.1 ? "dolibarr\\-(3\\.1\\.[0-9\\.]+)\\.tgz" :
-                $ver >= 3 ? "dolibarr\\-(3\\.0\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 3.8 ? "dolibarr\\-(3\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 3.7 ? "dolibarr\\-(3\\.7\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 3.6 ? "dolibarr\\-(3\\.6\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 3.5 ? "dolibarr\\-(3\\.5\\.[0-9\\.]+)\\.tgz" :
                 $ver >= 2.9 ? "dolibarr\\-(2\\.9\\.[0-9\\.]+)\\.tgz" :
                               "dolibarr\\-(2\\.8\\.[0-9\\.]+)\\.tgz");
 return "Failed to find versions" if (!@vers);

build/rpm/dolibarr-forrpm.patch

@@ -25,7 +25,7 @@ diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
 +$conffiletoshow = "/etc/dolibarr/conf.php";
  
  
- if (! defined('DONOTLOADCONF') && file_exists($conffile))
+ // Load conf file if it is already defined
 diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
 --- htdocs/support/inc.php.patch	2011-09-03 02:34:39.606952000 +0200
 +++ htdocs/support/inc.php	2011-09-03 02:33:59.814952000 +0200
@@ -39,4 +39,4 @@ diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
 +$conffiletoshow = "/etc/dolibarr/conf.php";
  
  
- if (! defined('DONOTLOADCONF') && file_exists($conffile))
+ // Load conf file if it is already defined

build/rpm/dolibarr_fedora.spec

@@ -183,6 +183,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/fourn
 %_datadir/dolibarr/htdocs/ftp
 %_datadir/dolibarr/htdocs/holiday
+%_datadir/dolibarr/htdocs/hrm
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
@@ -200,6 +201,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
+%_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user

build/rpm/dolibarr_generic.spec

@@ -263,6 +263,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/fourn
 %_datadir/dolibarr/htdocs/ftp
 %_datadir/dolibarr/htdocs/holiday
+%_datadir/dolibarr/htdocs/hrm
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
@@ -280,6 +281,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
+%_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user

build/rpm/dolibarr_mandriva.spec

@@ -180,6 +180,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/fourn
 %_datadir/dolibarr/htdocs/ftp
 %_datadir/dolibarr/htdocs/holiday
+%_datadir/dolibarr/htdocs/hrm
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
@@ -197,6 +198,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
+%_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user

build/rpm/dolibarr_opensuse.spec

@@ -191,6 +191,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/fourn
 %_datadir/dolibarr/htdocs/ftp
 %_datadir/dolibarr/htdocs/holiday
+%_datadir/dolibarr/htdocs/hrm
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
@@ -208,6 +209,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
+%_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user

composer.json

@@ -14,9 +14,14 @@
     },
     "require": {
         "php": ">=5.3.0",
-        "ext-gd": "*",
         "ext-curl": "*",
-        "restler/framework": "3.0.*"
+        "ccampbell/chromephp": "^4.1",
+        "ckeditor/ckeditor": "dev-full/4.3.x#0b7c3f1",
+        "mike42/escpos-php": "dev-master",
+        "mobiledetect/mobiledetectlib": "2.8.17",
+        "phpoffice/phpexcel": "1.8.1",
+        "restler/framework": "^3.0",
+        "tecnickcom/tcpdf": "6.2.12"
     },
     "suggest": {
         "ext-mysqlnd": "To use with MySQL or MariaDB",

composer.lock

@@ -0,0 +1,415 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "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",
+    "packages": [
+        {
+            "name": "ccampbell/chromephp",
+            "version": "4.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ccampbell/chromephp.git",
+                "reference": "c3c297615d48ae5b2a86a82311152d1ed095fcef"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ccampbell/chromephp/zipball/c3c297615d48ae5b2a86a82311152d1ed095fcef",
+                "reference": "c3c297615d48ae5b2a86a82311152d1ed095fcef",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.0.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "ChromePhp": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Craig Campbell",
+                    "email": "iamcraigcampbell@gmail.com",
+                    "homepage": "http://craig.is",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Log variables to the Chrome console (via Chrome Logger Google Chrome extension).",
+            "homepage": "http://github.com/ccampbell/chromephp",
+            "keywords": [
+                "log",
+                "logging"
+            ],
+            "time": "2013-06-26 03:44:33"
+        },
+        {
+            "name": "ckeditor/ckeditor",
+            "version": "dev-full/4.3.x",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ckeditor/ckeditor-releases.git",
+                "reference": "0b7c3f1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ckeditor/ckeditor-releases/zipball/252e512e911f21d880ea542fe162c4643885b317",
+                "reference": "0b7c3f1",
+                "shasum": ""
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0+",
+                "LGPL-2.1+",
+                "MPL-1.1+"
+            ],
+            "authors": [
+                {
+                    "name": "CKSource - Frederico Knabben",
+                    "homepage": "http://cksource.com"
+                }
+            ],
+            "description": "JavaScript WYSIWYG web text editor.",
+            "homepage": "http://ckeditor.com",
+            "keywords": [
+                "CKEditor",
+                "editor",
+                "fckeditor",
+                "html",
+                "javascript",
+                "richtext",
+                "text",
+                "wysiwyg"
+            ],
+            "time": "2014-02-26 15:43:10"
+        },
+        {
+            "name": "mike42/escpos-php",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mike42/escpos-php.git",
+                "reference": "63648d03d47b81e8f6c1020ac92f051a3f3b5793"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mike42/escpos-php/zipball/63648d03d47b81e8f6c1020ac92f051a3f3b5793",
+                "reference": "63648d03d47b81e8f6c1020ac92f051a3f3b5793",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.5.*"
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roni Saha",
+                    "email": "roni.cse@gmail.com"
+                },
+                {
+                    "name": "Michael Billington",
+                    "email": "michael.billington@gmail.com"
+                },
+                {
+                    "name": "Gergely Radics",
+                    "email": "gerifield@ustream.tv"
+                },
+                {
+                    "name": "Warren Doyle",
+                    "email": "w.doyle@fuelled.co"
+                },
+                {
+                    "name": "vharo",
+                    "email": "vharo@geepok.com"
+                }
+            ],
+            "description": "Thermal receipt printer library, for use with ESC/POS compatible printers",
+            "homepage": "https://github.com/mike42/escpos-php",
+            "keywords": [
+                "ESC-POS",
+                "driver",
+                "escpos",
+                "print",
+                "receipt"
+            ],
+            "time": "2015-12-04 10:23:55"
+        },
+        {
+            "name": "mobiledetect/mobiledetectlib",
+            "version": "2.8.17",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/serbanghita/Mobile-Detect.git",
+                "reference": "b87da5f63a76e9615a0c74fcf168657b1ea7e41d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/b87da5f63a76e9615a0c74fcf168657b1ea7e41d",
+                "reference": "b87da5f63a76e9615a0c74fcf168657b1ea7e41d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.0.0"
+            },
+            "require-dev": {
+                "codeclimate/php-test-reporter": "dev-master",
+                "johnkary/phpunit-speedtrap": "~1.0@dev",
+                "phpunit/phpunit": "*"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "Mobile_Detect.php"
+                ],
+                "psr-0": {
+                    "Detection": "namespaced/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Serban Ghita",
+                    "email": "serbanghita@gmail.com",
+                    "homepage": "http://mobiledetect.net",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Mobile_Detect is a lightweight PHP class for detecting mobile devices. It uses the User-Agent string combined with specific HTTP headers to detect the mobile environment.",
+            "homepage": "https://github.com/serbanghita/Mobile-Detect",
+            "keywords": [
+                "detect mobile devices",
+                "mobile",
+                "mobile detect",
+                "mobile detector",
+                "php mobile detect"
+            ],
+            "time": "2015-09-17 14:45:21"
+        },
+        {
+            "name": "phpoffice/phpexcel",
+            "version": "1.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPOffice/PHPExcel.git",
+                "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/372c7cbb695a6f6f1e62649381aeaa37e7e70b32",
+                "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32",
+                "shasum": ""
+            },
+            "require": {
+                "ext-xml": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=5.2.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "PHPExcel": "Classes/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL"
+            ],
+            "authors": [
+                {
+                    "name": "Maarten Balliauw",
+                    "homepage": "http://blog.maartenballiauw.be"
+                },
+                {
+                    "name": "Mark Baker"
+                },
+                {
+                    "name": "Franck Lefevre",
+                    "homepage": "http://blog.rootslabs.net"
+                },
+                {
+                    "name": "Erik Tilt"
+                }
+            ],
+            "description": "PHPExcel - OpenXML - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
+            "homepage": "http://phpexcel.codeplex.com",
+            "keywords": [
+                "OpenXML",
+                "excel",
+                "php",
+                "spreadsheet",
+                "xls",
+                "xlsx"
+            ],
+            "time": "2015-05-01 07:00:55"
+        },
+        {
+            "name": "restler/framework",
+            "version": "3.0.0",
+            "target-dir": "Luracast/Restler",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Luracast/Restler-Framework.git",
+                "reference": "6ee10b3e5dbc6376916fed55ec2340a37cce436b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Luracast/Restler-Framework/zipball/6ee10b3e5dbc6376916fed55ec2340a37cce436b",
+                "reference": "6ee10b3e5dbc6376916fed55ec2340a37cce436b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "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)"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "master": "v3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Luracast\\Restler": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1"
+            ],
+            "authors": [
+                {
+                    "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",
+            "homepage": "http://luracast.com/products/restler/",
+            "keywords": [
+                "api",
+                "framework",
+                "rest",
+                "server"
+            ],
+            "time": "2015-08-04 07:52:49"
+        },
+        {
+            "name": "tecnickcom/tcpdf",
+            "version": "6.2.12",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tecnickcom/TCPDF.git",
+                "reference": "2f732eaa91b5665274689b1d40b285a7bacdc37f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/2f732eaa91b5665274689b1d40b285a7bacdc37f",
+                "reference": "2f732eaa91b5665274689b1d40b285a7bacdc37f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "fonts",
+                    "config",
+                    "include",
+                    "tcpdf.php",
+                    "tcpdf_parser.php",
+                    "tcpdf_import.php",
+                    "tcpdf_barcodes_1d.php",
+                    "tcpdf_barcodes_2d.php",
+                    "include/tcpdf_colors.php",
+                    "include/tcpdf_filters.php",
+                    "include/tcpdf_font_data.php",
+                    "include/tcpdf_fonts.php",
+                    "include/tcpdf_images.php",
+                    "include/tcpdf_static.php",
+                    "include/barcodes/datamatrix.php",
+                    "include/barcodes/pdf417.php",
+                    "include/barcodes/qrcode.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPLv3"
+            ],
+            "authors": [
+                {
+                    "name": "Nicola Asuni",
+                    "email": "info@tecnick.com",
+                    "homepage": "http://nicolaasuni.tecnick.com"
+                }
+            ],
+            "description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
+            "homepage": "http://www.tcpdf.org/",
+            "keywords": [
+                "PDFD32000-2008",
+                "TCPDF",
+                "barcodes",
+                "datamatrix",
+                "pdf",
+                "pdf417",
+                "qrcode"
+            ],
+            "time": "2015-09-12 10:08:34"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": {
+        "ckeditor/ckeditor": 20,
+        "mike42/escpos-php": 20
+    },
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=5.3.0",
+        "ext-curl": "*"
+    },
+    "platform-dev": []
+}

dev/codesniffer/ruleset.dtd

@@ -3,6 +3,7 @@
 <!ATTLIST ruleset name CDATA "">
 <!ELEMENT description (#PCDATA)>
 <!ELEMENT exclude-pattern (#PCDATA)>
+<!ATTLIST exclude-pattern type CDATA "">
 <!ELEMENT rule (properties*,severity*)>
 <!ATTLIST rule ref CDATA "">
 <!ELEMENT properties (property+)>

dev/codesniffer/ruleset.xml

@@ -3,12 +3,12 @@
 <ruleset name="Dolibarr">
 	<description>Dolibarr coding standard.</description>
 
-	<exclude-pattern>*/conf.php</exclude-pattern>
-	<exclude-pattern>*/includes/*</exclude-pattern>
-	<exclude-pattern>*/documents/*</exclude-pattern>
-	<exclude-pattern>*/dev/vagrant/*</exclude-pattern>
-	<exclude-pattern>*/custom/*</exclude-pattern>
-	<exclude-pattern>*/nltechno*</exclude-pattern>
+	<exclude-pattern type="relative">build/html</exclude-pattern>
+	<exclude-pattern type="relative">documents</exclude-pattern>
+	<exclude-pattern type="relative">htdocs/custom</exclude-pattern>
+	<exclude-pattern type="relative">htdocs/includes</exclude-pattern>
+	<exclude-pattern type="relative">htdocs/conf.php</exclude-pattern>
+	<exclude-pattern type="relative">*/nltechno*</exclude-pattern>
 
 		<!-- List of all tests -->
 

dev/dolibarr_changes.txt

@@ -62,6 +62,13 @@ In htdocs/includes/tcpdf/tcpdf.php
 * 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:
 ------
 Add fpdf_tpl.php 1.2
@@ -69,7 +76,7 @@ Add tcpdi.php
 Add tcpdi_parser.php and replace:
 require_once(dirname(__FILE__).'/include/tcpdf_filters.php');
 with:
-require_once(dirname(__FILE__).'/../tcpdf/include/tcpdf_filters.php');
+require_once(dirname(__FILE__).'/../tecnickcom/tcpdf/include/tcpdf_filters.php');
 
 
 
@@ -95,3 +102,13 @@ JQUERYFILETREE:
 ---------------
 * Remove directory htdocs/includes/jquery/plugins/jqueryFileTree/connectors
 
+
+
+RESTLER:
+--------
+
+   if ($className == 'Luracast\Restler\string') return;
+   if ($className == 'Luracast\Restler\mixed') return;
+
+
+        

dev/examples/create_invoice.php

@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *

dev/examples/create_order.php

@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *

dev/examples/create_product.php

@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *

dev/examples/create_user.php

@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *

dev/examples/get_contracts.php

@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *

dev/initdata/documents_demo/.htaccess

@@ -0,0 +1,2 @@
+Order allow,deny
+Deny from all

dev/initdata/documents_demo/custom/main.inc.php

@@ -0,0 +1,3 @@
+<?php
+// Wrapper to include main into htdocs
+include_once '/home/ldestailleur/git/dolibarr_3.8/htdocs/main.inc.php';

dev/initdata/documents_demo/custom/master.inc.php

@@ -0,0 +1,3 @@
+<?php
+// Wrapper to include master into htdocs
+include_once '/home/ldestailleur/git/dolibarr_3.8/htdocs/master.inc.php';