Fix error management

.codeclimate.yml

@@ -1,13 +0,0 @@
-# Save as .codeclimate.yml (note leading .) in project root directory
-languages:
-  Ruby: false
-  JavaScript: true
-  PHP: true
-engines:
-  phpcodesniffer: true  
-exclude_paths:
-  - 'build/*'
-  - 'dev/*'
-  - 'doc/*'
-  - 'test/*'
-  - 'htdocs/includes/*'

.editorconfig

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

.gitattributes

@@ -31,22 +31,3 @@
 *.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

.github/CODEOWNERS

@@ -1 +0,0 @@
-htdocs/takepos @andreubisquerra

.github/CODE_OF_CONDUCT.md

@@ -1,84 +0,0 @@
-# Code of Conduct
-
-## 1. Purpose
-
-A primary goal of Dolibarr is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).
-
-This code of conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.
-
-We invite all those who participate in Dolibarr to help us create safe and positive experiences for everyone.
-
-## 2. Open Source Citizenship
-
-A supplemental goal of this Code of Conduct is to increase open source citizenship by encouraging participants to recognize and strengthen the relationships between our actions and their effects on our community.
-
-Communities mirror the societies in which they exist and positive action is essential to counteract the many forms of inequality and abuses of power that exist in society.
-
-If you see someone who is making an extra effort to ensure our community is welcoming, friendly, and encourages all participants to contribute to the fullest extent, we want to know.
-
-## 3. Expected Behavior
-
-The following behaviors are expected and requested of all community members:
-
-*   Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
-*   Exercise consideration and respect in your speech and actions.
-*   Attempt collaboration before conflict.
-*   Refrain from demeaning, discriminatory, or harassing behavior and speech.
-*   Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
-*   Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.
-
-## 4. Unacceptable Behavior
-
-The following behaviors are considered harassment and are unacceptable within our community:
-
-*   Violence, threats of violence or violent language directed against another person.
-*   Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
-*   Posting or displaying sexually explicit or violent material.
-*   Posting or threatening to post other people’s personally identifying information ("doxing").
-*   Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
-*   Inappropriate photography or recording.
-*   Inappropriate physical contact. You should have someone’s consent before touching them.
-*   Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
-*   Deliberate intimidation, stalking or following (online or in person).
-*   Advocating for, or encouraging, any of the above behavior.
-*   Sustained disruption of community events, including talks and presentations.
-
-## 5. Consequences of Unacceptable Behavior
-
-Unacceptable behavior from any community member, including sponsors and those with decision-making authority, will not be tolerated.
-
-Anyone asked to stop unacceptable behavior is expected to comply immediately.
-
-If a community member engages in unacceptable behavior, the community organizers may take any action they deem appropriate, up to and including a temporary ban or permanent expulsion from the community without warning (and without refund in the case of a paid event).
-
-## 6. Reporting Guidelines
-
-If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. contact@dolibarr.org.
-
-
-
-Additionally, community organizers are available to help community members engage with local law enforcement or to otherwise help those experiencing unacceptable behavior feel safe. In the context of in-person events, organizers will also provide escorts as desired by the person experiencing distress.
-
-## 7. Addressing Grievances
-
-If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify Dolibarr with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies.
-
-
-
-## 8. Scope
-
-We expect all community participants (contributors, paid or otherwise; sponsors; and other guests) to abide by this Code of Conduct in all community venues–online and in-person–as well as in all one-on-one communications pertaining to community business.
-
-This code of conduct and its related procedures also applies to unacceptable behavior occurring outside the scope of community activities when such behavior has the potential to adversely affect the safety and well-being of community members.
-
-## 9. Contact info
-
-contact@dolibarr.org
-
-## 10. License and attribution
-
-This Code of Conduct is distributed under a [Creative Commons Attribution-ShareAlike license](http://creativecommons.org/licenses/by-sa/3.0/).
-
-Portions of text derived from the [Django Code of Conduct](https://www.djangoproject.com/conduct/) and the [Geek Feminism Anti-Harassment Policy](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy).
-
-Retrieved on November 22, 2016 from [http://citizencodeofconduct.org/](http://citizencodeofconduct.org/)

.github/CONTRIBUTING.md

@@ -1,155 +0,0 @@
-How to contribute to Dolibarr
-=============================
-
-Bug reports and feature requests
---------------------------------
-
-<a name="not-a-support-forum"></a>*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](https://www.dolibarr.org/forum).
-
-Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues).
-
-1. Please [use the search engine](https://help.github.com/articles/searching-issues) to check if nobody's already reported your problem.
-2. [Create an issue](https://help.github.com/articles/creating-an-issue). Choose an appropriate title. Prepend appropriately with Bug or Feature Request.
-4. Tell us the version you are using!
-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).
-
-
-
-<a name="code"></a>Code
----------------------
-
-### Basic workflow
-
-1. [Fork](https://help.github.com/articles/fork-a-repo) the [GitHub repository](https://github.com/Dolibarr/dolibarr).
-2. Clone your fork.
-3. Choose a branch(See the [Branches](#branches) section below).
-4. Commit and push your changes.
-5. [Make a pull request](https://help.github.com/articles/creating-a-pull-request).
-
-### <a name="branches"></a>Branches
-
-Unless you're fixing a bug, all pull requests should be made against the *develop* branch.
-
-If you're fixing a bug, it is preferred that you cook your fix and pull request it
-against the oldest version affected that's still supported.
-
-We officially support versions N, N − 1 and N − 2 for N the latest version available.
-
-Choose your base branch accordingly.
-
-### General rules
-Please don't edit the ChangeLog file. File will be generated from all commit messages during release process by the project manager.
-
-### <a name="commits"></a>Commits
-Use clear commit messages with the following structure:
-
-```
-[KEYWORD] [ISSUENUM] DESC
-
-LONGDESC
-```
-
-We provide a [.gitmessage](/.gitmessage) file to help you fit the template.
-
-You can add it to your git configuration using:
-```
-git config --local commit.template .gitmessage
-```
-
-where 
-
-#### 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/FIX: for a bug fix
-- New/NEW: for an unreferenced new feature (Opening a feature request and using close is prefered)
-- Close/CLOSE: for closing a referenced feature request
-
-#### 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.
-
-#### Examples
-<pre>
-FIX|Fix #456 Short description (where #456 is number of bug fix, if it exists. In upper case to appear into ChangeLog)
-or
-NEW|New Short description (In upper case to appear into ChangeLog, use this if you add a feature not tracked, otherwise use CLOSE #456)
-or
-CLOSE|Close #456 Short description (where #456 is number of feature request, if it exists. In upper case to appear into ChangeLog)
-or
-Short description (when the commit is not introducing feature nor closing a bug)
-
-Long description (Can span accross multiple lines).
-</pre>
-
-### Pull Requests
-Pull Request (PR) process is the process to submit a change (enhancement, bug fix, ...) into the code of the project. There is some rules to know and 
-a process to follow to optimize the chance to have PRs merged efficiently...
-
-* A PR must be atomic. It means it must contains the lower possible changes for 1 need (1 bug fix or 1 new feature) without breaking usability of code. If a PR can be split into several PRs, it often means your PR is not atomic.
-
-* Your Pull Request (PR) must pass the Continuous Integration checks and code quality checks.
-
-* When submitting a pull request, use same rule as [Commits](#commits) for the message. If your pull request only contains 1 commit, GitHub will be smart enough to fill it for you. Otherwise, please be a bit verbose about what you're providing.
-
-Also, some code changes need a prior approbation:
-
-* if you want to include a new external library (into htdocs/includes directory), please ask before to the core project manager (mention @dolibarr-yoda in your issue) to see if such a library can be accepted.
-
-* if you add a new table, you must first create a page on https://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Then ask the project manager (@dolibarr-yoda) if the new data model you plan to add is compatible with curent and future works in progress and can be accepted as you suggest.
-
-Once a PR has been submitted, you may need to wait for its integration. It is common that the project leader let the PR open for a long delay to allow every developer discuss about the PR (A label is added in such a case).
-
-If the label of PR start with "Draft" or "WIP" (Work In Progress), it will not be analyzed for merging until you change the label of PR (but it can be analyzed for discussion).
-
-If your PR has errors reported by the Continuous Integration Platform, it means your PR is not valid and nothing will be done with it. It will be kept open to allow developers to fix this, or it may be closed several month later. Don't expect anything on your PR if you have such errors, you MUST first fix the Continuous Integration error to have it taken into consideration. 
-
-If the PR is valid, and is kept open for a long time, a tag will also be added on the PR to describe the status of your PR and why the PR is kept open. By putting your mouse on the tag, you will get a full explanation of the tag/status that explain why your PR has not been integrated yet.
-In most cases, it gives you information of things you have to do to have the PR taken into consideration (for example a change is requested, a conflict is expected to be solved, some questions were asked). If you have a yellow, red flag of purple flag, don't expect to have your PR validated. You must first provide the answer the tag ask you. The majority of open PR are waiting an action of the author of the PR.
-
-Statistics on Dolibarr project shows that 95% of submitted PR are reviewed and tagged. Average answer delay is also one of the best among Open source projects (just few days before having the Answer Tag set). This is one of the most important ratio of answered PR in Open Source world for a major project. Don't expect the core team to reach the 100%. A so high ratio is very rare on a so popular project and with the increasing popularity of Dolibarr, this ratio will probably decrease in future to a more common level.
-
-
-### Resources
-[Developer documentation](https://wiki.dolibarr.org/index.php/Developer_documentation)
-
-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/dolibarr-association/dolibarr/).
-
-Translations done on transifex are available in the next major release.
-
-Note: Sometimes, the source text (english) is modified. In such a case, the translation is reset. Transifex assume that if the original source
-has changed, the translation is surely no more correct so must be done again. But old translation is not lost and you can use the tab "History"
-to retreive all old translation of a source text, and restore the translation in one click with no need to retranslate it if there is no need to. 
-
-
-### Resources
-[Translator documentation](https://wiki.dolibarr.org/index.php/Translator_documentation)
-
-Documentation
--------------
-The project's documentation is maintained on the [Wiki](https://wiki.dolibarr.org/index.php).
-
-*Note*: to help prevent spam, you need to create an account before being able to edit. Everybody is welcome to contribute to its content.
-

.github/FUNDING.yml

@@ -1,5 +0,0 @@
-# These are supported funding model platforms
-
-open_collective: dolibarr
-custom: https://wiki.dolibarr.org/index.php/Subscribe
-# github: [eldy]

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/PULL_REQUEST_TEMPLATE.md

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

.github/workflows/greetings-pr.yml.disabled

@@ -1,13 +0,0 @@
-# See syntax file on https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
-name: Greetings PR
-
-on: [pull_request]
-
-jobs:
-  greeting:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/first-interaction@v1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        pr-message: 'Welcome to the Dolibarr army. You are on the road to become an Admiral (see https://wiki.dolibarr.org/index.php/Dolibarr_Project)'

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

@@ -1,24 +0,0 @@
-# See syntax file on https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
-name: "Close stale issues (bugs and feature requests)"
-
-on:
-  schedule:
-  - cron: "0 21 * * *"
-  issue_comment:
-    types: [created]
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: Dolibarr/stale@staleunstale
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-message: 'This issue is stale because it has been open 1 year with no activity. If this is a bug, please comment to confirm it is still present on latest stable version. if this is a feature request, please comment to notify the request is still relevant and not yet covered by latest stable version. This issue may be closed automatically by stale bot in 15 days (you should still be able to re-open it if required).'
-        stale-label: 'Issue Stale (automatic label)'
-        exempt-labels: 'Priority High / Blocking,Priority Top Strategic,Priority Medium,Hacktoberfest,good first issue,Bug Security (CVE),Analysis of PR in progres'
-        days-before-stale: 365
-        days-before-close: 15
-        operations-per-run: 100
-        dry-run: false
-        

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

@@ -1,25 +0,0 @@
-# See syntax file on https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
-name: "Close stale issues (bugs and feature requests)"
-
-on:
-  schedule:
-  - cron: "0 20 * * *"
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: Dolibarr/stale@master
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'This issue is stale because it has been open 1 year with no activity. If this is a bug, please comment to confirm it is still present on latest stable version. if this is a feature request, please comment to notify the request is still relevant and not yet covered by latest stable version. This issue may be closed automatically by stale bot in 15 days (you should still be able to re-open it if required).'
-        stale-issue-label: 'Issue Stale (automatic label)'
-        exempt-issue-label: 'Priority High / Blocking'
-        days-before-stale: 365
-        days-before-close: -1
-        operations-per-run: 100
-        #stale-pr-message: 'This PR is stale because it has been open 1 year with no activity. If this PR is still mergeable (no conflict, nor Continuous Integration errors), please comment to confirm this merge is still expected. Without comment, this issue will be closed automatically by stale bot in 15 days.'
-        stale-pr-label: 'PR Stale (automatic label)'
-        stale-pr-message: 
-        exempt-pr-label: 'Priority Top Strategic'
-        

.gitignore

@@ -1,7 +1,5 @@
 htdocs/conf/conf.php
 htdocs/conf/conf.php.old
-htdocs/conf/conf.php.sav
-htdocs/conf/conf.php.back
 documents/
 custom2/
 test/report/
@@ -10,34 +8,12 @@ default.properties
 .settings/
 .buildpath
 .gitmodules
+dolibarr_install.log
+doxygen_warnings.log
 /.project
-/.pydevproject
-/.vscode
 .DS_Store
 .idea
 *.iml
 Thumbs.db
-/dolibarr_genesis.mp4
-# Log files
-dolibarr_install.log
-upgrade.log
-doxygen_warnings.log
 # Vagrant generated files
 .vagrant
-# Composer installed repositories
-/htdocs/includes/**/.git
-# Composer autoloader and unwanted files
-composer.phar
-htdocs/includes/autoload.php
-htdocs/includes/bin/
-htdocs/includes/composer/
-htdocs/includes/doctrine/
-htdocs/includes/jakub-onderka/
-htdocs/includes/phpdocumentor/
-htdocs/includes/phpspec/
-htdocs/includes/phpunit/
-htdocs/includes/sebastian/
-htdocs/includes/squizlabs/
-htdocs/includes/symfony/
-htdocs/includes/webmozart/
-htdocs/.well-known/apple-developer-merchantid-domain-association

.gitmessage

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

.mailmap

@@ -1,91 +0,0 @@
-# This is mapping list between real user name/email and entry into sources files
-# If you don't want to have your real email appears here, just send a Pull Request to
-# replace the second field between <> with <secret>
-Laurent Destailleur <eldy@destailleur.fr> Laurent Destailleur <eldy@users.sourceforge.net>
-Laurent Destailleur <eldy@destailleur.fr> eldy <eldy@destailleur.fr>
-Laurent Destailleur <eldy@destailleur.fr> Laurent Destailleur <ldestailleur@teclib.com>
-Laurent Destailleur <eldy@destailleur.fr> eldy10 <eldy10@master8.(none)>
-Laurent Destailleur <eldy@destailleur.fr> Laurent Destailleur <ephpcsdy@destailleur.fr>
-Regis Houssin <regis.houssin@inodbox.com> Regis Houssin <regis@dolibarr.fr>
-Regis Houssin <regis.houssin@inodbox.com> Régis Houssin <regishoussin@device5.home>
-Juanjo Menent <jmenent@2byte.es> simnandez <jmenent@2byte.es>
-Juanjo Menent <jmenent@2byte.es> Juanjo Menent <simnandez@gmail.com>
-Juanjo Menent <jmenent@2byte.es> Simnandez <jmenent@2byte.es>
-Juanjo Menent <jmenent@2byte.es> juanjo <juanjo@samsung>
-Juanjo Menent <jmenent@2byte.es> juanjo <juanjo@alienware>
-Marcos García de La Fuente <marcosgdf@gmail.com> Marcos García <marcosgdf@gmail.com>
-Marcos García de La Fuente <marcosgdf@gmail.com> Marcos García <marcosgdf@gmail.com>
-Florian Henry <florian.henry@open-concept.pro> fhenry <florian.henry@open-concept.pro>
-Florian Henry <florian.henry@open-concept.pro> Florian HENRY <florian.henry@open-concept.pro>
-Florian Henry <florian.henry@open-concept.pro> FHenry <florian.henry.mail@gmail.com>
-Florian Henry <florian.henry@open-concept.pro> Florian HENRY <florian.henry@open-conept.pro>
-Florian Henry <florian.henry@open-concept.pro> FHenry <florian.henry@open-concept.pro>
-Florian Henry <florian.henry@open-concept.pro> HENRY Florian <florian.henry@open-concept.pro>
-Alexandre Spangaro <aspangaro@open-dsi.fr> aspangaro <aspangaro@open-dsi.fr>
-Alexandre Spangaro <aspangaro@open-dsi.fr> Spangaro Alexandre <aspangaro@open-dsi.fr>
-Alexandre Spangaro <aspangaro@open-dsi.fr> Alexandre SPANGARO <aspangaro@open-dsi.fr>
-Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr> Raphaël Doursenaud <rdoursenaud@free.fr>
-Philippe Grand <philippe.grand@atoo-net.com> Grand Philippe <contact@atoo-net.com>
-Philippe Grand <philippe.grand@atoo-net.com> Philippe GRAND <philippe.grand@atoo-net.com>
-Philippe Grand <philippe.grand@atoo-net.com> philippe grand <philippe.grand@atoo-net.com>
-Philippe Grand <philippe.grand@atoo-net.com> philippe <philippe.grand@atoo-net.com>
-Philippe Grand <philippe.grand@atoo-net.com> unknown <Philippe@grandoc.(none)>
-Philippe Grand <philippe.grand@atoo-net.com> philippe <philippe@PC-de-philippe>
-Philippe Grand <philippe.grand@atoo-net.com> Philippe Grand <contact@atoo-net.com>
-Jean-François Ferry <jfefe@aternatik.fr> jfefe <jfefe@aternatik.fr>
-Jean-François Ferry <jfefe@aternatik.fr> jfefe <jf.ferry@aternatik.fr>
-Jean-François Ferry <jfefe@aternatik.fr> JF FERRY <jfefe@aternatik.fr>
-Jean-François Ferry <jfefe@aternatik.fr> JF FERRY <meos@devmachine.(none)>
-Charles Benke <charles.fr@benke.fr> BENKE Charles <charles.fr@benke.fr>
-Charles Benke <charles.fr@benke.fr> BENKE Charlie <charles.fr@benke.fr>
-Charles Benke <charles.fr@benke.fr> defrance69 <charles.fr@benke.fr>
-Maxime Kohlhaas <mko@atm-consulting.fr> MAxime Kohlhaas <maxime@atm-consulting.fr>
-Frédéric France <frederic.france@free.fr> Frédéric FRANCE <frederic.france@free.fr>
-Frédéric France <frederic.france@free.fr> frederic34 <frederic.france@free.fr>
-Frédéric France <frederic.france@free.fr> FRANCE Frédéric <frederic.france@free.fr>
-Frédéric France <frederic.france@free.fr> frederic34 <fred@ubuntuserver.(none)>
-Cyrille de Lambert <cyrille.delambert@auguria.net> cdelambert <cdelambert>
-Cédric Gross <c.gross@kreiz-it.fr> KreizIT <KreizIT@users.noreply.github.com>
-Cédric Gross <c.gross@kreiz-it.fr> Cedric <c.gross@kreiz-it.fr>
-Cédric Gross <c.gross@kreiz-it.fr> Cedric GROSS <c.gross@kreiz-it.fr>
-Jean Heimburger <jean@tiaris.info> jean <jean@tiaris.info>
-Jean Heimburger <jean@tiaris.info> tiaris <tiaris>
-Benoit Mortier <benoit.mortier@opensides.be> opensides <opensides>
-Eric Seigne <contact@ryxeo.com> erics <erics>
-Jean-Louis Bergamo <jl@bergamo.fr> jlb <jlb>
-Remco Gerbrands <remco@artoge.nl> r2gnl <r2gnl>
-Phf <phf@atm-consulting.fr> phf <phf@atm-consulting.fr>
-Yannick Warnier <ywarnier@beeznest.org> ywarnier <ywarnier>
-Jerome Warnier <jwarnier@beeznest.org> jwarnier <jwarnier>
-Franky Van Liedekerke <liedekef@telenet.be> liedekef <liedekef>
-Lalaina Rasamoelina <lalaina.rasamoelina@biblibre.com> lalaina rasamoelina <lalaina.rasamoelina@biblibre.com>
-Marc Ocebo <marc_ocebo> marc_ocebo <marc_ocebo>
-Unknown <secret> box7890 <box7890>
-Unknown <secret> beedauchon <beedauchon>
-Loic <secret> loic <loic>
-Christophe Combelle <ccomb>
-Unknown <secret> activdev <activdev>
-Unknown <secret> bouba <bouba>
-Unknown <secret> bcroq <bcroq>
-Unknown <secret> dutoit <dutoit>
-Unknown <secret> bureau2crea <bureau2crea>
-Unknown <secret> unknown <mne02@.modula71.local>
-Simon Tosser <secret> simontosser <simontosser>
-Unknown <secret> tipaul <tipaul>
-Raphaël Bertrand <secret> raphael_bertrand <raphael_bertrand>
-Claudio Aschieri <c.aschieri@19.coop> cla <c.aschieri@19.coop>
-Tommaso Basilici <t.basilici@19.coop> kaos <t.basilici@19.coop>
-Tommaso Basilici <t.basilici@19.coop> Tommaso Basilici <t.basilici@19.coop>
-Faust <faust@19.coop> faust <faust@19.coop>
-Ferran Marcet <secret> fmarcet <fmarcet@imedia>
-Geoffrey Girard <geoffre.girard@atm-consulting.fr> geoffrey.girard <geoffre.girard@atm-consulting.fr>
-Bernard Paquier <eshop.bpaquier@gmail.com> BadPixxel <eshop.bpaquier@gmail.com>
-Patrick Delcroix <delcroip@gmail.com> delcroix Patrick <delcroip@gmail.com>
-Damien Clochard <damien@dalibo.com> damien clochard <damien@dalibo.info>
-Damien Clochard <damien@dalibo.com> damien clochard <damien@dalibo.com>
-Grégory David <groolot@groolot.net> Grégory DAVID <groolot@groolot.net>
-Grégory David <groolot@groolot.net> Gregory DAVID <groolot@groolot.net>
-Baffir Abbes <bafbes@users.noreply.github.com> bafbes <bafbes@users.noreply.github.com>
-Kevin Guerrier <guerrier.k@gmail.com> GUERRIER Kevin <guerrier.k@gmail.com>
-Remy Younes <ryounes@gmail.com> remy <ryounes@gmail.com>
-Estephe Loridan <github@estephe.me> Estephe L. <github@estephe.me>

.scrutinizer.yml

@@ -1,27 +1,16 @@
 # .scrutinizer.yml
-#build:
-#    - php-scrutinizer-run
-build:
-    nodes:
-        analysis:
-            tests:
-                override:
-                    - php-scrutinizer-run
-          
 imports:
     - javascript
     - php
 
 filter:
     excluded_paths:
-        - build/*
-        - dev/*
-        - doc/*
-        - test/*
-        - htdocs/includes/*
-    paths: 
-        - htdocs/*
-        - scripts/*
+        - 'build/*'
+        - 'dev/*'
+        - 'doc/*'
+        - 'test/*'
+        - 'htdocs/includes/*'
+    paths: {  }
     
 tools:
     # php_analyzer. Doc on https://scrutinizer-ci.com/docs/tools/php/php-analyzer/
@@ -29,19 +18,15 @@ tools:
         enabled: true
         extensions:
             - php
-        dependency_paths: 
-            - htdocs/includes/
+        dependency_paths: {  }
         filter:
             excluded_paths:
-                - build/*
-                - dev/*
-                - doc/*
-                - test/*
-                - htdocs/includes/*
-                - htdocs/core/class/lessc.class.php
-            paths:
-                - htdocs/
-                - scripts/
+                - 'build/*'
+                - 'dev/*'
+                - 'doc/*'
+                - 'test/*'
+                - 'htdocs/includes/*'
+            paths: {  }
         config:
             parameter_reference_check:
                 enabled:              true
@@ -195,6 +180,22 @@ tools:
                 - 'htdocs/includes/*'
             paths: {  }
 
+    php_changetracking:
+        enabled: false
+        bug_patterns:
+            - '\bfix(?:es|ed)?\b'
+        feature_patterns:
+            - '\badd(?:s|ed)?\b'
+            - '\bimplement(?:s|ed)?\b'
+        filter:
+            excluded_paths:
+                - 'build/*'
+                - 'dev/*'
+                - 'doc/*'
+                - 'test/*'
+                - 'htdocs/includes/*'
+            paths: {  }
+            
     # Coding-Style / Bug Detection
     js_hint:
         enabled: false

.stickler.yml

@@ -1,14 +0,0 @@
----
-linters:
-  phpcs:
-      standard: 'dev/setup/codesniffer/ruleset.xml'
-      extensions: 'php'
-      tab_width: 4
-      fixer: true
-
-fixers:
-    enable: true
-
-files:
-    ignore:
-        - 'htdocs/includes/*'

.travis.yml

@@ -2,87 +2,65 @@
 # from Dolibarr GitHub repository.
 # For syntax, see http://about.travis-ci.org/docs/user/languages/php/
 
-# We use dist: xenial to have php 5.6+ available
-os: linux
-dist: xenial
 sudo: required
 
 language: php
 
-# Start on every boot
-services:
-- memcached
-- mysql
-- postgresql
+php:
+- '5.3'
+- '5.4'
+- '5.5'
+- '5.6'
+- '7.0'
+- nightly
 
 addons:
-  # Force postgresql to 9.4 (the oldest availablable on xenial)
-  postgresql: '9.4'
+  mariadb: '10.0'
+  # FIXME: find a way to import a MySQL dump into PostgreSQL
+  #postgresql: '9.3'
   apt:
-    sources:
-    # To use the last version of pgloader, we add repo of postgresql with a name available in http://apt.postgresql.org/pub/repos/apt/
-    - pgdg-xenial
     packages:
     # We need a webserver to test the webservices
     # Let's install Apache with.
     - apache2
     # mod_php is not supported by Travis. Add fcgi. We install FPM later on.
     - libapache2-mod-fastcgi
-    # We need pgloader for import mysql database into pgsql
-    - pgloader
 
-php:
-- '5.6'
-- '7.0'
-- '7.1'
-- '7.2'
-- '7.3'
-- '7.4'
-- nightly
+# Start on every boot
+services:
+- memcached
 
 env:
   global:
   # Set to true for very verbose output
   - DEBUG=false
-  jobs:
+  matrix:
   # MariaDB overrides MySQL installation so it's not possible to test both yet
-  #- DB=mariadb
-  - DB=mysql
-  - DB=postgresql
+  #- DB=mysql
+  - DB=mariadb
+  # FIXME: find a way to import a MySQL dump into PostgreSQL
+  #- DB=postgresql
+  # TODO
+  #- DB=sqlite
   # See https://docs.travis-ci.com/user/languages/php/#Apache-%2B-PHP
   #- WS=apache
   # See https://github.com/DracoBlue/travis-ci-nginx-php-fpm-test
   #- WS=nginx
 
-jobs:
+matrix:
   fast_finish: true
   allow_failures:
-  - php: nightly
-  # We exclude some combinations not usefull to save Travis CPU
-  exclude:
   - php: '7.0'
-    env: DB=mysql
-  - php: '7.1'
-    env: DB=mysql
-  - php: '7.2'
-    env: DB=mysql
-  - php: '7.3'
-    env: DB=mysql
-  - php: '7.0'
-    env: DB=postgresql
-  - php: '7.1'
-    env: DB=postgresql
-  - php: '7.2'
-    env: DB=postgresql
-  - php: '7.3'
-    env: DB=postgresql
   - php: nightly
-    env: DB=postgresql
+  # FIXME
+  #- env: DB=postgresql
+  # TODO
+  #- env: DB=sqlite
 
 notifications:
   email:
     on_success: never # [always|never|change] default: change
-    on_failure: never # [always|never|change] default: always
+    on_failure: change # [always|never|change] default: always
   irc:
     channels:
     - "chat.freenode.net#dolibarr"
@@ -98,55 +76,38 @@ before_install:
   phpenv config-rm xdebug.ini
   echo
 
-- |
-  if [ "$DB" = 'postgresql' ]; then
-    echo "Check pgloader version"
-    pgloader --version
-    echo
-  fi
-
 install:
 - |
   echo "Updating Composer"
-  rm $TRAVIS_BUILD_DIR/composer.json
-  rm $TRAVIS_BUILD_DIR/composer.lock
   composer self-update
-  # To have composer making parallel downloads
-  composer global require hirak/prestissimo
-  composer -n init
-  composer -n config vendor-dir htdocs/includes
   echo
 
 - |
-  echo "Installing Composer dependencies (PHP Unit, Parallel Lint & PHP CodeSniffer"
-  if [ "$TRAVIS_PHP_VERSION" = '5.4' ] || [ "$TRAVIS_PHP_VERSION" = '5.5' ]; then
-    composer -n require phpunit/phpunit ^4 \
-                        jakub-onderka/php-parallel-lint ^0 \
-                        jakub-onderka/php-console-highlighter ^0 \
-                        squizlabs/php_codesniffer ^3
+  echo "Installing Parallel Lint"
+  composer -n require jakub-onderka/php-parallel-lint ^0
+  composer -n require jakub-onderka/php-console-highlighter ^0
+  echo
+
+- |
+  echo "Installing PHP Unit"
+  if [ "$TRAVIS_PHP_VERSION" = '5.3' ] || [ "$TRAVIS_PHP_VERSION" = '5.4' ] || [ "$TRAVIS_PHP_VERSION" = '5.5' ]; then
+    composer -n require phpunit/phpunit ^4
   fi
-  if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] \
-     [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ]; then
-    composer -n require phpunit/phpunit ^5 \
-                        jakub-onderka/php-parallel-lint ^0 \
-                        jakub-onderka/php-console-highlighter ^0 \
-                        squizlabs/php_codesniffer ^3
-  fi
-  if [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
-      composer -n require --ignore-platform-reqs phpunit/phpunit ^5 \
-                                                 jakub-onderka/php-parallel-lint ^0 \
-                                                 jakub-onderka/php-console-highlighter ^0 \
-                                                 squizlabs/php_codesniffer ^3
+  if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
+    composer -n require phpunit/phpunit ^5
   fi
   echo
 
 - |
-  echo "Adding path of binaries tools installed by composer to the PATH"
+  echo "Installing PHP CodeSniffer"
+  composer require squizlabs/php_codesniffer ^2
+  echo
+
+- |
+  echo "Adding Composer binaries to the path"
   export PATH="$TRAVIS_BUILD_DIR/htdocs/includes/bin:$PATH"
   echo
 
-
-
 before_script:
 - |
   echo Start travis
@@ -164,52 +125,49 @@ before_script:
   echo
   echo "Set timezone"
   echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+  if [ "$TRAVIS_PHP_VERSION" = '5.3' ] || [ "$TRAVIS_PHP_VERSION" = '5.4' ]; then
+    #echo
+    #echo "Enabling APC for PHP <= 5.4"
+    #   Documentation says it should be available for PHP <= 5.6 but it's not for 5.5 and 5.6!
+    #echo 'extension = apc.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+    echo
+    echo "Enabling Memcached for PHP <= 5.4"
+    #   Documentation says it should be available for all PHP versions but it's not for 5.5 and 5.6, 7.0 and nightly!
+    echo 'extension = memcached.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+  fi
   phpenv rehash
   echo
 
 - |
-    echo "Versions information"
+  if [ "$DEBUG" = true ]; then
     # Check PHP
-    echo "PHP version"
-    php -i | head -
+    php -i
     # Check PHP CodeSniffer installation
-    echo "PHPCS version"
     which phpcs
-    phpcs --version | head -
-    phpcs -i | head -
+    phpcs --version
+    phpcs -i
     # Check PHPUnit installation
-    echo "PHPUnit version"
     which phpunit
-    phpunit --version | head -
-    # Check Apache version
-    echo "Apache version"
-    apache2 -v | head -
-    # Check Database
-    echo "Database version"
-    mysql --version | head -
-    mysql -e "SELECT VERSION();"  | head -
-    psql --version
+    phpunit --version
+    # Check MySQL
+    mysql --version
+    mysql -e "SELECT VERSION();"
     echo
+  fi
   
 - |
   echo "Setting up database"
-    if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; then
+  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
     echo "MySQL"
-      mysql -u root -e 'DROP DATABASE IF EXISTS travis;'
-      mysql -u root -e 'CREATE DATABASE IF NOT EXISTS travis;'
-      mysql -u root -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
-      mysql -u root -e 'FLUSH PRIVILEGES;'
-      mysql -u root -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
-    fi
-    if [ "$DB" = 'postgresql' ]; then
-      #psql -c 'create database travis;' -U postgres
-      #psql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
-      #pgloader mysql://root:pass@127.0.0.1/dolibarr_src postgresql://dolibarrowner:dolibarrownerpass@127.0.0.1/dolibarr_dest
-      echo pgloader mysql://root@127.0.0.1/travis postgresql://postgres@/travis
-      pgloader mysql://root@127.0.0.1/travis postgresql://postgres@/travis
-      echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql -U postgres travis
-      echo 'ALTER SEQUENCE llx_accounting_account_rowid_seq RESTART WITH 1000001;' | psql -U postgres travis
+    mysql -e 'DROP DATABASE IF EXISTS travis;'
+    mysql -e 'CREATE DATABASE IF NOT EXISTS travis;'
+    mysql -D travis < dev/initdata/mysqldump_dolibarr_3.5.0.sql
   fi
+  # FIXME: find a way to import a MySQL dump into PostgreSQL
+  #if [ "$DB" = 'postgresql' ]; then
+  #  pgsql travis < dev/initdata/mysqldump_dolibarr_3.5.0.sql
+  #fi
+  # TODO: SQLite
   echo
 
 - |
@@ -222,15 +180,14 @@ before_script:
   echo '$'dolibarr_main_db_host=\'127.0.0.1\'';' >> $CONF_FILE
   echo '$'dolibarr_main_db_name=\'travis\'';' >> $CONF_FILE
   echo '$'dolibarr_main_db_user=\'travis\'';' >> $CONF_FILE
-    echo '$'dolibarr_main_instance_unique_id=\'travis1234567890\'';' >> $CONF_FILE
   if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
     echo '$'dolibarr_main_db_type=\'mysqli\'';' >> $CONF_FILE
-      echo '$'dolibarr_main_db_port=\'3306\'';' >> $CONF_FILE
-    fi
-    if [ "$DB" = 'postgresql' ]; then
-      echo '$'dolibarr_main_db_type=\'pgsql\'';' >> $CONF_FILE
-      echo '$'dolibarr_main_db_port=\'5432\'';' >> $CONF_FILE
   fi
+  # FIXME
+  #if [ "$DB" = 'postgresql' ]; then
+  #  echo '$'dolibarr_main_db_type=\'pgsql\'';' >> $CONF_FILE
+  #fi
+  # TODO: SQLite
   echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> $CONF_FILE
   cat $CONF_FILE
   echo
@@ -238,42 +195,44 @@ before_script:
 - |
   echo "Create documents directory and set permissions"
   # and admin/temp subdirectory needed for unit tests
-    mkdir -p $TRAVIS_BUILD_DIR/documents/admin/temp
-    sudo chmod -R a+rwx $TRAVIS_BUILD_DIR/documents
-    echo "***** First line of dolibarr.log" > $TRAVIS_BUILD_DIR/documents/dolibarr.log
+  mkdir -p documents/admin/temp
   echo
 
-
-  - echo "Setting up Apache + FPM"
-  # enable php-fpm
-  - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
 - |
-    if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
+  echo "Setting up Apache + FPM"
+  # enable php-fpm
+  cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.conf.default ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.conf
+  if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
     # Copy the included pool
-      sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf
+    cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.d/www.conf
   fi
-  - sudo a2enmod rewrite actions fastcgi alias
-  - echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-  - sudo sed -i -e "s,www-data,travis,g" /etc/apache2/envvars
-  - sudo chown -R travis:travis /var/lib/apache2/fastcgi
-  - ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
+  if [ "$DEBUG" = true ]; then
+    cat ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.conf
+  fi
+  sudo a2enmod rewrite actions fastcgi alias
+  echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+  if [ "$DEBUG" = true ]; then
+    cat ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+  fi
+  ~/.phpenv/versions/$PHP_VERSION_NAME/sbin/php-fpm
   # configure apache virtual hosts
-  - sudo cp -f build/travis-ci/apache.conf /etc/apache2/sites-available/000-default.conf
-  - sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
-  - sudo cat /etc/apache2/sites-available/000-default.conf
-  - sudo service apache2 restart
-
-
+  sudo cp -f build/travis-ci/apache.conf /etc/apache2/sites-available/default
+  sudo sed -e "s?%TRAVIS_BUILD_DIR%?$TRAVIS_BUILD_DIR?g" --in-place /etc/apache2/sites-available/default
+  if [ "$DEBUG" = true ]; then
+    sudo cat /etc/apache2/sites-available/default
+  fi
+  sudo service apache2 restart
+  echo
 
 script:
 - |
-  echo "Checking webserver availability by a wget -O - http://127.0.0.1"
-  # Ensure we stop on error with set -e
-  set +e
-  # The wget should return a page with line '<meta name="generator" content="Dolibarr installer">
-  wget -O - http://127.0.0.1 > test.html
-  head test.html
-  sudo cat /var/log/apache2/travis_error_log
+  echo "Checking webserver availability"
+  # Ensure we catch errors
+  set -e
+  wget http://127.0.0.1
+  if [ "$DEBUG" = true ]; then
+    cat index.html
+  fi
   set +e
   echo
 
@@ -281,178 +240,64 @@ script:
   echo "Checking PHP syntax errors"
   # Ensure we catch errors
   set -e
-  #parallel-lint --exclude htdocs/includes --blame .
-  parallel-lint --exclude dev/namespacemig --exclude htdocs/includes/myclabs --exclude htdocs/includes/webmozart --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian --exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/phpunit/ --exclude htdocs/includes/composer/autoload_static.php --blame .
+  parallel-lint --exclude htdocs/includes --blame .
   set +e
   echo
 
+# TODO: dev/* checks
+
 - |
-  echo "Checking coding style (excluding Pull Requests builds)"
+  echo "Checking coding style"
   # Ensure we catch errors
   set -e
   # Exclusions are defined in the ruleset.xml file
-  #phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
-  if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .; fi
+  phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/codesniffer/ruleset.xml --encoding=utf-8 .
   set +e
   echo
 
-- |
-  export INSTALL_FORCED_FILE=htdocs/install/install.forced.php
-  echo "Setting up Dolibarr $INSTALL_FORCED_FILE to test installation"
-  # Ensure we catch errors
-  set +e
-  echo '<?php ' > $INSTALL_FORCED_FILE
-  echo '$'force_install_noedit=2';' >> $INSTALL_FORCED_FILE
-  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
-    echo '$'force_install_type=\'mysqli\'';' >> $INSTALL_FORCED_FILE
-  fi
-  if [ "$DB" = 'postgresql' ]; then
-    echo '$'force_install_type=\'pgsql\'';' >> $INSTALL_FORCED_FILE
-  fi
-  echo '$'force_install_dbserver=\'127.0.0.1\'';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_database=\'travis\'';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_databaselogin=\'travis\'';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_databasepass=\'\'';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_port=\'5432\'';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_prefix=\'llx_\'';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_createdatabase=false';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_createuser=false';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_mainforcehttps=false';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_main_data_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $INSTALL_FORCED_FILE
-  #cat $INSTALL_FORCED_FILE
+# TODO: Check Javascript (jshint?)
 
-#- |
-#  echo "Installing Dolibarr"
-#  cd htdocs/install
-#  php step1.php $TRAVIS_BUILD_DIR/htdocs > $TRAVIS_BUILD_DIR/install.log
-#  php step2.php set >> $TRAVIS_BUILD_DIR/install.log
-#  if [ "$?" -ne "0" ]; then
-#    echo "SORRY, AN ERROR OCCURED DURING INSTALLATION PROCESS"
-#    cat $TRAVIS_BUILD_DIR/install.log
-#    exit 1
-#  fi
-#  cd ../..
-#  rm $INSTALL_FORCED_FILE
-#  #cat $TRAVIS_BUILD_DIR/install.log
-# set +e
-#  echo
+# TODO: Check CSS (csslint?)
 
-- |
-  echo "Setting up database to test migrations"
-  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; then
-    echo "MySQL"
-    mysql -e 'DROP DATABASE IF EXISTS travis;'
-    mysql -e 'CREATE DATABASE IF NOT EXISTS travis;'
-    mysql -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
-    mysql -e 'FLUSH PRIVILEGES;'
-    mysql -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
-  fi
-  if [ "$DB" = 'postgresql' ]; then
-    #pgsql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
-    #pgloader mysql://root:pass@127.0.0.1/base postgresql://dolibarrowner@127.0.0.1/dolibarr
-    echo pgloader mysql://root@127.0.0.1/travis postgresql:///travis
-    pgloader mysql://root@127.0.0.1/travis postgresql:///travis
-    echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql travis
-    echo 'ALTER SEQUENCE llx_accounting_account_rowid_seq RESTART WITH 1000001;' | psql travis
-    #echo 'select * from INFORMATION_SCHEMA.COLUMNS where table_name = 'llx_accountingaccount' | psql travis
-    #echo 'select * from information_schema.table_constraints;' | psql travis
-    #echo 'ALTER TABLE "llx_accounting_account" DROP CONSTRAINT "idx_16390_primary"' | psql travis
-  fi
-  echo
+# TODO: check SQL syntax (pgsanity?)
 
 - |
   echo "Upgrading Dolibarr"
-  # Ensure we catch errors. Set this to +e if you want to go to the end to see log files.
-  set +e
+  # Ensure we catch errors
+  set -e
   cd htdocs/install
   php upgrade.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360.log
-  php upgrade2.php 3.5.0 3.6.0 > $TRAVIS_BUILD_DIR/upgrade350360-2.log
-  php step5.php 3.5.0 3.6.0 > $TRAVIS_BUILD_DIR/upgrade350360-3.log
+  php upgrade2.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360-2.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 > $TRAVIS_BUILD_DIR/upgrade360370-2.log
-  php step5.php 3.6.0 3.7.0 > $TRAVIS_BUILD_DIR/upgrade360370-3.log
-  php upgrade.php 3.7.0 3.8.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade370380.log
-  php upgrade2.php 3.7.0 3.8.0 > $TRAVIS_BUILD_DIR/upgrade370380-2.log
-  php step5.php 3.7.0 3.8.0 > $TRAVIS_BUILD_DIR/upgrade370380-3.log
-  php upgrade.php 3.8.0 3.9.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade380390.log
-  php upgrade2.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-2.log
-  php step5.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-3.log
-  php upgrade.php 3.9.0 4.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade390400.log
-  php upgrade2.php 3.9.0 4.0.0 > $TRAVIS_BUILD_DIR/upgrade390400-2.log
-  php step5.php 3.9.0 4.0.0 > $TRAVIS_BUILD_DIR/upgrade390400-3.log
-  php upgrade.php 4.0.0 5.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade400500.log
-  php upgrade2.php 4.0.0 5.0.0 > $TRAVIS_BUILD_DIR/upgrade400500-2.log
-  php step5.php 4.0.0 5.0.0 > $TRAVIS_BUILD_DIR/upgrade400500-3.log
-  php upgrade.php 5.0.0 6.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade500600.log
-  php upgrade2.php 5.0.0 6.0.0 > $TRAVIS_BUILD_DIR/upgrade500600-2.log
-  php step5.php 5.0.0 6.0.0 > $TRAVIS_BUILD_DIR/upgrade500600-3.log
-  php upgrade.php 6.0.0 7.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade600700.log
-  php upgrade2.php 6.0.0 7.0.0 > $TRAVIS_BUILD_DIR/upgrade600700-2.log
-  php step5.php 6.0.0 7.0.0 > $TRAVIS_BUILD_DIR/upgrade600700-3.log
-  php upgrade.php 7.0.0 8.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade700800.log
-  php upgrade2.php 7.0.0 8.0.0 > $TRAVIS_BUILD_DIR/upgrade700800-2.log
-  php step5.php 7.0.0 8.0.0 > $TRAVIS_BUILD_DIR/upgrade700800-3.log
-  php upgrade.php 8.0.0 9.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade800900.log
-  php upgrade2.php 8.0.0 9.0.0 > $TRAVIS_BUILD_DIR/upgrade800900-2.log
-  php step5.php 8.0.0 9.0.0 > $TRAVIS_BUILD_DIR/upgrade800900-3.log
-  php upgrade.php 9.0.0 10.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade9001000.log
-  php upgrade2.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-2.log
-  php step5.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-3.log
-  php upgrade.php 10.0.0 11.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade10001100.log
-  php upgrade2.php 10.0.0 11.0.0 > $TRAVIS_BUILD_DIR/upgrade10001100-2.log
-  php step5.php 10.0.0 11.0.0 > $TRAVIS_BUILD_DIR/upgrade10001100-3.log
-  php upgrade.php 11.0.0 12.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade11001200.log
-  php upgrade2.php 11.0.0 12.0.0 > $TRAVIS_BUILD_DIR/upgrade11001200-2.log
-  php step5.php 11.0.0 12.0.0 > $TRAVIS_BUILD_DIR/upgrade11001200-3.log
-  # Enable modules not enabled into original dump
-  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKETSUP,MAIN_MODULE_ACCOUNTING > $TRAVIS_BUILD_DIR/enablemodule.log
-  echo $?
+  php upgrade2.php 3.6.0 3.7.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade360370-2.log
   cd -
   set +e
   echo
-  #cat /tmp/dolibarr_install.log
-  cat $TRAVIS_BUILD_DIR/enablemodule.log
 
 - |
   echo "Unit testing"
-  # Ensure we catch errors. Set this to +e if you want to go to the end to see dolibarr.log file.
+  # Ensure we catch errors
   set -e
   phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php
-  phpunitresult=$?
-  echo "Phpunit return code = $phpunitresult"
   set +e
-
-after_script:
-- |
-  echo "After script - Output lines of dolibarr.log"
-  ls $TRAVIS_BUILD_DIR/documents
-  #cat $TRAVIS_BUILD_DIR/documents/dolibarr.log
-  sudo tail -n 50 $TRAVIS_BUILD_DIR/documents/dolibarr.log
+  echo
 
 after_success:
-- |
-  echo Success
 
 after_failure:
 - |
-  echo Failure detected, so we show samples of log to help diagnose
-  # This part of code is executed only if previous command that fails are enclosed with set +e
-  # Upgrade log files
-  for ficlog in `ls $TRAVIS_BUILD_DIR/*.log`
-  do
-    echo "Debugging informations for file $ficlog"
-    #cat $ficlog
-  done
-  # Apache log file
-  echo "Debugging informations for file apache error.log"
-  sudo cat /var/log/apache2/travis_error_log
   if [ "$DEBUG" = true ]; then
+    echo "Debugging informations"
+    # Upgrade log files
+    cat *.log
     # Dolibarr log file
-    echo "Debugging informations for file dolibarr.log (latest 50 lines)"
-    tail -n 50 $TRAVIS_BUILD_DIR/documents/dolibarr.log
-    # Database log file
-    echo "Debugging informations for file mysql error.log"
-    sudo tail -n 50 /var/log/mysql/error.log
+    cat documents/dolibarr.log
+    # Apache log file
+    sudo cat /var/log/apache2/error.log
+    # MariaDB log file
+    sudo cat /var/log/mysql/error.log
     # TODO: PostgreSQL log file
     echo
   fi
+
+after_script:

.tx/config

@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.com
-lang_map = uz: uz_UZ, sw: sw_SW, sr@latin: sr_RS
+lang_map = uz: uz_UZ, sw: sw_SW
 
 [dolibarr.accountancy]
 file_filter = htdocs/langs/<lang>/accountancy.lang
@@ -20,12 +20,6 @@ source_file = htdocs/langs/en_US/agenda.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.assets]
-file_filter = htdocs/langs/<lang>/assets.lang
-source_file = htdocs/langs/en_US/assets.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.banks]
 file_filter = htdocs/langs/<lang>/banks.lang
 source_file = htdocs/langs/en_US/banks.lang
@@ -38,12 +32,6 @@ source_file = htdocs/langs/en_US/bills.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.blockedlog]
-file_filter = htdocs/langs/<lang>/blockedlog.lang
-source_file = htdocs/langs/en_US/blockedlog.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.bookmarks]
 file_filter = htdocs/langs/<lang>/bookmarks.lang
 source_file = htdocs/langs/en_US/bookmarks.lang
@@ -158,12 +146,6 @@ 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.install]
 file_filter = htdocs/langs/<lang>/install.lang
 source_file = htdocs/langs/en_US/install.lang
@@ -176,7 +158,7 @@ source_file = htdocs/langs/en_US/interventions.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.languages-not-res]
+[dolibarr.languages]
 file_filter = htdocs/langs/<lang>/languages.lang
 source_file = htdocs/langs/en_US/languages.lang
 source_lang = en_US
@@ -194,12 +176,6 @@ source_file = htdocs/langs/en_US/link.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.loan]
-file_filter = htdocs/langs/<lang>/loan.lang
-source_file = htdocs/langs/en_US/loan.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.mailmanspip]
 file_filter = htdocs/langs/<lang>/mailmanspip.lang
 source_file = htdocs/langs/en_US/mailmanspip.lang
@@ -230,30 +206,6 @@ source_file = htdocs/langs/en_US/members.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.modulebuilder]
-file_filter = htdocs/langs/<lang>/modulebuilder.lang
-source_file = htdocs/langs/en_US/modulebuilder.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.mrp]
-file_filter = htdocs/langs/<lang>/mrp.lang
-source_file = htdocs/langs/en_US/mrp.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.multicurrency]
-file_filter = htdocs/langs/<lang>/multicurrency.lang
-source_file = htdocs/langs/en_US/multicurrency.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
@@ -284,9 +236,9 @@ source_file = htdocs/langs/en_US/paypal.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.printing]
-file_filter = htdocs/langs/<lang>/printing.lang
-source_file = htdocs/langs/en_US/printing.lang
+[dolibarr.printipp]
+file_filter = htdocs/langs/<lang>/printipp.lang
+source_file = htdocs/langs/en_US/printipp.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
@@ -314,18 +266,6 @@ 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.receptions]
-file_filter = htdocs/langs/<lang>/receptions.lang
-source_file = htdocs/langs/en_US/receptions.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.resource]
 file_filter = htdocs/langs/<lang>/resource.lang
 source_file = htdocs/langs/en_US/resource.lang
@@ -356,30 +296,12 @@ source_file = htdocs/langs/en_US/stocks.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.stripe]
-file_filter = htdocs/langs/<lang>/stripe.lang
-source_file = htdocs/langs/en_US/stripe.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.suppliers]
 file_filter = htdocs/langs/<lang>/suppliers.lang
 source_file = htdocs/langs/en_US/suppliers.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.supplier_proposal]
-file_filter = htdocs/langs/<lang>/supplier_proposal.lang
-source_file = htdocs/langs/en_US/supplier_proposal.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.ticket]
-file_filter = htdocs/langs/<lang>/ticket.lang
-source_file = htdocs/langs/en_US/ticket.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.trips]
 file_filter = htdocs/langs/<lang>/trips.lang
 source_file = htdocs/langs/en_US/trips.lang
@@ -392,12 +314,6 @@ source_file = htdocs/langs/en_US/users.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.website]
-file_filter = htdocs/langs/<lang>/website.lang
-source_file = htdocs/langs/en_US/website.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.withdrawals]
 file_filter = htdocs/langs/<lang>/withdrawals.lang
 source_file = htdocs/langs/en_US/withdrawals.lang
@@ -409,10 +325,3 @@ file_filter = htdocs/langs/<lang>/workflow.lang
 source_file = htdocs/langs/en_US/workflow.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
-
-[dolibarr.zapier]
-file_filter = htdocs/langs/<lang>/zapier.lang
-source_file = htdocs/langs/en_US/zapier.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-

COPYING

@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
+<http://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<https://www.gnu.org/philosophy/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

COPYRIGHT

@@ -5,69 +5,171 @@ License
 Dolibarr is released under the terms of the GNU General Public License as 
 published by the Free Software Foundation; either version 3 of the License,
 or (at your option) any later version (GPL-3+).
-More information: https://www.gnu.org/licenses/gpl-3.0.txt
+More information: http://www.gnu.org/licenses/gpl-3.0.txt
 
 Dolibarr uses some external libraries released under different licenses. This is compatibility summary:
 
 Component              Version       License                     GPL Compatible  Usage
 -------------------------------------------------------------------------------------
 PHP libraries:
-AdoDb-Date             0.36          Modified BSD License        Yes             Date convertion (not into rpm package)
-CKEditor               4.12.1        LGPL-2.1+                   Yes             Editor WYSIWYG
-EvalMath               1.0           BSD                         Yes             Safe math expressions evaluation
-Escpos-php             2.2           MIT License                 Yes             Thermal receipt printer library, for use with ESC/POS compatible printers
-GeoIP2                 0.2.0         LGPL-2.1+                   Yes             Lib to make geoip convert
-Mobiledetect           2.8.34        MIT License                 Yes             Detect mobile devices browsers
+AdoDb-Date             0.32          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
+CKEditor               4.3.3         LGPL-2.1+                   Yes             Editor WYSIWYG
+FPDI                   1.4.2         Apache Software License 2.0 Yes             PDF templates management
+FPDF_TPL               1.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)
 NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
-PEAR Mail_MIME         1.8.9         BSD                         Yes             NuSoap dependency
-ParseDown              1.6           MIT License                 Yes             Markdown parser
-PHPDebugBar            1.15.0        MIT License	             Yes             Used only by the module "debugbar" for developers
-PHPExcel               1.8.1         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
-PHPSpreadSheet         ?             LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
-php-iban               1.4.7         LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
-PHPoAuthLib            0.8.2         MIT License                 Yes             Library to provide oauth1 and oauth2 to different service
+odtPHP                 1.0.1         GPL-2+  b                   Yes             Library to build/edit ODT files
+PHPExcel               1.7.8         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
 PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
-PSR/Logs			   1.0										                 Library for logs (used by DebugBar)
-PSR/simple-cache	   ?										                 Library for cache (used by PHPSpreadSheet)
-Restler                3.0.0RC6      LGPL-3+                     Yes             Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
-Sabre                  3.2.2         BSD                         Yes             DAV support
-Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
-Stripe                 6.43.1        MIT licence                 Yes             Library for Stripe module
-TCPDF                  6.3.2         LGPL-3+                     Yes             PDF generation
-TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
+TCPDF                  6.0.093       LGPL-3+                     Yes             PDF generation
 
 JS libraries:
-Ace                    1.4.8         BSD                         Yes             JS library to get code syntaxique coloration in a textarea.
-ChartJS				   2.9.3         MIT License                 Yes             JS library for graph
-jQuery                 3.4.1         MIT License                 Yes             JS library
-jQuery UI              1.12.1        GPL and MIT License         Yes             JS library plugin UI
-jQuery select2         4.0.13         GPL and Apache License      Yes             JS library plugin for sexier multiselect. Warning: 4.0.6+ create troubles without patching css
-jQuery blockUI         2.70.0        GPL and MIT License         Yes             JS library plugin blockUI (to use ajax popups)
+jQuery                 1.8.2         MIT License                 Yes             JS library
+jQuery UI              1.9.1         GPL and MIT License         Yes             JS library plugin UI
+jQuery select2         3.5.2         GPL and Apache License      Yes             JS library plugin for sexier multiselect
+jQuery blockUI         2.43          GPL and MIT License         Yes             JS library plugin blockUI (to use ajax popups)
 jQuery Colorpicker     1.1           MIT License                 Yes             JS library for color picker for a defined list of colors
+jQuery DataTables      1.9.4         BSD                         Yes             JS library for tables output
+jQuery FileUpload      5.0.3         GPL and MIT License         Yes             JS library to upload files
+jQuery Flot            0.7           MIT License                 Yes             JS library to build graph
 jQuery JCrop           0.9.8         GPL and MIT License         Yes             JS library plugin Crop (to crop images)
 jQuery Jeditable       1.7.1         GPL and MIT License         Yes             JS library plugin jeditable (to edit in place)
 jQuery jNotify         1.1.00        Apache Software License 2.0 Yes             JS library plugin jNotify (to use ajax popups)
 jQuery jPicker         1.1.6         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
-jQuery jqueryFileTree  1.0.1         GPL and MIT License         Yes             JS library for filetree
-jQuery jquerytreeview  1.4.1         MIT License                 Yes             JS library for filetree
+jQuery jqueryFileTree  1.0.1         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
+jQuery jquerytreeview  1.4.1         MIT License                 Yes             JS library for color picker with not defined list of colors
+jQuery Layout          1.3.0rc30.74  GPL and MIT License         Yes             JS library plugin Layout (RC-29.15)
+jQuery Mobile          1.3.0         GPL and MIT License         Yes             JS library for smartphone (not used)
 jQuery TableDnD        0.6           GPL and MIT License         Yes             JS library plugin TableDnD (to reorder table rows)
 jQuery Timepicker      1.1.0         GPL and MIT License         Yes             JS library Timepicker addon for Datepicker
-jsGanttImproved        1.7.5.4       BSD License                 Yes             JS library (to build Gantt reports)
-JsTimezoneDetect       1.0.6         MIT License                 Yes             JS library to detect user timezone
-SwaggerUI			   2.0.24		 GPL-2+                      Yes             JS library to offer the REST API explorer
-
-Image libraries:
-Octicons               8.1           MIT                         Yes
-
-Font libraries:
-Fontawesome            5.13          Font Awesome Free licence   Yes
-
+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)
 
 For licenses compatibility informations:
-https://www.gnu.org/licenses/licenses.en.html
+http://www.fsf.org/licensing/licenses/index_html
+
+
+Copyright
+---------
+
+Copyright (C) 2015
+- Marcos García <marcosgdf@gmail.com>
+
+Copyright (C) 2014
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
+- Jean-François Ferry <jfefe@aternatik.fr>
+- Marcos García <marcosgdf@gmail.com>
+- Philippe Grand <philippe.grand@atoo-net.com>
+- Florian Henry <florian.henry@open-concept.pro>
+- Regis Houssin <regis.houssin@capnetworks.com>
+- Maxime Kohlhaas <mko@atm-consulting.fr>
+- Juanjo Menent <jmenent@2byte.es>
+- Alexandre Spangaro <alexandre.spangaro@gmail.com>
+
+Copyright (C) 2013
+- Christophe Battarel <christophe.battarel@altairis.fr>
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Jean-François Ferry <jfefe@aternatik.fr>
+- Marcos García <marcosgdf@gmail.com>
+- Philippe Grand <philippe.grand@atoo-net.com>
+- Florian Henry <florian.henry@open-concept.pro>
+- Regis Houssin <regis.houssin@capnetworks.com>
+- Maxime Kohlhaas <mko@atm-consulting.fr>
+- Juanjo Menent <jmenent@2byte.es>
+- Adolfo Segura <adolfo.segura@gmail.com>
+- Alexandre Spangaro <alexandre.spangaro@gmail.com>
+
+Copyright (C) 2012
+- Christophe Battarel <christophe.battarel@altairis.fr>
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Jean-François Ferry <jfefe@aternatik.fr>
+- Marcos García <marcosgdf@gmail.com>
+- Philippe Grand <philippe.grand@atoo-net.com>
+- Jean Heimburger <jean@tiaris.info>
+- Florian Henry <florian.henry@open-concept.pro>
+- Regis Houssin <regis.houssin@capnetworks.com>
+- Maxime Kohlhaas <mko@atm-consulting.fr>
+- Juanjo Menent <jmenent@2byte.es>
+- Nicolas Péré <nicolas@amarok2.net>
+- Alexandre Spangaro <alexandre.spangaro@gmail.com>
+
+Copyright (C) 2011
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Regis Houssin <regis.houssin@capnetworks.com>
+- Juanjo Menent <jmenent@2byte.es>
+- Philippe Grand <philippe.grand@atoo-net.com>
+- Jean Heimburger <jean@tiaris.info>
+
+Copyright (C) 2010
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Regis Houssin <regis.houssin@capnetworks.com>
+- Juanjo Menent <jmenent@2byte.es>
+- r2gnl
+- meos
+
+Copyright (C) 2009
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Regis Houssin <regis.houssin@capnetworks.com>
+- Juanjo Menent <jmenent@2byte.es>
+
+Copyright (C) 2008
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Regis Houssin <regis.houssin@capnetworks.com>
+- Rodolphe Quiedeville <rodolphe@quiedeville.org>
+- Jeremie Ollivier <jeremie.o@laposte.net>
+
+Copyright (C) 2007
+- Rodolphe Quiedeville <rodolphe@quiedeville.org>
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Regis Houssin <regis.houssin@capnetworks.com>
+- Auguria SARL <info@auguria.org>
+- Jean Heimburger <jean@tiaris.info>
+- Jeremie Ollivier <jeremie.o@laposte.net>
+
+Copyright (C) 2006
+- Auguria SARL <info@auguria.org>
+- Marc Barilley/Ocebo <marc@ocebo.com>
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Rodolphe Quiedeville <rodolphe@quiedeville.org>
+- Regis Houssin <regis.houssin@capnetworks.com>
+- Andre Cianfarani <acianfa@free.fr>
+- Yannick Warnier <ywarnier@beeznest.org>
+- Jean Heimburger <jean@tiaris.info>
+
+Copyright (C) 2005
+- Brice Davoleau <brice.davoleau@gmail.com>
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Benoit Mortier <benoit.mortier@opensides.be>
+- Rodolphe Quiedeville <rodolphe@quiedeville.org>
+- Eric Seigne <erics@rycks.com>
+- Matthieu Valleton <mv@seeschloss.org>
+- Regis Houssin <regis.houssin@capnetworks.com>
+
+Copyright (C) 2004
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Rodolphe Quiedeville <rodolphe@quiedeville.org>
+- Eric Seigne <erics@rycks.com>
+- Benoit Mortier <benoit.mortier@opensides.be>
+- Christophe Combelles <ccomb@free.fr>
+- Sebastien Di Cintio <sdicintio@ressource-toi.org>
+
+Copyright (C) 2003
+- Jean-Louis Bergamo <jlb@j1b.org>
+- Xavier Dutoit <doli@sydesy.com>
+- Rodolphe Quiedeville <rodolphe@quiedeville.org>
+- Emmanuel Raviart <eraviart@entrouvert.com>
+- Eric Seigne <erics@rycks.com>
+
+Copyright (C) 2002
+- Jean-Louis Bergamo <jlb@j1b.org>
+- Rodolphe Quiedeville <rodolphe@quiedeville.org>
+
+Copyright (C) 2001
+- Rodolphe Quiedeville <rodolphe@quiedeville.org>
+
+
 
 
-Copyright / Authors
--------------------
 
-See page https://github.com/Dolibarr/dolibarr/graphs/contributors

README-FR.md

@@ -1,176 +1,138 @@
 # DOLIBARR ERP & CRM
 
-![Downloads per day](https://img.shields.io/sourceforge/dw/dolibarr.svg)
-![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg)
-
 Dolibarr ERP & CRM est un logiciel moderne pour gérer votre activité (société, association, auto-entrepreneurs, artisans). 
 Il est simple d'utilisation et modulaire, vous permettant de n'activez que les fonctions dont vous avez besoin (contacts, fournisseurs, factures, commandes, stocks, agenda, ...).
  
-![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_1920x1080.jpg)
+![ScreenShot](http://www.dolibarr.org/images/dolibarr_screenshot1_640x480.png)
+
+
 
 ## LICENCE
 
 Dolibarr est distribué sous les termes de la licence GNU General Public License v3+ ou supérieure.
 
+
+
 ## INSTALLER DOLIBARR
 
-### Configuration simple
+Si vous n'avez pas de connaissances techniques, et que vous recherchez
+un programme d'installation qui install Dolibarr ERP/CRM en quelques clics,
+vous devez vous réorienter vers DoliWamp (la version tout-en-un
+de Dolibarr pour Windows), DoliDeb (la version tout-en-un pour Debian ou
+Ubuntu) ou DoliRpm (la version tout-en-un de Dolibarr pour Fedora, Redhat,
+OpenSuse, Mandriva ou Mageia).
 
-Si vous avez peu de compétences techniques et que vous souhaitez installer Dolibarr ERP/CRM en quelques clics, vous pouvez utiliser l'une des versions pré-packagées avec les prérequis:
+Vous pouvez les télécharger depuis la rubrique *download* du portail officiel: 
+http://www.dolibarr.org/
 
-- DoliWamp pour Windows
-- DoliDeb pour Debian ou Ubuntu
-- DoliRpm pour Redhat, Fedora, OpenSuse, Mandriva ou Mageia
+Si vous avez déjà installé un serveur Web avec PHP et une base de donnée (Mysql),
+vous pouvez installer Dolibarr avec cette version de la manière suivante:
 
-Les packages peuvent être téléchargés à partir de [site web officiel](https://www.dolibarr.org/).
+- Copier le répertoire "dolibarr" et son contenu dans la racine de votre serveur
+  web, ou bien copier le répertoire sur le serveur et configurer ce serveur pour
+  utiliser "dolibarr/htdocs" comme racine d'un nouveau virtual host (ce second 
+  choix requiert des compétences et habilitations en administration du serveur
+  web).
   
-### Configuration avancée
-
-Vous pouvez aussi utiliser un serveur Web et une base de données prise en charge (MariaDB, MySQL ou PostgreSQL) pour installer la version standard.
-
-- Décompressez l'archive .zip téléchargée pour copier le répertoire "dolibarr/htdocs" et tous ses fichiers à la racine du serveur Web ou récupérez-les directement à partir de GitHub (recommandé si vous connaissez git):
-
-  `git clone https://github.com/dolibarr/dolibarr -b x.y`   (où x.y est la version principale comme 3.6, 9.0, ...)
-
-- Configurez votre serveur Web pour qu'il utilise "*dolibarr/htdocs*" en tant que racine si votre serveur Web ne possède pas déjà de répertoire défini vers lequel pointer.
-
-- Créez un fichier `htdocs/conf/conf.php` vide et définissez les autorisations d'*écrire* pour l'utilisateur de votre serveur Web (l'autorisation *écrire* sera supprimée une fois l'installation terminée)
-
-- Depuis votre navigateur, allez à la page "install/" de dolibarr
-
-  L’URL dépendra de la façon dont votre configuration Web a été configurée pour pointer vers votre installation de dolibarr. Cela peut ressembler à:
-
-  `http://localhost/dolibarr/htdocs/install/`
+- Créer un fichier vide "htdocs/conf/conf.php" et attribuer les permissions
+  en lecture et écriture pour le user du serveur web (les permissions en 
+  écriture seront supprimées une fois l'installation terminée).
 
+- Depuis votre navigateur, appeler la page "install/" de dolibarr. L'url dépend 
+  du choix fait à la première etape:
+   http://localhost/dolibarr/htdocs/install/
   ou
+   http://yourdolibarrvirtualhost/install/
    
-  `http://localhost/dolibarr/install/`
+- Suivez les instructions fournies par l'installeur...
 
-  ou
 
-  `http://yourdolibarrvirtualhost/install/`
-
-- Suivez les instructions de l'installateur
 
 ## METTRE A JOUR DOLIBARR
 
-Pour mettre à jour Dolibarr depuis une vieille version vers celle ci:
-
-- Ecrasez les vieux fichiers dans le vieux répertoire 'dolibarr' par les fichiers
+Pour mettre a jour Dolibarr depuis une vieille version vers celle ci:
+- Ecraser les vieux fichiers dans le vieux repertoire 'dolibarr' par les fichiers
   fournis dans ce nouveau package.
   
-- Au prochain accès, Dolibarr proposera la page de "mise à jour" des données (si nécessaire).
-  Si un fichier install.lock existe pour verrouiller le processus de mise à jour, il sera demandé de le supprimer manuellement (vous devriez trouver le fichier install.lock dans le répertoire utilisé pour stocker les documents générés ou transférés sur le serveur. Dans la plupart des cas, c'est le répertoire appelé "documents")
+- Si vous venez d'une version x.y.z vers x.y.w (seul le 3eme chiffre varie),
+  il n'y a pas besoin de migration de données.
+  
+- Si vous venez d'une beta ou d'un version x.y.z vers une autre ou les numeros x
+  ou y varient, vous devez appelez la page "install/" de migration dans votre 
+  navigateur (ceci doit se faire automatiquement au premier accès de l'application).
+  Ce sera une URL du genre:
+   http://localhost/dolibarr/htdocs/install/index.php
+  ou
+   http://yourdolibarrhost/install/index.php
+
+  Ensuite, choisir l'option de "mise a jour" en rapport avec votre cas.
+  Note: Le processus de migration peut etre lance plusieurs fois sans risque.
   
-*Note: Le processus de migration peut être lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/*
 
 ## CE QUI EST NOUVEAU
 
 Voir fichier ChangeLog.
 
+
+
 ## CE QUE DOLIBARR PEUT FAIRE
 
-### Modules principaux (tous optionnels)
-
+Modules principaux:
 - Annuaires des prospects et/ou client et/ou fournisseurs
 - Gestion de catalogue de produits et services
-- Gestion des devis, propositions commerciales
-- Gestion des commandes
-- Gestion des factures clients/fournisseurs et paiements
-- Gestion des virements bancaires SEPA
-- Gestion des comptes bancaires
-- Calendrier/Agenda partagé (avec export ical, vcal)
-- 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 de stock
+- Gestion des comptes bancaires
+- Agenda partagé
+- Gestion des commandes
+- Gestion des devis, propositions commerciales
+- Gestion des factures clients et fournisseurs
+- Gestion de contrats de services
+- Gestion des paiements
+- Gestion des virements bancaires
 - Gestion des expéditions
-- Gestion des demandes de congès
-- Gestion des notes de frais
 - 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
-- Support des codes barres
-- Calcul des marges
 - Connectivité LDAP
-- Intégratn de ClickToDial
-- Intégration RSS
-- Intégation Skype
-- Intégration de système de paiements (Paypal, Stripe, Paybox...)
-- …
+- 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
-
-- Multi-langue.
-- Multi-utilisateurs avec différents niveaux de permissions par module.
-- Multi-devise.
-- Peux être multi-société par ajout du module externe multi-société.
-- Plusieurs thèmes visuels.
+Divers:
+- Application multi-utilisateurs avec différents niveaux de permissions par module.
+- Plusieurs gestionnaires de menus (possibilité de différencier les menus pour les utilisateurs internes ou externes comme les clients ou fournisseurs).
 - Application simple à utiliser.
-- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur https://wiki.dolibarr.org/index.php/Prérequis).
-- Compatible avec toutes les offres Cloud du marché respectant les prérequis de base de données et PHP.
-- APIs.
-- Génération PDF et ODT des éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
-- Code simple et facilement personnalisable (pas de framework lourd; mécanisme de hook et triggers).
-- Support natif de nombreuses fonctions spécifiques aux pays comme:
-  - La tax espagnole TE et ISPF
-  - Gestion de la TVA NPR (non perçue récupérable - pour les utilisateurs français des DOM-TOM)
-  - La loi française Finance 2016 et logiciels de caisse
-  - La double taxe canadienne
-  - Le timbre fiscal tunisien
-  - Numérotation de facture de l'argentines (avec type A,B,C...)
-  - Compatible avec vos processus RGPD
-  - ...
-- …
+- 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.
 
-### Extension
 
-Dolibarr peut aussi être étendu à volonté avec l'ajout de module/applications externes développées par des développeus tiers, disponible sur [DoliStore](https://www.dolistore.com).
-
-## CE QUE DOLIBARR NE PEUT PAS (ENCORE) FAIRE
-
-Voici un liste de fonctionnalités pas encore gérées par Dolibarr:
+## 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).
+- 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épendances entre elle.
-- Dolibarr n'embarque pas de Webmail intégré nativement.
+- 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). 
 
-## DOCUMENTATION
 
-La documentation utilisateur, développeur et traducteur est disponible sous forme de ressources de la communauté via le site [Wiki](https://wiki.dolibarr.org).
+## RESEAUX SOCIAUX
 
-## CONTRIBUER
+Suivez le projet Dolibarr project sur
 
-Ce projet existe grâce à ses nombreux contributeurs [[Contribuer](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)].
+Facebook: <https://www.facebook.com/dolibarr.fr>
 
-<a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>
+Google+: <https://plus.google.com/+DolibarrFrance>
 
-## CREDITS
-
-Dolibarr est le résultat du travail de nombreux contributeurs depuis des années et utilise des librairies d'autres contributeurs.
-
-Voir le fichier [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT)
-
-## ACTUALITES ET RESEAUX SOCIAUX
-
-Suivez le projet Dolibarr project sur les réseaux francophones
-
-- [Facebook](https://www.facebook.com/dolibarr.fr)
-- [Twitter](https://www.twitter.com/dolibarr_france)
-
-ou sur les réseaux anglophones
-
-- [Facebook](https://www.facebook.com/dolibarr)
-- [Twitter](https://www.twitter.com/dolibarr)
-- [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
-- [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
-- [GitHub](https://github.com/Dolibarr/dolibarr)
+Twitter: <http://www.twitter.com/dolibarr_france>

README.md

@@ -1,201 +1,151 @@
 # DOLIBARR ERP & CRM
 
-![Downloads per day](https://img.shields.io/sourceforge/dw/dolibarr.svg)
-![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg)
+Dolibarr ERP & CRM is a modern software to manage your company or foundation activity (contacts, suppliers, invoices, orders, stocks, agenda, ...).It's an opensource software (wrote with PHP language) designed for small and medium companies, foundation and freelances. You can freely install, use and distribute it as a standalone application or as a web application to use it from every internet access and media.
 
-Dolibarr ERP & CRM is a modern software package to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
+![ScreenShot](http://www.dolibarr.org/images/dolibarr_screenshot1_640x400.png)
 
-It's an Open Source Software (written in PHP language) designed for small, medium or large companies, foundations and freelancers.
-
-You can freely use, study, modify or distribute it according to its Free Software licence.
-
-You can use it as a standalone application or as a web application to be able to access it from the Internet or a LAN.
-
-![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_1920x1080.jpg)
 
 ## LICENSE
 
 Dolibarr is released under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version (GPL-3+).
 
-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](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) for a full list.
 
-## INSTALLING
+## INSTALL
 
-### Simple setup
+If you have no technical knowledge, and you are looking for an autoinstaller to install Dolibarr ERP/CRM in few clicks, you must download DoliWamp (the all-in-one package of Dolibarr for Windows), DoliDeb (the all-in-one package of Dolibarr for Debian or Ubuntu) or DoliRpm (the all-in-one package of Dolibarr for Fedora, Redhat, Opensuse, Mandriva or Mageia).
 
-If you have low technical skills and you're looking to install Dolibarr ERP/CRM in just a few clicks, you can use one of the packaged versions:
+You can download this from the download area of [Official website] (<http://www.dolibarr.org/>)
 
-- [DoliWamp for Windows](https://wiki.dolibarr.org/index.php/Dolibarr_for_Windows_(DoliWamp)
-- [DoliDeb for Debian](https://wiki.dolibarr.org/index.php/Dolibarr_for_Ubuntu_or_Debian
-- DoliRpm for Redhat, Fedora, OpenSuse, Mandriva or Mageia
+If you already have installed a Web server and a Mysql database, you can install the standard version like this:
 
-Releases can be downloaded from [official website](https://www.dolibarr.org/).
+- Uncompress the downloaded archive.
 
-### Advanced setup
+- Copy directory "dolibarr" and all its files inside your web server root, or copy directory anywhere and set up your web server to use "dolibarr/htdocs" as root for a new web server virtual host (second choice need to be server administrator).
   
-You can use a Web server and a supported database (MariaDB, MySQL or PostgreSQL) to install the standard version.
+- Create an empty file "htdocs/conf/conf.php" and set permissions for your web server user (write permissions will be removed once install is finished).
   
-- Check that your installed PHP version is supported [see PHP support](https://wiki.dolibarr.org/index.php/Versions).
+- From your browser, call the dolibarr "install/" page.
 
-- Uncompress the downloaded .zip archive to copy the "dolibarr/htdocs" directory and all its files inside your web server root or get the files directly from GitHub (recommanded if you known git):
-
-  `git clone https://github.com/dolibarr/dolibarr -b x.y`     (where x.y is main version like 3.6, 9.0, ...)
-
-- Set up your web server to use "*dolibarr/htdocs*" as root if your web server does not have an already defined directory to point to.
-
-- Create an empty `htdocs/conf/conf.php` file and set *write* permissions for your web server user (*write* permission will be removed once install is finished)
-
-- From your browser, go to the dolibarr "install/" page
-
-  The URL will depends on how you web setup was setup to point to your dolibarr installation. It may looks like:
-
-  `http://localhost/dolibarr/htdocs/install/`
+Url depends on choice made on first step:
 
+	http://localhost/dolibarr/htdocs/install/
 or
 
-  `http://localhost/dolibarr/install/`
-
+	http://localhost/dolibarr/install/
 or
 
-  `http://yourdolibarrvirtualhost/install/`
+	http://yourdolibarrvirtualhost/install/
    
-- Follow the installer instructions
-
-### Saas/Cloud setup
-
-If you don't have time to install it yourself, you can try some commercial 'ready to use' Cloud offers (See https://saas.dolibarr.org). However, this third solution is not free.
+- Follow instructions provided by installer...
 
 
-## UPGRADING
 
-- At first make a backup of your Dolibarr files & than see https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr
-- Check that your installed PHP version is supported by the new version [see PHP support](./doc/phpmatrix.md).
-- Overwrite all old files from 'dolibarr' directory with files provided into the new version's package.
-- At first next access, Dolibarr will redirect your to the "install/" page to follow the upgrade process.
-  If an `install.lock` file exists to lock any other upgrade process, the application will ask you to remove the file manually (you should find the `install.lock` file into the directory used to store generated and uploaded documents, in most cases, it is the directory called "*documents*").
+## UPGRADE
+
+To upgrade Dolibarr from an old version to this one:
+
+- Overwrite all old files inside old 'dolibarr' directory by files provided into new version package.
+  
+- If you came from version x.y.z to x.y.w (only third number differ), there is no need to run any migrate process.
+  
+- If you came from a beta version or from any version x.y.z to any other where x or y number differs, you must call the Dolibarr "install/" page in your browser (this should be done automatically at first dolibarr access).
+
+This URL should looks like:
+
+	http://localhost/dolibarr/htdocs/install/
+or
+
+	http://localhost/dolibarr/install/
+or
+
+	http://yourdolibarrhost/install/
+
+Then choose the "update" option according to your case.
+Note: Migrate process can be ran safely several times.
+  
 
-*Note: migration process can be safely done multiple times by calling the `/install/index.php` page*
 
 ## WHAT'S NEW
 
-See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
+See ChangeLog file found into package.
 
-## FEATURES
 
-### Main application/modules (all optional)
 
-- Customers, Prospects (Leads) and/or Suppliers directory + Contacts
-- Members management 
-- Products and/or Services catalog
-- Commercial proposals management
-- Customer & Supplier Orders management
-- Invoices and payment management
-- Shipping management
-- Warehouse/Stock management
-- Manufacturing Orders
-- Bank accounts management
-- Direct debit orders management (European SEPA)
-- Accounting management
-- Shared calendar/agenda (with ical and vcal export for third party tools integration)
-- Opportunities or Leads management
-- Projects & Tasks management
-- Contracts management
-- Interventions management
-- Employee's leave requests management
-- Expense reports
-- Timesheets
-- Electronic Document Management (EDM)
-- Foundations members management
-- Point of Sale (POS)
-- …
+## WHAT DOLIBARR CAN DO
 
-### Other application/modules
+### Main modules/features:
 
-- Bookmarks management
-- Donations management
-- Reporting
-- Surveys
-- Data export/import
-- Barcodes support
-- Margin calculations
-- LDAP connectivity
-- ClickToDial integration
-- Mass emailing
-- RSS integration
-- Skype integration
-- Payment platforms integration (PayPal, Stripe, Paybox...)
-- …
-
-### Other general features
-
-- Localization in most major languages
-- Multi-Users and groups with finely grained rights
-- Multi-currency
-- Multi-company by adding of an external module
-- Very user friendly and easy to use
-- customizable Dashboard
-- Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
-
-- APIs
-- An easy to understand, maintain and develop code (PHP with no heavy framework; trigger and hook architecture)
-- Support a lot of country specific features:
-  - Spanish Tax RE and ISPF
-  - French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)
-  - Canadian double taxes (federal/province) and other countries using cumulative VAT
-  - Tunisian tax stamp
-  - Argentina invoice numbering using A,B,C...
-  - Compatible with [European directives](http://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
-  - Compatible with European GDPR rules
-  - ...
+- Customers, Prospects or Suppliers directory.
+- Products and services catalog.
+- Bank accounts management.
+- Orders management.
+- Commercial proposals management.
+- Contracts management.
+- Invoices management.
+- Payments management.
+- Standing orders management.
+- Stock management.
+- Shipping management.
 - PDF or ODT generation for invoice, proposals, orders...
-- …
+- Agenda with ical,vcal export for third tools integration.
+- EDM (Electronic Document Management).
+- Foundations members management.
+- Employee's holidays management.
+- Mass Emailing.
+- Realize surveys.
+- Point of Sale.
 
-### System Environment / Requirements
+### Other modules:
 
-- Works with PHP 5.5+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite))
-- Compatible with all Cloud solutions that match MySQL, PHP or PostgreSQL prerequisites.
+- Bookmarks management.
+- Donations management.
+- Reporting.
+- Data export/import.
+- Third parties or products categories. 
+- LDAP connectivity.
+- ClickToDial integration.
+- RSS integration.
+- Can be extended with a lot of other external modules available onto DoliStore.com.
 
-### Extending
+### Miscellaneous:
 
-Dolibarr can be extended with a lot of other external application or modules from third party developers available at the [DoliStore](https://www.dolistore.com).
+- Multi-user, with several permissions levels for each feature.
+- Very user friendly and easy to use.
+- Highly customizable: Enable only modules you need, 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+, MySql 4.1 or PostgreSQL 8.1.
+- Require PHP and Mysql or Postgresql (See exatc versions on 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 system information (PHP with no heavy frameworks, trigger and hook architecture).
+- Support countries 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 (2006/112/CE ... 2010/45/UE) (http://europa.eu/legislation_summaries/taxation/l31057_en.htm)
+   ...
 
-## WHAT DOLIBARR CAN'T DO YET
 
-These are features that Dolibarr does **not** yet fully support:
+## WHAT DOLIBARR CAN'T DO YET (TODO LIST)
 
-- Tasks dependencies in projects
-- Payroll module
-- No native embedded Webmail
-- Dolibarr can't do coffee (yet)
+This is features that Dolibarr does not support completely yet:
 
-## DOCUMENTATION
+- No double party accountancy (only bank and treasury management).
+- Dolibarr manage one currency at once (mono-currency).
+- Dolibarr manage one master activity (mono-company). If you want to manage several companies or foundations, you must install several time the software (on same server or not). Another solution is to extend Dolibarr with the addon Module MultiCompany that allows to manage several companies in one Dolibarr instance (one database but with a logical isolation of datas).
+- Tasks on module project can't have dependencies between each other.
+- Dolibarr does not contains Payroll module.
+- Dolibarr does not include any Webmail.
+- Dolibarr can't do coffee (not yet).
 
-Administrator, user, developer and translator's documentations are available along with other community resources on the [Wiki](https://wiki.dolibarr.org).
 
-## CONTRIBUTING
+## SOCIAL NETWORKS
 
-This project exists thanks to all the people who contribute. [[Contribute](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)]
+Follow Dolibarr project on
 
-<a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>
+Facebook: <https://www.facebook.com/dolibarr>
 
-## CREDITS
+Google+: <https://plus.google.com/+DolibarrOrg>
 
-Dolibarr is the work of many contributors over the years and uses some fine libraries.
+Twitter: <http://www.twitter.com/dolibarr>
 
-See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) file.
-
-## NEWS AND SOCIAL NETWORKS
-
-Follow Dolibarr project on:
-
-- [Facebook](https://www.facebook.com/dolibarr)
-- [Twitter](https://www.twitter.com/dolibarr)
-- [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
-- [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
-- [GitHub](https://github.com/Dolibarr/dolibarr)
-
-### Sponsors
-
-Support this project by becoming a sponsor. Your logo will show up here. 🙏 [[Become a sponsor/backer](https://opencollective.com/dolibarr#backer)]

SECURITY.md

@@ -1,13 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-| Version  | Supported          |
-| -------- | ------------------ |
-| <= 8.0.* | :x: |
-| >= 9.0.* | :white_check_mark: |
-
-## Reporting a Vulnerability
-
-To report a vulnerability, please send an email to security@dolibarr.org
-In most cases, after fixing the security, we make an answer by email to say the issue has been fixed.

build/.gitignore

@@ -5,5 +5,6 @@
 /dolibarr-*.tgz
 /dolibarr-*.rpm
 /dolibarr-*.zip
+/dolibarr-*.tgz
 /*.exe
 /html

build/README

@@ -3,7 +3,8 @@ README (English)
 Building packages
 ##################################################
 
-All sub-directories of "build" directory contains files (setup or binary tools) required to build automatically Dolibarr packages.
+All sub-directories of "build" directory contains files required to build
+automatically Dolibarr packages.
 There are several tools:
 
 
@@ -15,19 +16,17 @@ Note: Prerequisites to build tgz, debian, rpm package
 > apt-get install tar dpkg dpatch p7zip-full rpm zip
 
 Note: Prerequisites to build autoexe DoliWamp package:
-> apt-get install wine q4wine
-> Launch "wine cmd" to check a drive Z: pointing to / exists.
 > Install InnoSetup
    For example by running isetup-5.3.9.exe (http://www.jrsoftware.org)
 > Install WampServer into "C:\Program Files\Wamp"
-   For example by running wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe (http://www.wampserver.com)
-> Install WampServer addon to have versions: Mysql5.0.45
+   For example by running wampserver2.2e-php5.4.3-httpd-2.4.2-mysql5.5.24-x64.exe (http://www.wampserver.com)
+> Install WampServer addon to have versions: Apache2.2.11, Mysql5.0.45, Php5.3.0
+   For example by running WampServer2-APACHE2211.exe (http://www.wampserver.com)
    For example by running WampServer2-MYSQL5045.exe (http://www.wampserver.com)
+   For example by running WampServer2-PHP530.exe (http://www.wampserver.com)
 > To build from Windows (running from makepack-dolibarr.pl script is however
   recommanded), open file build/exe/doliwamp.iss and click on button "Compile".
   The .exe file will be build into directory build.
-> Add path to ISCC into PATH windows var:
-  Launch wine cmd, then regedit and add entry int HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PATH
 
 - To build a theme package, launch the script
 > perl makepack-dolibarrtheme.pl
@@ -36,7 +35,7 @@ Note: Prerequisites to build autoexe DoliWamp package:
 > perl makepack-dolibarrmodule.pl
 
 - To build developper documentation, launch the script
-> perl dolibarr-doxygen-build.pl
+> perl dolybarr-doxygen-build.pl
 
 
 Note: 
@@ -45,12 +44,12 @@ Dolibarr working. It is here only to build Dolibarr packages, and those
 generated packages will not contains this "build" directory.
 
 
-You can find in "build", following sub-directories:
+We can find in "build", following sub-directories:
 
-* composer
-To test an upgrade of a lib.
+* aps:
+To build APS package.
 
-* debian
+* debian:
 To build Debian package.
 
 * dmg:

build/README-FR

@@ -0,0 +1,78 @@
+README (French)
+################################
+Building packages
+################################
+
+Les sous repertoires du repertoire "build" contiennent tous les fichiers
+requis pour packager Dolibarr de maniere automatisee.
+On trouve plusieurs outils:
+
+- Pour construire un package Dolibarr complet, il suffit de
+> Editer la version dans le fichier makepack-dolibarr.pl  
+> Lancer la commande perl makepack-dolibarr.pl
+
+- Pour construire un package d'une traduction, il suffit de lancer le script
+> perl makepack-dolibarrlang.pl
+
+- Pour construire un package d'un theme, il suffit de lancer le script
+> perl makepack-dolibarrtheme.pl
+
+- Pour construire un package d'un module, il suffit de lancer le script
+> perl makepack-dolibarrmodule.pl
+
+- Pour construire un package DoliWamp autoexe:
+> Installer InnoSetup (http://www.jrsoftware.org)
+> Installer WampServer dans "C:\Program Files\Wamp" (http://www.wampserver.com)
+> Installer les addon WampServer afin d'y mettre les versions:
+   Apache2.2.6, Mysql5.0.45, Php5.2.5
+> Modifier dans le fichier build/exe/doliwamp.iss la variable SourceDir
+  afin d'y mettre le repository Dolibarr.
+> Modifier AppVerName et OutputBaseFilename.
+> Lancer innosetup, ouvrir le fichier build/exe/doliwamp.iss et cliquer sur
+  le bouton "Compile". Le fichier .exe sera fabrique dans le repertoire build.
+
+- Pour generer la documentation developpeur, lancer le script
+> perl dolybarr-doxygen-build.pl
+
+
+Note: 
+
+Le repertoire build et tout ce qu'il contient n'est absolument pas requis
+pour faire fonctionner Dolibarr. Ils ne servent qu'a la generation des
+packages. Certains packages, une fois construit, n'incluent par le repertoire
+"build".
+
+On trouve dans le repertoire "build", les sous-repertoires utilises par
+l'outil makepack-dolibarr.pl:
+
+* deb:
+Fichier de config pour construire un package Debian.
+
+* rpm:
+Fichier de config pour construire un package Redhat ou Mandrake.
+
+* tgz:
+Fichier de config pour construire un package tgz.
+
+* exe:
+Fichier de config pour construire un package exe pour Windows des sources 
+ou pour construire l'assistant d'installation complet DoliWamp.
+
+* zip:
+Fichier de config pour construire un package zip.
+
+* live:
+Fichier pour fabriquer un live CD de demo de Dolibarr.
+
+* patch:
+Fichier exemple de generation de fichier patch pour diffusion d'une
+modification de Dolibarr.
+
+* doap:
+Fichier descriptif DOAP pour promouvoir/decrire la version de Dolibarr.
+
+* pad:
+Fichier descriptif PAD pour promouvoir/decrire la version de Dolibarr.
+
+* dmg:
+Fichier de config pour construire un package dmg DoliMamp pour Mac OS X

build/aps/APP-META-1.1.xml

@@ -0,0 +1,123 @@
+<!-- Application namespaces and APS version (step 9) -->
+<application xmlns="http://apstandard.com/ns/1" version="1.1">
+	<!-- Application common properties (step 9) -->
+	<name>Dolibarr ERP-CRM</name>
+	<version>__VERSION__</version>
+	<release>__RELEASE__</release>
+	<homepage>http://www.dolibarr.org/</homepage>
+	<vendor>
+		<name>Dolibarr</name>
+		<homepage>http://www.dolibarr.org/</homepage>
+		<icon path="images/appicon_64.png" />
+	</vendor>
+	<packager>
+		<name>Laurent Destailleur</name>
+		<homepage>http://www.nltechno.com</homepage>
+		<uri>uuid:e743ee30-9fe8-11e0-a32e-0025115d642c</uri>
+	</packager>
+	<presentation>
+		<summary>Dolibarr ERP-CRM, the easy to use software to manage small or medium companies, freelancers or foundations</summary>
+		<description>
+Dolibarr is a free modular software (you see only
+features you need) to manage small and medium companies, freelancers
+or foundations.
+This OpenSource software is designed to provide all features you need to
+manage information on many aspects of your business
+into an intuitive and user-friendly graphical interface
+It's an OpenSource software you can install on a web server or as a
+standalone software. Dolibarr is designed to provide simplicity to end-user.
+        </description>
+		<icon path="images/appicon_64.png" />
+		<screenshot path="images/dolibarr_screenshot1_640x480.png">
+			<description>Screenshot 1</description>
+		</screenshot>
+		<changelog>
+			<version version="3.1.0" release="0">
+				<entry>See http://www.dolibarr.org/files/ChangeLog</entry>
+			</version>
+		</changelog>
+		<categories>
+			<category>Back office/Billing</category>
+			<category>Back office/Accounting and Financial</category>
+			<category>Back office/Customer Relationship Management</category>
+			<category>Back office/Enterprise Resource Planning</category>
+		</categories>
+		<languages>
+			<language>en</language>
+			<language>fr</language>
+			<language>es</language>
+			<language>de</language>
+			<language>pt</language>
+		</languages>
+	</presentation>
+	<upgrade match="/application/version = '3.0'" />
+	<!-- Application service (step 4) -->
+	<service id="dolibarr">
+		<!-- Service presentation properties (step 7) -->
+		<license must-accept="false">
+			<text>
+				<name>GPL-3.0+</name>
+				<file>COPYING</file>
+			</text>
+		</license>
+		<presentation>
+			<name>Dolibarr instance</name>
+            <summary>Dolibarr services</summary>
+			<entry-points>
+				<entry class="frontpage" dst="/">
+					<label>Application entry point</label>
+				</entry>
+			</entry-points>
+		</presentation>
+		<!-- Service settings (step 7) -->
+		<settings>
+		      <!-- 
+			<group>
+				<name>Administrator's preferences</name>
+				<setting id="admin_name" type="string" default-value="admin"
+					min-length="1" max-length="32" regex="^[a-zA-Z][0-9a-zA-Z_\-]*">
+					<name>Administrator's login</name>
+					<error-message>
+Please make sure the text you entered starts with a	letter and continues with either numbers, letters, underscores or hyphens.
+                    </error-message>
+				</setting>
+				<setting id="admin_password" type="password" min-length="1">
+					<name>Password</name>
+				</setting>
+			</group>
+			-->
+		</settings>
+		<!-- Service used technologies (step 6) -->
+		<requirements xmlns:php="http://apstandard.com/ns/1/php"
+			xmlns:db="http://apstandard.com/ns/1/db">
+			<php:version min="4.2.0" />
+			<php:extension>mysql</php:extension>
+			<php:extension>mbstring</php:extension>
+			<php:safe-mode>false</php:safe-mode>
+			<db:db>
+				<db:id>main</db:id>
+				<db:default-name>dolibarr</db:default-name>
+				<db:can-use-tables-prefix>false</db:can-use-tables-prefix>
+				<db:server-type>mysql</db:server-type>
+				<db:server-min-version>4.3.1</db:server-min-version>
+			</db:db>
+		</requirements>
+		<!-- Content delivery settings (step 8) -->
+		<provision>
+			<url-mapping>
+				<default-prefix>dolibarr</default-prefix>
+				<installed-size>35000000</installed-size>
+				<mapping url="/" path="htdocs" xmlns:php="http://apstandard.com/ns/1/php">
+					<php:handler>
+						<php:extension>php</php:extension>
+					</php:handler>
+				</mapping>
+			</url-mapping>
+			<!-- Service configuration script declaration (step 10) -->
+            <configuration-script name="configure.php">
+                <configuration-script-language>php</configuration-script-language>
+                <status-control/>
+			</configuration-script>
+		</provision>
+	</service>
+</application>

build/aps/APP-META-1.2.xml

@@ -0,0 +1,121 @@
+<!-- Application namespaces and APS version (step 9) -->
+<application xmlns="http://apstandard.com/ns/1" version="1.2">
+	<!-- Application common properties (step 9) -->
+	<id>dolibarr</id>
+	<name>Dolibarr</name>
+	<version>__VERSION__</version>
+	<release>__RELEASE__</release>
+	<homepage>http://www.dolibarr.org/</homepage>
+	<vendor>
+		<name>Dolibarr</name>
+		<homepage>http://www.dolibarr.org/</homepage>
+		<icon path="images/appicon_64.png" />
+	</vendor>
+	<packager>
+        <name>Laurent Destailleur</name>
+        <homepage>http://www.nltechno.com</homepage>
+		<uri>uuid:e743ee30-9fe8-11e0-a32e-0025115d642c</uri>
+	</packager>
+	<presentation>
+		<summary>Dolibarr ERP - CRM, the easy to use software to manage small or medium companies, freelancers or foundations</summary>
+		<description>
+Dolibarr is a free modular software (you see only
+features you need) to manage small and medium companies, freelancers
+or foundations.
+This OpenSource software is designed to provide all features you need to
+manage information on many aspects of your business
+into an intuitive and user-friendly graphical interface
+It's an OpenSource software you can install on a web server or as a
+standalone software. Dolibarr is designed to provide simplicity to end-user.
+</description>
+		<icon path="images/appicon_64.png" />
+		<screenshot path="images/dolibarr_screenshot1_640x480.png">
+			<description>Screenshot 1</description>
+		</screenshot>
+		<changelog>
+			<version version="3.1.0" release="0">
+				<entry>See http://www.dolibarr.org/files/ChangeLog</entry>
+			</version>
+		</changelog>
+		<categories>
+			<category>Back office/Billing</category>
+			<category>Back office/Accounting and Financial</category>
+			<category>Back office/Customer Relationship Management</category>
+			<category>Back office/Enterprise Resource Planning</category>
+		</categories>
+		<languages>
+			<language>en</language>
+			<language>fr</language>
+			<language>es</language>
+			<language>de</language>
+			<language>pt</language>
+		</languages>
+	</presentation>
+	<upgrade match="/application/version = '3.0'" />
+	<!-- Application service (step 4) -->
+	<service id="dolibarr">
+		<!-- Service presentation properties (step 7) -->
+		<license must-accept="false">
+			<text xml:lang="">
+				<name>GPL-3.0+</name>
+				<file>COPYING</file>
+			</text>
+		</license>
+		<presentation>
+			<name>Dolibarr instance</name>
+			<entry-points>
+				<entry class="frontpage" dst="/">
+					<label>Application entry point</label>
+				</entry>
+			</entry-points>
+		</presentation>
+		<!-- Service settings (step 7) -->
+		<settings>
+			<group>
+				<name>Administrator's preferences</name>
+				<setting id="admin_name" type="string" default-value="admin"
+					min-length="1" max-length="32" regex="^[a-zA-Z][0-9a-zA-Z_\-]*">
+					<name>Administrator's login</name>
+					<error-message>
+Please make sure the text you entered starts with a letter and continues with either numbers, letters, underscores or hyphens.
+                    </error-message>
+				</setting>
+				<setting id="admin_password" type="password" min-length="1">
+					<name>Password</name>
+				</setting>
+			</group>
+		</settings>
+		<!-- Service used technologies (step 6) -->
+		<requirements xmlns:php="http://apstandard.com/ns/1/php"
+			xmlns:db="http://apstandard.com/ns/1/db">
+			<php:version min="4.2.0" />
+			<php:extension>mysql</php:extension>
+			<php:extension>mbstring</php:extension>
+			<php:safe-mode>false</php:safe-mode>
+			<db:db>
+				<db:id>main</db:id>
+				<db:default-name>dolibarr</db:default-name>
+				<db:can-use-tables-prefix>false</db:can-use-tables-prefix>
+				<db:server-type>mysql</db:server-type>
+				<db:server-min-version>4.3.1</db:server-min-version>
+			</db:db>
+		</requirements>
+		<!-- Content delivery settings (step 8) -->
+		<provision>
+			<url-mapping>
+				<default-prefix>dolibarr</default-prefix>
+				<installed-size>35000000</installed-size>
+				<mapping url="/" path="htdocs" xmlns:php="http://apstandard.com/ns/1/php">
+					<php:handler>
+						<php:extension>php</php:extension>
+					</php:handler>
+				</mapping>
+			</url-mapping>
+			<!-- Service configuration script declaration (step 10) -->
+			<configuration-script name="configure.php">
+				<script-language>php</script-language>
+				<status-control/>
+			</configuration-script>
+		</provision>
+	</service>
+</application>

build/aps/Limitations of APS Support in the Panel.html

@@ -0,0 +1,89 @@
+<html><head>
+<title> Limitations of APS Support in the Panel </title>
+<meta name="Keywords" content="">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="Limitations%20of%20APS%20Support%20in%20the%20Panel_fichiers/stylesheet.css">
+<link href="Limitations%20of%20APS%20Support%20in%20the%20Panel_fichiers/prettify.css" type="text/css" rel="stylesheet">
+<script type="text/javascript" src="Limitations%20of%20APS%20Support%20in%20the%20Panel_fichiers/prettify.js"></script>
+<script src="Limitations%20of%20APS%20Support%20in%20the%20Panel_fichiers/highlight.js"></script></head>
+
+<body onload="prettyPrint()" link="#0000A0" text="#000000" vlink="#FF0000" alink="#008000" bgcolor="#FFFFFF">
+<h1 class="heading1">Limitations of APS Support in the Panel</h1>
+<h2 class="heading2">About This Document</h2>
+<p class="bodytext">This document is addressed to independent software 
+vendors who plan to distribute web applications among the Panel users. 
+The aim of the document is to help vendors find out whether they can 
+package their applications to APS to make them available through the 
+Panel.</p>
+<p class="bodytext">The document does not contain information about 
+Application Packaging Standard itself or give application packaging 
+instructions. It focuses on how the Panel implements APS and what APS 
+packages are not supported by this implementation.</p>
+<p class="bodytext"></p>
+<h2 class="heading2">APS Support in the Panel</h2>
+<p class="bodytext"><em class="emphasis"><em class="emphasis">Application Packaging Standard</em></em> (<em class="emphasis">APS</em>)
+ is a set of rules that defines a web application packaging format. This
+ standard is designed to ease the integration of applications in a 
+service provider's infrastructure. It covers provisioning, management, 
+and integration of cloud-based services and applications.</p>
+<p class="bodytext">The Panel uses APS to offer third-party applications to hosting customers. These applications are presented in <em class="emphasis">APS catalog</em>, where the customers can buy or download them.</p>
+<p class="bodytext">Currently, the Panel does not support all aspects of
+ APS. Therefore, customers may have problems trying to install certain 
+applications. To find out whether your application is compatible with 
+the Panel, see section <strong class="specialbold"><strong class="specialbold">Plesk Panel Restrictions.</strong></strong></p>
+<p class="bodytext">You can find more information about APS at http://www.apsstandard.org/.</p>
+<p class="bodytext">APS specification and supporting documents are available at http://www.apsstandard.org/isv/documentation/.</p>
+<p class="bodytext"></p>
+<h2 class="heading2">Restrictions on Packages Processing</h2>
+<p class="bodytext">The current Panel version has restrictions on APS 
+applications processing. If an application requires performing 
+restricted actions, the Panel will not install it. Particularly, these 
+actions are the following:</p>
+<ul class="listbullet"><li class="listbullet">Sending e-mails or processing incoming mail.<p class="listcontinue">See <strong class="specialbold">Mail aspect</strong> of APS in <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">8.8. Mail </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.aspects.mail</p>
+</li><li class="listbullet">Changing the DNS resource records of an environment where the application works.<p class="listcontinue">See <strong class="specialbold">DNS aspect</strong> in <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">8.10. DNS Zone </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.aspects.dns</p>
+</li><li class="listbullet">Installing third-party dynamic libraries (*.dll, *.so).<p class="listcontinue">See<strong class="specialbold"> DLL aspect</strong> in <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">8.11. DLL Content Processing Method </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.aspects.dll</p>
+</li><li class="listbullet">Updating older version of application with 
+complex changes in application settings or deployment logic. According 
+to APS, such updates are called <em class="emphasis">upgrades. </em>For more information on the application updates, see the <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">5.1.15 Updates </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.metadata.common.update</li></ul><p class="bodytext">If
+ you need you application to perform these actions, consider other ways 
+of integration with the Panel: API RPC, modules or Panel Notifications.</p>
+<p class="bodytext">Also, the Panel does not support the following actions defined in the application package: </p>
+<ul class="listbullet"><li class="listbullet">Checking application settings for consistency via <strong class="specialbold">verification script. </strong>For more information on verification scripts, see the <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">5.3.3 Verification Script </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.metadata.provision.verification-script</li><li class="listbullet">Processing application resource usage reports defined by <strong class="specialbold">resource counters</strong> and passed by <strong class="specialbold">resource script</strong> . For more information on resource counters and resource scripts, see the <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">5.2.6. Resources</strong> at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.metadata.service.resources and <strong class="specialbold">5.3.3 Resources Script </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.metadata.provision.resource-script</li>
+
+<h1 class="heading1">Copyright Notice</h1>
+<p class="copyright">Parallels Holdings, Ltd.</p>
+<p class="copyright">c/o Parallels International GmbH</p>
+<p class="copyright">Vordergasse 59</p>
+<p class="copyright">CH-Schaffhausen</p>
+<p class="copyright">Switzerland</p>
+<p class="copyright">Phone:&nbsp;+41-526320-411</p>
+<p class="copyright">Fax: +41-52672-2010</p>
+<p class="copyright">&nbsp;</p>
+<p class="copyright">Copyright © 1999-2011 Parallels Holdings, Ltd. and its affiliates.&nbsp;All rights reserved.&nbsp;</p>
+<p class="copyright">&nbsp;</p>
+<p class="copyright">This product is protected by United States and 
+international copyright laws. The product's underlying technology, 
+patents, and trademarks are listed at 
+http://www.parallels.com/trademarks.&nbsp;</p>
+<p class="copyright">&nbsp;</p>
+<p class="copyright">Microsoft, Windows, Windows Server, Windows NT, Windows Vista, and MS-DOS are registered trademarks of Microsoft Corporation.</p>
+<p class="copyright">Linux is a registered trademark of Linus Torvalds.</p>
+<p class="copyright">Mac is a registered trademark of Apple, Inc.</p>
+<p class="copyright">All other marks and names mentioned herein may be trademarks of their respective owners.</p>
+
+
+
+<p class="bodytext">
+<a target="_blank" title="Send feedback through a web form" href="http://www.parallels.com/en/support/usersdoc/?problemSubject=Feedback+on+Help+Page+" onclick="var u = parent.BODY.location.href;
+u = u.replace(/.+\/([^/]+).htm$/,'$1');
+u+= '+of+the+'+parent.document.title.replace(/ /g,'+');
+
+this.href+=u;
+
+window.location.reload(false);">Please send us your feedback on this help page.</a></p>
+
+
+
+
+</ul></body></html>
+<!-- Edited by post-publisher -->

build/aps/Limitations of APS Support in the Panel_fichiers/highlight.js

@@ -0,0 +1,64 @@
+function last(href)
+{
+  var ret = href.split("/");
+  return ret[ret.length-1];
+}
+
+function StopProcess()
+{
+LeftFrame = parent.TOC.document.location.href;
+LeftFrame = last(LeftFrame);
+if (LeftFrame == "dhtml_search.htm") return 1
+else return 0;
+}
+
+
+
+function highlightTOC(str) {
+    
+	
+		
+		 
+	
+    if (StopProcess()) return;
+    try {
+		
+    str = str || parent.BODY.document.location.href;
+    uri = last(str);
+    list = parent.TOC.document.getElementsByTagName("a");
+    for(i=0; i<list.length; i++)
+    {
+      if (last(list[i].href) == uri)
+	{
+        list[i].style.backgroundColor = "#6697cc";
+        list[i].style.padding = "2px";
+        list[i].style.color = "#ffffff";
+		
+	} else {
+		list[i].style.backgroundColor = "#ffffff";
+        list[i].style.color = "#003380";
+	  }
+    }
+    } catch (e) {}
+}
+
+function FindCorrectTOCPage()
+{
+if (StopProcess()) return;
+//Updated on 30.04.2008
+list = parent.BODY.document.getElementsByTagName("a") || document.getElementsByTagName("a");
+    for(i=0; i<list.length; i++)
+    {
+      if (list[i].target == "TOC")
+	{
+
+		if (last(list[i].href) != last(parent.TOC.document.location.href))
+			{
+				parent.TOC.document.location.href = list[i].href;
+				return;
+			}
+	}
+    }
+
+
+}

build/aps/Limitations of APS Support in the Panel_fichiers/prettify.css

@@ -0,0 +1,60 @@
+/* Pretty printing styles. Used with prettify.js. */
+
+.str { color: #FF0000; }
+.vr { color: #0000FF; }
+.kwd { color: #000080; font-weight: bold}
+.com { color: #EA8110; }
+.typ { color: #606; }
+.lit { color: #066; }
+.pun { color: #660; }
+.pln { color: #000; }
+.tag { color: #008; }
+.atn { color: #606; }
+.atv { color: #080; }
+.dec { color: #606; }
+pre.preformatted { 
+
+	    display: block;
+        font-family: "Courier New", verdana, arial, helvetica, sans-serif;
+        font-style: normal;
+        font-variant: normal;
+        font-weight: normal;
+        font-size: 10pt;
+        color: #000000;
+        background-color: #f4f4f4;
+        word-spacing: normal;
+        letter-spacing: normal;
+        vertical-align: baseline;
+        text-decoration: none;
+        text-transform: none;
+        line-height: normal;
+        margin-top: 0pt;
+        margin-bottom: 0pt;
+        margin-left: 0pt;
+        margin-right: 6pt;
+        padding-top: 1pt;
+        padding-bottom: 1pt;
+        padding-left: 5pt;
+        padding-right: 5pt;
+        float: none;
+        clear: none;
+        text-align: left;
+        text-indent: 0cm;
+        width: auto;
+        height: auto;
+
+}
+
+@media print {
+  .vr { color: #f0f; }
+  .str { color: #060; }
+  .kwd { color: #006; font-weight: bold; }
+  .com { color: #600; font-style: italic; }
+  .typ { color: #404; font-weight: bold; }
+  .lit { color: #044; }
+  .pun { color: #440; }
+  .pln { color: #000; }
+  .tag { color: #006; font-weight: bold; }
+  .atn { color: #404; }
+  .atv { color: #060; }
+}

build/aps/README

@@ -0,0 +1,20 @@
+README (English)
+##################################################
+This directory is dedicated to APS package building
+##################################################
+
+Docs for APS format 1.1:
+http://www.apsstandard.org/r/doc/aps-format-1.1-packaging-guide/index.htm
+
+Docs for APS format 1.2 (need APP-LIST.xml):
+http://www.apsstandard.org/r/doc/aps-format-1.2-packaging-guide/index.htm
+
+
+To check an APS package on Debian:
+* Install libgdiplus with 
+apt-get install libgdiplus
+* Install apslint.exe (http://www.apsstandard.org/r/doc/aps-format-1.2-packaging-guide/57414.htm)
+tar -xvf xxxx.tgz 
+* Go into directory of apslint and run command
+mono ./apslint.exe '/media/DATA/Mes Developpements/dolibarr/build/dolibarr-3.1.0-dev.app.zip' 
+

build/aps/configure.php

@@ -0,0 +1,151 @@
+#!/usr/bin/php
+<?php
+/*-----------------------------------------------------
+ *
+ *----------------------------------------------------- */
+
+// This is list of predefined variables when script is ran
+// We have to set them manually to run script outside context.
+/*putenv('SETTINGS_admin_name=admin');
+putenv('SETTINGS_admin_password=admin-ad');
+putenv('BASE_URL_SCHEME=http');
+putenv('BASE_URL_HOST=localhost');
+putenv('BASE_URL_PORT=0');
+putenv('BASE_URL_PATH=/');
+//putenv('WEB___DIR=/var/wwww/dolibarr/htdocs');      // WEB___DIR is dir to htdocs
+putenv('WEB___DIR=../htdocs');      // WEB___DIR is dir to htdocs
+putenv('DB_main_NAME=dolibarr');
+putenv('DB_main_HOST=localhost');
+putenv('DB_main_PORT=3306');
+putenv('DB_main_LOGIN=root');
+putenv('DB_main_PASSWORD=root');
+*/
+
+// Check parameters
+if(count($_SERVER['argv']) < 2)
+{
+    print "Usage: configure.php (install | upgrade <version> | configure | remove)\n";
+    exit(1);
+}
+$command = $_SERVER['argv'][1]; //$command stores the argument with which the script was invoked.
+
+
+if($command == "install")
+{
+    $db_id = 'main';
+
+    $rootdir = getenv("WEB___DIR");
+    if ($rootdir != '/') $rootdir = preg_replace('/\/$/','',$rootdir);  // Remove last /
+    $datadir = $rootdir.'/dolibarr_documents';
+
+    //List of database-related variables that are passed to the configuration
+    //script. See the 6.3.1.1.1. Environment variables section of the
+    //Specification for details.
+    $db_address = getenv("DB_${db_id}_HOST");
+    $db_port = getenv("DB_${db_id}_PORT");
+    $dblogin = getenv("DB_${db_id}_LOGIN");
+    $dbpassword = getenv("DB_${db_id}_PASSWORD");
+    $dbname = getenv("DB_${db_id}_NAME");
+
+
+    //PHP functions for connecting to the mysql server and
+    //executing SQL queries.
+    //mysql_connect($dbaddress, $dblogin, $dbpassword);
+    //mysql_select_db($dbname);
+    /*
+     $sql_queries = file($query_file);
+     foreach ($sql_queries as $query) mysql_query($query);
+     */
+
+
+    //Other code to be executed on invoking configure with
+    //the install argument.
+
+    // Create empty config file
+    $file=$rootdir.'/conf/conf.php';
+    print "Create conf file ".$file."\n";
+    $fp = fopen($file, 'wb');
+    if ($fp)
+    {
+        fclose($fp);
+        chmod($file,0775);
+    }
+    else
+    {
+        print "configure.php install: Unable to write file $file.\n";
+        exit(1);
+    }
+
+    // Create empty directory that will be used by software to store uploaded documents
+    print "Create directory ".$datadir."\n";
+    @mkdir($datadir);
+    chmod($datadir,0775);
+
+    // Create install.forced.php into htdocs/install directory with value.
+    // This will set parameters of install for web installer wizard.
+    $file_source=$rootdir.'/../build/aps/install.forced.php.install';
+    $file=$rootdir.'/install/install.forced.php';
+    print "Create file ".$file.' from '.$file_source."\n";
+
+    $modify_hash=array(
+    'WEB___DIR'=>$rootdir,
+    'DB_'.$db_id.'_HOST'=>$db_address,
+    'DB_'.$db_id.'_PORT'=>$db_port,
+    'DB_'.$db_id.'_LOGIN'=>$dblogin,
+    'DB_'.$db_id.'_PASSWORD'=>$dbpassword,
+    'DB_'.$db_id.'_NAME'=>$dbname
+    );
+
+    $file_content = fread(fopen($file_source, 'r'), filesize($file_source));
+    foreach($modify_hash as $param => $val){
+        $file_content = str_replace($param, php_quote($val), $file_content);
+    }
+    $fp = fopen($file, 'wb');
+    if ($fp)
+    {
+        fputs($fp, $file_content);
+        fputs($fp, "\n");
+        fclose($fp);
+        chmod($file,0775);
+    }
+    else
+    {
+        print "configure.php install: Unable to write file $file.\n";
+        exit(2);
+    }
+
+    exit(0);
+}
+
+if($command == "remove")
+{
+    //Code to be executed on invoking configure with the remove argument
+    exit(0);
+}
+
+if($command == "upgrade")
+{
+    //Code to be executed on invoking configure with the upgrade argument
+    exit(0);
+}
+
+if($command == "configure")
+{
+    //Code to be executed on invoking configure with the configure argument
+    exit(0);
+}
+
+print "configure.php: Error: unknown command $command.\n";
+exit(1);
+
+
+
+// Content of file-util.php we need
+
+function php_quote($val)
+{
+    $res_val = str_replace("\\", "\\\\", $val);
+    $res_val = str_replace("'", "\\'", $res_val);
+    return $res_val;
+}
+

build/aps/install.forced.php.install

@@ -0,0 +1,23 @@
+<?php
+// File to force Dolibarr wizard installer choices.
+//
+// This file must be present into htdocs/install directory
+// during install process to be used.
+//
+//
+$force_install_noedit=1;
+$force_install_message='KeepDefaultValuesDeb';
+$force_install_main_data_root='WEB___DIR/dolibarr_documents';
+$force_install_type='mysqli';
+$force_install_dbserver='DB_main_HOST';
+$force_install_port='DB_main_PORT';
+$force_install_database='DB_main_NAME';
+$force_install_createdatabase='0';
+$force_install_databaselogin='DB_main_LOGIN';
+$force_install_databasepass='DB_main_PASSWORD';
+$force_install_createuser='0';
+$force_install_databaserootlogin='';
+$force_install_databaserootpass='';
+$force_install_dolibarrlogin='admin';
+$force_install_nophpinfo='1';
+$force_install_lockinstall='444';

build/composer/README

@@ -1,19 +0,0 @@
-
-* To list packages 
-
-composer show -i
-
-* To test upgrade of a lib with composer:
-
-Remove entry in composer.lock
-Edit composer.json to change version to "x.y.z"
-composer -v update --root-reqs --no-dev --no-autoloader --dry-run ccampbell/chromephp
-
-* To upgrade a lib with composer:
-
-Remove entry in composer.lock
-Edit composer.json to change version to "x.y.z"
-composer -v update --root-reqs --no-dev --no-autoloader ccampbell/chromephp
-
-
-

build/debian/README.howto

@@ -14,8 +14,8 @@ with format .DEB (for Debian, Ubuntu, ...).
 # To build a debian package, you need first
 # With Ubuntu 12.04
 # apt-get install debhelper dpkg-source gpg lintian git-buildpackage pkg-php-tools schroot sbuild dh-linktree dh-make-php
-# With Ubuntu 14.04 ou Debian 7
-# apt-get install debhelper dpkg gnupg lintian git-buildpackage pkg-php-tools schroot sbuild dh-linktree dh-make-php packaging-dev
+# With Debian 7
+# apt-get install debhelper dpkg gnupg lintian git-buildpackage pkg-php-tools schroot sbuild dh-linktree dh-make-php
 
 
 # To generate gpg key for email used into changelog
@@ -29,9 +29,6 @@ Files are saved int .gnupg directory
 [DEFAULT]
 pristine-tar = True
 
-[buildpackage]
-ignore-branch = True
-
 [git-buildpackage]
 sign-tags = True
 export-dir = ../build-area/
@@ -41,16 +38,6 @@ filter-pristine-tar = True
 END
 
 
-# Complete .bashrc with DEBEMAIL and DEBFULLNAME
-Example:
-export DEBFULLNAME="Laurent Destailleur (eldy)" 
-export DEBEMAIL=eldy@users.sourceforge.net
-Other example:
-export DEBFULLNAME="Laurent Destailleur" 
-export DEBEMAIL="eldy@destailleur.fr"
-
-export QUILT_PATCHES=debian/patches
-
 # To use Alioth.debian.org
 * Create an account login
 * Update your ~/.ssh/config file to add:
@@ -73,8 +60,7 @@ Ex: https://alioth.debian.org/users/eldy-guest
 # msgfmt -v -c -o /dev/null XX.po		 		To have status of translation for language XX
  
 # To check package integrity
-# lintian --pedantic -E -I package.deb   To test a binary package   
-# lintian --pedantic -E -I package.dsc   To test a source package   
+# lintian --pedantic -E -I package.deb   To test a package   
 
 # To manipulate packages
 # dpkg -l                                List all packages
@@ -115,85 +101,35 @@ http://packages.qa.debian.org/package.html
 http://bugs.debian.org/package
 
 
-##### Modify severity of a bug ticket
 
-- Send this email to control@bugs.debian.org and wait 10 minutes
+##### Testing a package into unstable env
 
-severity 123 xxx
+Check you have a mysql server available from another interface than localhost
+Comment line in /etc/mysql/my.cnf if required and restart mysql
+#bind-address = 127.0.0.1
 
-
-##### Update bug tracker system
-
-To set status of a bug to "pending"
-> bts --smtp-host=yoursmtpserver tag 999999 +pending
-
-or replay to email 999999@bugs.debian.org + submitter of bug
-With a message starting with: 
-
-Control: tag -1 +pending
-Thanks. Fixed into git.
-
-or replay to email control@bugs.debian.org
-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 a chroot environment
-
-Check you have a mysql server available from another interface than "localhost".
-Set line in /etc/mysql/my.cnf if required and restart mysql
-
-[mysqld]
-bind-address           = *
-
-Create a chroot called "jessie" or "unstable".
-Chroot env is stored into /srv/chroot directory.
+Create a chroot called "unstable-amd64-sbuild"
 > sudo sbuild-createchroot --keyring= unstable /srv/chroot/unstable http://ftp.uk.debian.org/debian
-or
-> sudo sbuild-createchroot jessie /srv/chroot/jessie http://ftp.uk.debian.org/debian
 
 Pour lister les env chroot
 > schroot -l
-or
-> ls /srv/chroot
 
 Puis pour se connecter et préparer l'environnement 
-> schroot -c name_of_chroot  (exemple schroot -c unstable-amd64-sbuild)
-> cat /etc/debian_chroot       to check which debian branch we are into
-> apt-get install vim dialog
+> schroot -c name_of_chroot
 > vi /usr/sbin/policy-rc.d     and replace return code 101 (not allowed) into 0 (ok)
-> apt-get update
-> apt-get upgrade
 > apt-get install links mysql-client
 
-To test a package
+Pour tester un package
 > On host server, stop any server on port 80 and 3306 (same port will be used by chroot env)
 > cp ../build-area/* /srv/chroot/unstable/tmp
 > sudo schroot -c name_of_chroot
 > cd /tmp
-> lintian --no-tag-display-limit --pedantic -E -I dolibarr*.deb
-> lintian --no-tag-display-limit --pedantic -E -I dolibarr*.dsc
+> lintian --pedantic -E -I dolibarr*.deb
+> lintian --pedantic -E -I dolibarr*.dsc
 > dpkg -i dolibarr*.deb  ou   pour avoir des traces: dpkg -D77777 -i dolibarr*.deb
 > apt-get install -f
 
-If there is a problem launching apache, because port is already used, change it into your chroot install with
-> vi /etc/apache2/ports.conf
-Then restart.
-Then you can call/test dolibarr with http://localhost:port/dolibarr/ . It can be also called FROM HOST (port must be a not used port on host).
+Puis http://localhost/dolibarr/ (cela peut etre appeler depuis le hote).
 
 
 
@@ -221,41 +157,25 @@ If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VER
 
 * Some files are removed from archive by the get-orig-source.sh 
 
-* Modify the tag file to replace sRGB.icc with correct free version and rename file into
-tcpdf_x.y.z+dfsgw.orig.tar.xz
-(x.y.z = version, w start from 1 and is increased for each new import)
-
 * Staying into git root directory, run
-> git-import-orig -vv ../tcpdf_x.y.z+dfsgw.orig.tar.xz --debian-branch=[master|jessie] --upstream-branch=[upstream|upstream-3.5.x]
-and enter version when requested with format
-x.y.z+dfsgw
-(x.y.z = version, w start from 1 and is increased for each new import)
+> git-import-orig -vv ../tcpdf_x.y.z+dfsg.orig.tar.xz
 
 Note: If there was errors solved manually, you may need to make a git commit
 
 * Add an entry into debian/changelog
-> dch -v x.y.z+dfsgw-1 "My comment" will add entry.
-For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version
+> dch -v x.y.z+dfsg-1 "My comment" will add entry.
+For example: dch -v x.y.z+dfsg-1 "New upstream release." for a new version
 Then modify changelog to replace "version" or "unstable" with "UNRELEASED".
 
 Warning: Date must have format reported by "date -R"
 Warning: Name and email must match value into debian/control file (Entry added here is used by next step).
 
 * We try to build package
-> rm -fr ../build-area; 
-> git-buildpackage -us -uc --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-x.y.z]
-ou
-> git-buildpackage -us -uc --git-ignore-branch --git-upstream-branch=[upstream|upstream-x.y.z]
+> rm -fr ../build-area; git-buildpackage -us -uc
 
-Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-3.5.x]
 Note: You can use git-buildpackage -us -uc --git-ignore-new  if you want to test build with uncommited file
 Note: You can use git-buildpackage -us -uc -d                if you want to test build when dependencies does not match 
 Note: Package is built into directory ../build-area
-Note: To compare 2 packages: debdiff package1.dsc package2.dsc
-
-* Test package
-> cp ../build-area/* /srv/chroot/unstable/tmp
-See rest of process into dedicated chapter "To test a package" to test it with debian unstable env
 
 * If package .deb is ok:
 Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit
@@ -263,7 +183,7 @@ Note: If there was errors managed manually, you may need to make a git commit bu
 
 * If ok, you can tag.
 > Edit debian/changelog to replace "UNRELEASED" into "unstable", then push
-> git-buildpackage --git-tag-only --git-retag --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-3.5.x]
+> git-buildpackage --git-tag-only --git-retag
 > git push --tags
 
 * Compilation is then done by a debian developer and sent
@@ -276,9 +196,26 @@ http://packages.qa.debian.org/t/tcpdf.html
 * Package will be into release when test will be moved as stable.
 
 
+
+##### Update but tracker system
+To set status of a bug to pending
+> bts tag 999999 +pending
+
+or replay to email 999999@bugs.debian.org + submitter of bug
+With a message starting with: 
+Control: tag -1 +pending
+and then a text like:
+Thanks. Fixed into git.
+
+or replay to email control@bugs.debian.org
+With only message 
+tag 729538 +pending
+
+
+
 ##### Create/Maintain dolibarr package
 
-To update dolibarr debian package when upstream (official version of external project) has changed:
+To update dolibarr debian package
 
 * You can git clone debian git repo
 > git clone git.debian.org:/git/collab-maint/dolibarr.git [dolibarr-debian]
@@ -292,89 +229,53 @@ from git clone dir and make link to git.
 * If local branch upstream and pristine-tar does not exists, create it
 from origin/upstream and origin/pristine.
 
-* When new upstream is available onto sourceforge, launch:
+* If new upstream is available onto sourceforge, launch:
 > debian/get-orig-source.sh
 If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0" to solve this.
 
-* Edit orig.tar.gz file to remove 
-- debian
+* Edit tgz file to remove 
 - htdocs/includes/ckeditor
-- htdocs/includes/jquery/css
-- htdocs/includes/jquery/js
-- htdocs/includes/jquery/plugins/flot
-- htdocs/includes/jquery/plugins/multiselect
-- htdocs/includes/jquery/plugins/datatables
-- htdocs/includes/jszip
-- htdocs/includes/mike42
-- htdocs/includes/phpexcel or htdocs/includes/phpoffice
-- htdocs/includes/restler/framework/Luracast/Restler/explorer
-- htdocs/includes/swiftmailer
-- htdocs/includes/tcpdf or htdocs/includes/tecnickcom
+- htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf
+- htdocs/includes/phpexcel
+- htdocs/includes/tcpdf
 And rename file into 
 dolibarr-x.y.z+dfsgw.tgz
 (x.y.z = version, w start from 1 and is increased for each new git-import-orig already done)
 
-* Staying into projet gitted root directory, run
-> git-import-orig -vv ../dolibarr-x.y.z+dfsgw.tgz --debian-branch=[master|jessie] --upstream-branch=[upstream|upstream-3.5.x]
+* Staying into git root directory, run
+> git-import-orig -vv ../dolibarr-x.y.z+dfsgw.tgz
 and enter version when requested with format
 x.y.z+dfsgw
 (x.y.z = version, w start from 1 and is increased for each new import)
 
 Note: If there was errors solved manually after get-orig-sources.sh, you may need to make a git commit
 
-* Update/fix debian/* files used to build package.
-At least, add an entry into debian/changelog with command
-> dch -v x.y.z+dfsgw-1 "My comment"
-For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version (x.y.z = version, w start from 1 and increased for each new import)
-Then check/modify changelog to replace "version" or "unstable" with "UNRELEASED".
+* Add an entry into debian/changelog
+> dch -v x.y.z+dfsg-w "My comment" will add entry.
+For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version (x.y.z = version, w start from 1 and increaed for each new import)
+Then modify changelog to replace "version" or "unstable" with "UNRELEASED".
 Then check/modify also the user/date signature:
 - Date must have format reported by "date -R"
 - Name and email must match value into debian/control file (Entry added here is used by next step).
 
+* We try to build package
+> rm -fr ../build-area; git-buildpackage -us -uc
 
-To update dolibarr debian package when only files into debian has changed:
-
-* Change files and commit.
-* Add a line into changelog for version debian/x.y.z+dfsgw-v (increase the last v into 2, 3...)
-> dch -v x.y.z+dfsgw-v "My comment"
-* git tag will be added when package is pushed.
-
-
-To update dolibarr debian package when only files not into debian has changed:
-
-* Checkout the branch you want to work on: master of debian/...  
-* Manually, add patches into debian/patches and update the file debian/series, or do the 2 steps with "quilt import filepatch.patch"
-* You can test patching of serie with "quilt push" (autant de fois que de patch). Avec "quilt pop -a", on revient a l'état du upstream sans les patch.
-* Update the debian/changelog to add entry of change.
-
-Once files has been prepared, it's time to test:
-
-* Try to build package
-> rm -fr ../build-area;
-> git-buildpackage -us -uc --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5]
-ou
-> git-buildpackage -us -uc --git-ignore-branch --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5]
-
-Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5]
 Note: You can use git-buildpackage -us -uc --git-ignore-new  if you want to test build with uncommited file
 Note: You can use git-buildpackage -us -uc -d                if you want to test build when dependencies does not match 
 Note: Package is built into directory ../build-area
-Note: To compare 2 packages: debdiff package1.dsc package2.dsc
 
 * Test package (see dedicated chapter to test it with debian unstable env)
-> sudo rm /srv/chroot/unstable/tmp/* >/dev/null 2>&1; cp ../build-area/* /srv/chroot/unstable/tmp
-See rest of process into dedicated chapter "To test a package" to test it with debian unstable env
 
 * If package .deb is ok:
 Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit
-> git push --all
+> git push --all ou git push origin --all
 
 * If ok, you can tag.
 > Edit debian/changelog to replace "UNRELEASED" into "unstable", then push
-> git-buildpackage --git-tag-only --git-retag --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-3.5.x]
+> git-buildpackage --git-tag-only --git-retag
 > git push --tags
 
-
 * Compilation is then done by a debian developer and sent
 > sbuild ...
 > dput ...
@@ -387,61 +288,3 @@ http://packages.qa.debian.org
 
 * Package will be into release when test will be moved as stable.
 
-
-
-##### Send an unblock request to make a full update of a stable package 
-
-Use this to move from unstable to testing.
-
-reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
-Choose package "release.debian.org"
-Then usertag "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."
-
-
-Use this to request an full update of a stable package
-
-reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
-Choose package "release.debian.org"
-Then usertag "unblock"
-Then name of package "dolibarr"
-Fill message, for example:
-"
-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 is inline 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 fixes
-
-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 for me a more secured process.
-"
-
-##### Send an request to ask a simple fix of a stable package 
-
-Use this to ask to apply patches on a stable version.
-
-reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
-Choose package "release.debian.org"
-Then usertag "jessie-pu" (if tags is not available in list, choose another one, and change it later into email content text)
-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."
-
-Note: If there is a response to ask more information, don't forget to remove the tag during answer.

build/debian/apache/.htaccess

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

build/debian/conf.php.install

@@ -100,8 +100,9 @@ $dolibarr_main_db_pass='';
 # This parameter contains the name of the driver used to access your
 # Dolibarr database.
 # Default value: none
-# Possible values: mysqli, pgsql
+# Possible values: mysql, mysqli, pgsql
 # Examples:
+# $dolibarr_main_db_type='mysql';
 # $dolibarr_main_db_type='mysqli';
 # $dolibarr_main_db_type='pgsql';
 #
@@ -221,18 +222,7 @@ $dolibarr_main_prod='0';
 # $dolibarr_main_limit_users='0';
 
 # dolibarr_mailing_limit_sendbyweb
-# Can set a limit for mailing send by web. This overwrite database value. Can be used to restrict on OS level.
+# Can set a limit for mailing send by web, can be used for a restricted mode.
 # Default value: 0 (use database value if exist)
 # Examples:
 # $dolibarr_mailing_limit_sendbyweb='0';
-
-# dolibarr_mailing_limit_sendbycli
-# Can set a limit for mailing send by cli. This overwrite database value. Can be used to restrict on OS level.
-# Default value: 0 (use database value if exist)
-# Examples:
-# $dolibarr_mailing_limit_sendbycli='0';
-
-# dolibarr_distrib
-# A key to identify the distribution used for first installation
-$dolibarr_distrib = 'deb';
-

build/debian/control

@@ -10,14 +10,13 @@ Build-Depends: debhelper (>= 9), po-debconf
  
 Package: dolibarr
 Architecture: all
-# For debian 7 or 8 or 9
-Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5 | libapache2-mod-php | libapache2-mod-phpfilter | php-cgi | php-fpm | php,
-    php5-cli | php-cli,
+Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
+    php5-cli, 
 # Required PHP extensions
-    php5-mysql | php5-mysqli | php-mysql | php-mysqli, php5-curl | php-curl, php5-gd | php-gd, php5-ldap | php-gd,
+    php5-mysql | php5-mysqli, php5-curl, php5-gd, php5-ldap, php5-geoip,
 # Required PHP libraries
     php-pear, php-mail-mime, 
-#    php-tcpdf,
+#    php-tcpdf, libfpdi-php,
 #    libfpdf-tpl-php, php-fpdf,
 #    libphp-adodb,
 #    libnusoap-php,
@@ -27,17 +26,15 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm |
 # Misc dependencies
 #    fonts-dejavu-core | ttf-dejavu-core,
     xdg-utils,
-    mariadb-client | virtual-mysql-client,
+    mysql-server,
+    mysql-client,
     ${misc:Depends},
     ${perl:Depends}
-Recommends: apache2 | lighttpd | httpd,
-    mariadb-server | virtual-mysql-server,
-# Required PHP extensions for debian 9 but we can't add them into a Depends, it does not exists on debian 7 and 8
-    php-xml, php-mbstring
-Suggests: www-browser, php5-geoip
+Recommends: apache2 | lighttpd | httpd
+Suggests: www-browser
 Description: Web based software to manage a company or foundation
- Dolibarr ERP & CRM is an easy to use open source/free software package for 
- companies, foundations or freelances. It includes different 
+ Dolibarr ERP & CRM is an easy to use open source/free software for small 
+ and medium companies, foundations or freelances. It includes different 
  features for Enterprise Resource Planning (ERP) and Customer Relationship
  Management (CRM) but also for different other activities.
  .

build/debian/copyright

@@ -1,14 +1,14 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Dolibarr
 Upstream-Contact: Laurent Destailleur <eldy@users.sourceforge.net>
-Source: https://www.dolibarr.org/files/stable/standard/
+Source: http://www.dolibarr.org/files/stable/standard/
 
 Files: *
 Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>
            2003-2006, Jean-Louis Bergamo     <jlb@j1b.org>
            2003-2013, Laurent Destailleur    <eldy@users.sourceforge.net>
            2003, Xavier Dutoit               <doli@sydesy.com>
-           2004-2013, Regis Houssin          <regis.houssin@inodbox.com>
+           2004-2013, Regis Houssin          <regis.houssin@capnetworks.com>
            2004, Sebastien Di Cintio         <sdicintio@ressource-toi.org>
            2004, Benoit Mortier              <benoit.mortier@opensides.be>
            2004, Christophe Combelles        <ccomb@free.fr>
@@ -52,7 +52,7 @@ License: GPL-3+
  details.
  .
  You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU General Public
  License version 3 can be found in the file
@@ -98,7 +98,7 @@ License: GPL-2+
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU General Public License
  can be found in /usr/share/common-licenses/GPL-2 file.
@@ -192,11 +192,14 @@ License: GPL-2+
  details.
  .
  You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
+Comment:
+ Those files are not shipped in the binary package as we
+ configure Dolibarr to use the library packaged in "libfpdi-php".
 
 Files: htdocs/includes/geoip/*
 Copyright: 2007 MaxMind LLC
@@ -212,7 +215,7 @@ License: LGPL-2.1+
  Lesser General Public License for more details.
  .
  You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU Lesser General Public
  License version 2.1 can be found in the file
@@ -236,7 +239,7 @@ License: GPL-2+ or MIT
  details.
  .
  You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
@@ -291,7 +294,7 @@ License: GPL-2+
  details.
  .
  You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
@@ -311,7 +314,7 @@ License: LGPL-2.1+
  Lesser General Public License for more details.
  .
  You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU Lesser General Public
  License version 2.1 can be found in the file
@@ -338,7 +341,7 @@ License: GPL-2+
  details.
  .
  You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
@@ -358,7 +361,7 @@ License: LGPL-2.1+
  Lesser General Public License for more details.
  .
  You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU Lesser General Public
  License version 2.1 can be found in the file
@@ -378,7 +381,7 @@ License: LGPL-3.0+
  See the GNU Lesser General Public License for more details.
  .
  You should have received a copy of the GNU Lesser General Public License
- along with TCPDF. If not, see <https://www.gnu.org/licenses/>.
+ along with TCPDF. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU Lesser General
  Public License version 3 can be found in "/usr/share/common-licenses/LGPL-3".

build/debian/dolibarr.desktop

@@ -22,6 +22,5 @@ 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/dolibarr.docs

@@ -1 +1,2 @@
 README.md
+README-FR.md

build/debian/dolibarr.lintian-overrides

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

build/debian/dolibarr.postinst

@@ -40,28 +40,10 @@ enable_install_upgrade_wizard() {
     rm -f /var/lib/dolibarr/documents/install.lock
 }
 
-
-php_install() {
-	if which php5enmod >/dev/null 2>&1 ;then
-		# php5endmod exists for ubuntu only
-		echo "Enable php module mysqli with php5enmod"
-		php5enmod mysqli
-    fi
-}
-
 apache_install() {
 	webserver=$1
-	
-	# Enable Apache 2 alias module
-	if which a2enmod >/dev/null 2>&1 ;then
-		echo "Enable apache module alias with a2enmod"
-		a2enmod alias
-	fi
-	
-	# Enable dolibarr conf
 	if which a2enconf >/dev/null 2>&1 ;then
 		# a2enconf exists for ubuntu only
-		echo "Enable link for Apache config file with a2enconf"
 		a2enconf dolibarr
 	else 
 		if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then
@@ -106,7 +88,11 @@ case "$1" in
 			echo This is not a first install
 		fi
 
-		php_install
+		# Apache 2 setup
+		if which a2enmod >/dev/null 2>&1 ;then
+			a2enmod alias
+		fi
+		
 		apache_install
 		lighttpd_install
 		
@@ -147,6 +133,7 @@ case "$1" in
 			# File already exist. We add params not found.
 			#echo Add new params to overwrite path to use shared libraries/fonts
 			#grep -q -c "dolibarr_lib_ADODB_PATH" $config    || [ ! -d "/usr/share/php/adodb" ]  || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
+			#grep -q -c "dolibarr_lib_FPDI_PATH" $config     || [ ! -d "/usr/share/php/fpdi" ]   || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
 			##grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
 			#grep -q -c "dolibarr_lib_NUSOAP_PATH" $config   || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
 			#grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config

build/debian/install.forced.php.install

@@ -7,7 +7,7 @@
 //
 
 $force_install_packager='deb';
-$force_install_noedit=1;
+$force_install_noedit=2;
 $force_install_message='KeepDefaultValuesDeb';
 #$force_install_main_data_root='/usr/share/dolibarr/documents';
 $force_install_main_data_root='/var/lib/dolibarr/documents';
@@ -26,10 +26,12 @@ $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one.
-// If during install, we enable/disable declaration to use non embedded libraries, we must also check they are 
+// If we enable/disable libraries declaration during install, 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='';
+//$force_dolibarr_lib_FPDF_PATH='/usr/share/php/fpdf';
+//$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
 //$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
 //$force_dolibarr_lib_GEOIP_PATH='';
 //$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';

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

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

build/debian/rules

@@ -10,23 +10,12 @@ export DH_OPTIONS=-v
 %:
 	dh $@
 
-# Replace standard debian package actions with a new one
-########################################################
-
 override_dh_auto_clean:
 # Do nothing. Added to disable launchpad to use bugged dh_auto_clean search for ant
 
 override_dh_auto_build:
 # Do nothing. Added to disable launchpad to use bugged dh_auto_build search for ant
 	
-#override_dh_compress:
-#	dh_compress --no-act -X.png
-
-# We disable this for png file because it modify content of original file so make
-# the dolibarr signature not valid.
-override_dh_strip_nondeterminism:
-	dh_strip_nondeterminism -X.png
-
 override_dh_install:
 	dh_install
 	# Delete files
@@ -90,6 +79,7 @@ override_dh_install:
 	
 	# clean from all PHP embedded libraries (we use package dependencies instead)
 #	rm -fr htdocs/includes/adodbtime
+#	rm -fr htdocs/includes/fpdfi
 #	rm -fr htdocs/includes/geoip
 #	rm -fr htdocs/includes/nusoap
 #	rm -fr htdocs/includes/odtphp/zip/pclzip

build/debian/source/include-binaries

@@ -1,2 +0,0 @@
-htdocs/install/doctemplates/websites/website_template-corporate.zip
-htdocs/install/doctemplates/websites/website_template-stellar.zip

build/debian/source/lintian-overrides

@@ -1,17 +0,0 @@
-# Remove warning, we want to keep both standard and minified sources.
-dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jquery/*
-dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jsgantt/*
-dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jstz/*
-# Those are false positives, the files are their own sources since
-# they are not minified
-source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/*.js
-source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/*.js
-source-is-missing htdocs/includes/ckeditor/ckeditor/lang/*.js
-source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/*/dialogs/*.js
-source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/*/filter/*.js
-source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/default.js
-source-is-missing htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/*.js
-# Those are false positives, the files are their own sources since
-# they are data files
-source-is-missing htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json
-

build/debian/watch

@@ -2,4 +2,4 @@
 version=3
 
 #http://sf.net/dolibarr/dolibarr-(.+)\.tgz
-http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_(.+)\.orig\.tar\.gz
+http://www.dolibarr.org/files/stable/standard/dolibarr-(.+)\.tgz

build/docker/.dockerignore

@@ -1,3 +0,0 @@
-Dockerfile
-README.md
-docker-compose.yml

build/docker/Dockerfile

@@ -1,39 +0,0 @@
-FROM php:7.2-apache
-
-ENV HOST_USER_ID 33
-ENV PHP_INI_DATE_TIMEZONE 'UTC'
-
-RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libldap2-dev libzip-dev zlib1g-dev libicu-dev g++\
-	&& rm -rf /var/lib/apt/lists/* \
-	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
-	&& docker-php-ext-install gd \
-	&& docker-php-ext-install zip \
-	&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
-        && docker-php-ext-install ldap \
-        && docker-php-ext-install mysqli \
-        && docker-php-ext-install calendar \
-        && docker-php-ext-configure intl \
-        && docker-php-ext-install intl \
-        && apt-get autoremove --purge -y libjpeg-dev libldap2-dev zlib1g-dev libicu-dev g++
-
-RUN mkdir /var/documents
-RUN chown www-data /var/documents
-
-COPY docker-run.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/docker-run.sh
-
-RUN pecl install xdebug && docker-php-ext-enable xdebug
-RUN echo 'zend_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so"' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.remote_autostart=0' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.remote_enable=1' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.default_enable=0' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.remote_host=docker.host' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.remote_port=9000' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.remote_connect_back=0' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.profiler_enable=0' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.remote_log="/tmp/xdebug.log"' >> /usr/local/etc/php/php.ini
-RUN echo '172.17.0.1 docker.host' >> /etc/hosts
-
-EXPOSE 80
-
-ENTRYPOINT ["docker-run.sh"]

build/docker/README.md

@@ -1,28 +0,0 @@
-# How to use it ?
-
-The docker-compose.yml file is used to build and run Dolibarr in the current workspace.
-
-Before build/run, define the variable HOST_USER_ID as following:
-
-        export HOST_USER_ID=$(id -u)
-
-Go in repository build/docker :
-
-        cd build/docker
-
-And then, you can run :
-
-        docker-compose up
-
-This will run 3 container Docker : Dolibarr, MariaDB and PhpMyAdmin.
-
-The URL to go to the Dolibarr is :
-
-        http://0.0.0.0
-
-The URL to go to PhpMyAdmin is (login/password is root/root) :
-
-        http://0.0.0.0:8080
-
-Setup the database connection during the installation process, please use mariad
-b (name of the database container) as database host.

build/docker/docker-compose.yml

@@ -1,25 +0,0 @@
-mariadb:
-    build: mariadb
-    environment:
-        MYSQL_ROOT_PASSWORD: root
-        MYSQL_DATABASE: dolibarr
-
-phpmyadmin:
-    image: phpmyadmin/phpmyadmin
-    environment:
-        PMA_HOST: mariadb
-    links:
-        - mariadb
-    ports:
-        - "8080:80"
-
-web:
-    build: .
-    environment:
-        HOST_USER_ID: $HOST_USER_ID
-    volumes:
-        - ../../htdocs:/var/www/html
-    links:
-        - mariadb
-    ports:
-        - "80:80"

build/docker/docker-run.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-usermod -u $HOST_USER_ID www-data
-groupmod -g $HOST_USER_ID www-data
-
-chgrp -hR www-data /var/www/html
-chmod g+rwx /var/www/html/conf
-
-if [ ! -f /usr/local/etc/php/php.ini ]; then
-  cat <<EOF > /usr/local/etc/php/php.ini
-date.timezone = $PHP_INI_DATE_TIMEZONE
-display_errors = On
-EOF
-fi
-
-exec apache2-foreground

build/docker/mariadb/Dockerfile

@@ -1,3 +0,0 @@
-FROM mariadb:latest
-# Enable comented out UTF8 charset/collation options
-RUN sed '/utf8/ s/^#//' /etc/mysql/mariadb.cnf >/tmp/t && mv /tmp/t /etc/mysql/mariadb.cnf

build/doxygen/dolibarr-doxygen.doxyfile

@@ -18,7 +18,7 @@
 # that follow. The default is UTF-8 which is also the encoding used for all
 # text before the first occurrence of this tag. Doxygen uses libiconv (or the
 # iconv built into libc) for the transcoding. See
-# https://www.gnu.org/software/libiconv for the list of possible encodings.
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
 
 DOXYFILE_ENCODING = UTF-8
 
@@ -442,7 +442,7 @@ SORT_BY_SCOPE_NAME = NO
 # disable (NO) the todo list. This list is created by putting \todo
 # commands in the documentation.
 
-GENERATE_TODOLIST = NO
+GENERATE_TODOLIST = YES
 
 # The GENERATE_TESTLIST tag can be used to enable (YES) or
 # disable (NO) the test list. This list is created by putting \test
@@ -587,7 +587,7 @@ INPUT = ../../htdocs ../../scripts
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
 # also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See https://www.gnu.org/software/libiconv for
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
 # the list of possible encodings.
 
 INPUT_ENCODING = UTF-8
@@ -639,7 +639,7 @@ EXCLUDE_SYMBOLS =
 # directories that contain example code fragments that are included (see
 # the \include command).
 
-EXAMPLE_PATH = ../../htdocs/modulebuilder/template 
+EXAMPLE_PATH = ../../dev/skeletons
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
@@ -737,7 +737,7 @@ REFERENCES_LINK_SOURCE = YES
 # If the USE_HTAGS tag is set to YES then the references to source code
 # will point to the HTML generated by the htags(1) tool instead of doxygen
 # built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see https://www.gnu.org/software/global/global.html). You
+# tagging system (see http://www.gnu.org/software/global/global.html). You
 # will need version 4.8.6 or higher.
 
 USE_HTAGS = NO

build/doxygen/doxygen_footer.html

@@ -3,24 +3,43 @@ File added into doxygen generated documentation
 -->
 
 
+<!-- Google analytics -->
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-9049390-1']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
+<!-- End google analytics -->
+
 
 <hr class="footer" />
-<address class="footer"><small>Generated on $datetime for <a href="https://www.dolibarr.org" title="ERP and CRM open source software">$projectname</a> by Doxygen $doxygenversion </small></address>
+<address class="footer"><small>Generated on $datetime
+for <a href="http://www.dolibarr.org">$projectname</a> by Doxygen $doxygenversion </small></address>
 
 
+<!--  Google AdSense -->
+<center>
+<script type="text/javascript"><!--
+google_ad_client = "pub-1071905880519467";
+/* PUBBANDEAUDOLIBARR */
+google_ad_slot = "1421205532";
+google_ad_width = 468;
+google_ad_height = 60;
+//-->
+</script>
+<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
+</center>
+<!-- End google adsense -->
 <br>
 
-
-
-<!-- Global site tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=UA-9049390-16"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', 'UA-9049390-16');
-</script>
-
+</div>
 </body>
 </html>

build/doxygen/doxygen_header.html

@@ -1,4 +1,6 @@
-<!-- File added into doxygen generated documentation -->
+<!-- 
+File added into doxygen generated documentation
+-->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -13,8 +15,8 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <!-- End from dolibarr.org -->
 </head>
-
 <body>
+<div id="top">
 
 <div class="topmaincol">
 <div class="divpath">
@@ -22,17 +24,26 @@
 </div>
 
 <div id="logodol">
-<div class="center">
+<center>
 <table width="100%">
 	<tr>
 		<td><div id="projectname">$projectname</div> - <span id="projectnumber">$projectnumber</span></td>
-		<td class="right"><!-- banner start -->
+		<td align="right"><!-- banner start -->
 		<table cellpadding="0" cellspacing="0" class="moduletablemybanner">
 			<tr>
 				<td>
 				<div class="bannergroupmybanner">
 
 				<div class="banneritemmybanner">
+<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+<!-- BAN_728x90_DOXYGEN -->
+<ins class="adsbygoogle"
+     style="display:inline-block;width:728px;height:90px"
+     data-ad-client="ca-pub-1465985984238664"
+     data-ad-slot="4297390217"></ins>
+<script>
+(adsbygoogle = window.adsbygoogle || []).push({});
+</script>
 				<div class="clr"></div>
 				</div>
 
@@ -43,7 +54,7 @@
 		<!-- banner end --></td>
 	</tr>
 </table>
-</div>
+</center>
 
 </div>
 

build/exakat/README.md

@@ -1,29 +0,0 @@
-
-== Install exakat ==
-mkdir exakat 
-cd exakat 
-curl -o exakat.phar http://dist.exakat.io/index.php?file=latest 
-curl -o apache-tinkerpop-gremlin-server-3.3.5-bin.zip http://dist.exakat.io/apache-tinkerpop-gremlin-server-3.3.5-bin.zip
-unzip apache-tinkerpop-gremlin-server-3.3.5-bin.zip
-mv apache-tinkerpop-gremlin-server-3.3.5 tinkergraph 
-rm -rf apache-tinkerpop-gremlin-server-3.3.5-bin.zip
-cd tinkergraph ./bin/gremlin-server.sh -i org.apache.tinkerpop neo4j-gremlin 3.3.5
-cd ..
- 
-php exakat.phar version
-php exakat.phar doctor
-
-== Init project ==
-php 
-
-
-Edit config.ini file to exclude some dirs:
-ignore_dirs[] = "/htdocs/includes";
-ignore_dirs[] = "/scripts";
-ignore_dirs[] = "/build";
-ignore_dirs[] = "/dev";
-ignore_dirs[] = "/documents";
-
-
-== Analyze project ==
-php

build/exe/doliwamp/Languages/MyCatalan.isl

@@ -1,47 +1,44 @@
 
 [CustomMessages]
 
-NameAndVersion=%1 versió %2
+NameAndVersion=%1 versi<EFBFBD> %2
 AdditionalIcons=Icones addicionals:
 CreateDesktopIcon=Crea una icona a l'&Escriptori
 CreateQuickLaunchIcon=Crea una icona a la &Barra de tasques
 ProgramOnTheWeb=%1 a Internet
-UninstallProgram=Desinstal·la %1
+UninstallProgram=Desinstal<EFBFBD>la %1
 LaunchProgram=Obre %1
-AssocFileExtension=&Associa %1 amb l'extensió de fitxer %2
-AssocingFileExtension=Associant %1 amb l'extensió de fitxer %2...
+AssocFileExtension=&Associa %1 amb l'extensi<EFBFBD> de fitxer %2
+AssocingFileExtension=Associant %1 amb l'extensi<EFBFBD> de fitxer %2...
 
-YouWillInstallDoliWamp=Instal·laràs DoliWamp (Dolibarr i altres programaris com Apache, Mysql i PHP) al teu ordinador.
-ThisAssistantInstallOrUpgrade=ALERTA: Utilitzar un ERP CRM instal·lat en un ordinador en local pot ser perillós: si l'ordinador s'espatlla, pots perdre totes les teves dades. Fes-ho si estàs preparat per autogestionar-te còpies de seguretat. Si no, pots utilitzar una instal·lació Saas (pots veure https://saas.dolibarr.org).
-IfYouHaveTechnicalKnowledge=Si tens coneixements tècnics i vols autogestionar el teu Apache, Mysql i PHP, no utilitzis aquest assistent i fes una instal·lació manual de Dolibarr sobre un servidor existent d'Apache, Mysql i PHP.
-ButIfYouLook=Però si busques una instal·lació automàtica en el teu propi ordinador, et trobes en el bon camí...
-DoYouWantToStart=Vols iniciar el procés d'instal·lació?
+YouWillInstallDoliWamp=Va a instal<EFBFBD>lar o actualitzar (Apache + Mysql + PHP + Dolibarr) al seu ordinador.
+ThisAssistantInstallOrUpgrade=Aquest assistent instal<EFBFBD>la o actualitza Dolibarr ERP-CRM i tots els seus requisits (Apache, Mysql i PHP) optimitzats per a l'<27>s de Dolibarr.
+IfYouHaveTechnicalKnowledge=Si teniu coneixements t<EFBFBD>cnics i necessita usar la seva Apache, Mysql i PHP amb altres aplicacions a part de Dolibarr, no utilitzeu aquest assistent, hauria laci<EFBFBD> manual d'Dolibarr sobre un Apache, Mysql i PHP existent.
+ButIfYouLook=Per<EFBFBD> si busca una instal<EFBFBD>laci<EFBFBD> autom<EFBFBD>tica, es troba en el bon cam<EFBFBD>...
+DoYouWantToStart=Vol iniciar el proc<EFBFBD>s d'instal<EFBFBD>laci<EFBFBD>/actualitzaci<EFBFBD>?
 
-TechnicalParameters=Paràmetres tècnics
-IfFirstInstall=Si es tracta de la primera instal·lació, hauràs d'especificar alguns paràmetres tècnics. Si no els entens, no n'estàs segur, o estàs fent una actualització, pots deixar els valors per defecte.
+TechnicalParameters=Par<EFBFBD>metres t<EFBFBD>cnics
+IfFirstInstall=Si es tracta de la primera instal laci<EFBFBD>, haur<EFBFBD> d'especificar alguns par<EFBFBD>metres t<EFBFBD>cnics. Si no els ent<EFBFBD>n, no sabeu o va a procedir a una actualitzaci<EFBFBD>, deixi els camps amb els valors proposats per defecte.
 
 ; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
-SMTPServer=Servidor SMTP (propi o ISP, només primera instal·lació) :
-ApachePort=Port Apache (només primera instal·lació, normalment el 80) :
-MySqlPort=Port MySql (només primera instal·lació, normalment el 3306) :
-MySqlPassword=Contrasenya del servidor i base de dades MySql de root (només primera instal·lació):
+SMTPServer=Servidor SMTP (El seu o el del seu ISP, <20>nicament primera instal.laci<EFBFBD>) :
+ApachePort=Puerto Apache (<EFBFBD>nicament primera instal.laci<EFBFBD>, normalment <EFBFBD>s el 80) :
+MySqlPort=Puerto Mysql (<EFBFBD>nicament primera instal.laci<EFBFBD>, normalment <EFBFBD>s el 3306) :
+MySqlPassword=Contrasenya del servidor i la base de dades MySQL de root (<EFBFBD>nicament primera instal.laci<EFBFBD>):
 
-FailedToDeleteLock=FailedToDeleteLock=Error en l'eliminació del fitxer %1/www/dolibarr/install.lock. Pots ignorar l'avís però és possible que hagis d'eliminar-lo manualment més tard. En aquest cas, serà informat. Fes clic a OK per continuar...
+FailedToDeleteLock=FailedToDeleteLock=Error en l'eliminaci<EFBFBD> del fitxer %1/www/dolibarr/install.lock. Pot ignorar l'av<EFBFBD>s per<EFBFBD> <20>s possible que hagi de eliminar-lo manualment m<EFBFBD>s tard. En aquest cas, ser<EFBFBD> informat. Feu clic a OK per continuar...
 
-PortAlreadyInUse=Sembla que el port %1 ja està sent utilitzat. Es recomana cancel·lar, tornar enrere i especificar un altre valor per al port% 2. Vols cancel·lar i escollir un altre valor?
+PortAlreadyInUse=Sembla que el port %1 ja est<EFBFBD> sent utilitzat. Es recomana cancel<EFBFBD>lar, tornar enrere i especificar un altre valor per al port% 2. Cancel<EFBFBD>lar i escollir un altre valor?
 
-FirefoxDetected=S'ha detectat Firefox al teu ordinador. El vols utilitzar com a navegador per defecte per Dolibarr?
-ChromeDetected=S'ha detectat Chrome al teu ordinador. El vols utilitzar com a navegador per defecte per Dolibarr?
-ChooseDefaultBrowser=Escull el teu navegador per defecte (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...).. Si no estàs segur, simplement fes clic a Obre:
+FirefoxDetected=S'ha detectat Firefox al seu ordinador. Voleu activar per defecte com a navegador per Dolibarr?
+ChooseDefaultBrowser=Esculli el seu navegador per defecte. Si no est<73> segur, simplement feu clic a Obrir:
 
-LaunchNow=Obre ara el Dolibarr
+LaunchNow=Llan<EFBFBD>ar ara Dolibarr
 
-ProgramHasBeenRemoved=Els arxius del programa Dolibarr han estat eliminats. No obstant això tots els seus arxius de dades es troben encara al directori %1. Hauràs d'eliminar aquest directori manualment per a una desinstal·lació completa.
+ProgramHasBeenRemoved=Els arxius del programa Dolibarr han estat eliminats. No obstant aix<EFBFBD> tots els seus arxius de dades es troben encara al directori %1. Haur<EFBFBD> eliminar aquest directori manualment per a una desinstal completa.
 
-DoliWampWillStartApacheMysql=L'instal·lador DoliWamp intentarà iniciar o reiniciar Apache i MySQL, això pot durar des de diversos segons a un minut després de la confirmació. Vols iniciar la instal·lació o actualització dels servidors web i de base de dades requerides per Dolibarr?
+DoliWampWillStartApacheMysql=L'instal<EFBFBD>lador DoliWamp intentar<EFBFBD> iniciar o reiniciar Apache i MySQL, aix<EFBFBD> pot durar des de diversos segons a un minut despr<EFBFBD>s de la confirmaci<EFBFBD>. Iniciar la instal<EFBFBD>laci<EFBFBD> o actualitzaci<EFBFBD> dels servidors web i bases de dades requerides per Dolibarr?
 
-OldVersionFoundAndMoveInNew=S'ha trobat una versió antiga de base de dades i ha estat moguda per a ser utilitzada per la nova versió de Dolibarr
-OldVersionFoundButFailedToMoveInNew=S'ha trobat una versió antiga de base de dades, però no es pot moure per a ser utilitzada per la nova versió de Dolibarr
+OldVersionFoundAndMoveInNew=S'ha trobat una versi<EFBFBD> antiga de base de dades i ha estat moguda per a ser utilitzada per la nova versi<EFBFBD> de Dolibarr
+OldVersionFoundButFailedToMoveInNew=S'ha trobat una versi<EFBFBD> antiga de base de dades, per<EFBFBD> no es pot moure per a ser utilitzada per la nova versi<EFBFBD> de Dolibarr
 
-DLLMissing=La teva instal·lació windows no té el component "Microsoft Visual C++ Redistributable for Visual Studio 2012". Instal·la primer la versió de 32-bit (vcredist_x86.exe) (pots trobar-la a https://www.microsoft.com/en-us/download/) i reiniciar després la instal·lació/actualització de DoliWamp.
-ContinueAnyway=Continua igualment (el procés d'instal·lació podria fallar sense aquest prerequisit)

build/exe/doliwamp/Languages/MyEnglish.isl

@@ -11,11 +11,11 @@ LaunchProgram=Launch %1
 AssocFileExtension=&Associate %1 with the %2 file extension
 AssocingFileExtension=Associating %1 with the %2 file extension...
 
-YouWillInstallDoliWamp=You will install DoliWamp (so Dolibarr + all required third party software like Apache, Mysql and PHP) on your computer.
-ThisAssistantInstallOrUpgrade=WARNING: Using an ERP CRM installed on a local computer can be dangerous: if your computer break down, you can lose all your data. Do this if you are ready to manage backup yourself seriously. If not, use an installation in Saas instead (see https://saas.dolibarr.org).
-IfYouHaveTechnicalKnowledge=Moreover, if you have technical knowledges and want to manage your Apache, Mysql and PHP yourself, you should not use this assistant and make a manual installation of Dolibarr on your existing server with Apache, Mysql and PHP.
-ButIfYouLook=But if you look for an automatic setup on your local computer, you''re on the good way...
-DoYouWantToStart=Do you want to start installation process ?
+YouWillInstallDoliWamp=You will install or upgrade DoliWamp (Apache+Mysql+PHP+Dolibarr) on your computer.
+ThisAssistantInstallOrUpgrade=This assistant installs or upgrades Dolibarr ERP-CRM and all required third party softwares (Apache, Mysql and PHP) optimized for a Dolibarr usage.
+IfYouHaveTechnicalKnowledge=If you have technical knowledge and plan to share your Apache, Mysql and PHP with other projects than Dolibarr, you should not use this assistant and make a manual installation of Dolibarr on your existing Apache, Mysql and PHP installation.
+ButIfYouLook=But if you look for an automatic setup, you''re on the good way...
+DoYouWantToStart=Do you want to start installation/upgrade process ?
 
 TechnicalParameters=Technical parameters
 IfFirstInstall=If first install, please specify some technical parameters. If you don't understand, are not sure, or are doing an upgrade, just leave the default values.
@@ -31,9 +31,7 @@ FailedToDeleteLock=Failed to delete the file %1/www/dolibarr/install.lock. You c
 PortAlreadyInUse=Port %1 seems to be already in use. You should cancel to go back and choose another value for %2 port. Cancel choice and choose another value ?
 
 FirefoxDetected=Firefox has been detected on your computer. Would you like to use it as the default browser for Dolibarr ?
-ChromeDetected=Chrome has been detected on your computer. Would you like to use it as the default browser for Dolibarr ?
-MicrosoftEdgeDetected=Microsoft Edge has been detected on your computer. Would you like to use it as the default browser for Dolibarr ?
-ChooseDefaultBrowser=Please choose your default browser (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). If you are not sure, just click Open :
+ChooseDefaultBrowser=Please choose your default browser. If you are not sure, just click Open :
 
 LaunchNow=Launch Dolibarr now
 
@@ -44,5 +42,3 @@ DoliWampWillStartApacheMysql=DoliWamp installer will now start or restart Apache
 OldVersionFoundAndMoveInNew=An old database version has been found and moved to be used by new Dolibarr version
 OldVersionFoundButFailedToMoveInNew=An old database version has been found but could not be moved to be used with new Dolibarr version
 
-DLLMissing=Your Windows installation is missing The "Micrsoft Visual C++ Redistributable for Visual Studio 2012" component. Please install the 32-bit version (vcredist_x86.exe) first (you can find it at https://www.microsoft.com/en-us/download/) and restart DoliWamp installation/upgrade after.
-ContinueAnyway=Continue anyway (install process may fails without this prerequisite)

build/exe/doliwamp/Languages/MyFrench.isl

@@ -11,18 +11,18 @@ LaunchProgram=Ex
 AssocFileExtension=&Associer %1 avec l'extension de fichier %2
 AssocingFileExtension=Associe %1 avec l'extension de fichier %2...
 
-YouWillInstallDoliWamp=Vous allez installer DoliWamp sur votre ordinateur (donc Dolibarr + tous ses composants pr<70>requis comme Apache, Mysql et PHP).
-ThisAssistantInstallOrUpgrade=AVERTISSEMENT: L'utilisation d'un ERP CRM install<6C> sur un ordinateur local peut <20>tre dangereuse: si votre ordinateur tombe en panne, vous pouvez perdre toutes vos donn<6E>es. Faites-le si vous <20>tes pr<70>t <20> g<>rer les sauvegardes vous-m<>me s<>rieusement. Sinon, utilisez plut<75>t une installation en Saas (voir https://saas.dolibarr.org).
-IfYouHaveTechnicalKnowledge=De plus, si vous avez des comp<6D>tences techniques et envisagez de partager votre Apache, Mysql et PHP avec d''autres applications que Dolibarr, vous ne devriez pas utiliser cet assistant mais faire plut<75>t une installation manuelle de Dolibarr sur un serveur existant <20>quip<69> de Apache, Mysql et PHP.
-ButIfYouLook=Mais si vous recherchez une installation cl<63> en main automatis<69>e sur une poste local, vous <20>tes sur la bonne voie...
-DoYouWantToStart=Voulez-vous d<>marrer le processus d'installation ?
+YouWillInstallDoliWamp=Vous allez installer ou mettre <20> jour DoliWamp (Apache+Mysql+PHP+Dolibarr) sur votre ordinateur.
+ThisAssistantInstallOrUpgrade=Cet assistant installe ou met <20> jour Dolibarr ERP-CRM et tous ses composants pr<70>requis (Apache, Mysql et PHP) optimis<EFBFBD>s pour une utilisation de Dolibarr.
+IfYouHaveTechnicalKnowledge=Si vous avez des comp<6D>tences techniques et envisagez de partager votre Apache, Mysql et PHP avec d'autres applications que Dolibarr, vous ne devriez pas utiliser cet assistant mais faire plut<75>t une installation manuelle de Dolibarr sur un socle Apache, Mysql et PHP existant.
+ButIfYouLook=Mais si vous recherchez une installation cl<63> en main automatis<69>e, vous <20>tes sur la bonne voie...
+DoYouWantToStart=Voulez-vous d<>marrer le processus d'installation/mise <20> jour ?
 
 TechnicalParameters=Param<61>tres techniques
 IfFirstInstall=S'il s'agit de la premi<6D>re installation, merci de sp<73>cifier ces quelques param<61>tres techniques. Si vous ne les comprennez pas, <20>tes non s<>r, ou proc<6F>dez <20> une mise <20> jour, laissez les champs avec les valeurs propos<6F>es par d<>faut.
 
 
-; WARNING !!! STRINGS FOR THIS 4 STRINGS MUST BE LOWER THAN 70 CHARACTERS
-SMTPServer=Serveur SMTP (le votre ou de votre FAI, premi<6D>re installation uniquement):
+; WARNING !!! STRINGS FOR THIS 4 STRINGS MUST BE LOWER THAN 60 CHARACTERS
+SMTPServer=Serveur SMTP (le votre ou celui de votre FAI, premi<6D>re installation uniquement) :
 ApachePort=Port Apache (premi<6D>re installation uniquement, le choix standard est 80) :
 MySqlPort=Port Mysql (premi<6D>re installation uniquement, le choix standard est 3306) :
 MySqlPassword=Mot de passe serveur+base MySql de root (premi<6D>re installation uniquement):
@@ -32,8 +32,7 @@ FailedToDeleteLock=Echec de la suppression du fichier %1/www/dolibarr/install.lo
 PortAlreadyInUse=Le port %1 semble d<>j<EFBFBD> utilis<69>. Il est recommand<6E> d'annuler pour revenir en arri<72>re et sp<73>cifier une autre valeur pour le port %2. Annuler le choix et choisir une autre valeur ?
 
 FirefoxDetected=Firefox a <20>t<EFBFBD> d<>tect<63> sur votre ordinateur. Voulez-vous en faire votre navigateur par d<>faut pour Dolibarr ?
-ChromeDetected=Chrome a <20>t<EFBFBD> d<>tect<63> sur votre ordinateur. Voulez-vous en faire votre navigateur par d<>faut pour Dolibarr ?
-ChooseDefaultBrowser=Merci de choisir votre navigateur par d<>faut (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). Si vous n'<27>tes pas s<>r, cliquez simplement sur Ouvrir :
+ChooseDefaultBrowser=Merci de choisir votre navigateur par d<>faut. Si vous n'<27>tes pas s<>r, cliquez simplement sur Ouvrir :
 
 LaunchNow=Lancer Dolibarr maintenant
 
@@ -44,5 +43,3 @@ DoliWampWillStartApacheMysql=L'installeur DoliWamp va maintenant d
 OldVersionFoundAndMoveInNew=Une ancienne version de base a <20>t<EFBFBD> trouv<75>e et d<>plac<61>e pour fonctionner avec la nouvelle version de Dolibarr.
 OldVersionFoundButFailedToMoveInNew=Une ancienne version de base a <20>t<EFBFBD> trouv<75>e mais ne peut <20>tre d<>plac<61>e pour <20>tre utilis<69>e avec la nouvelle version de Dolibarr.
 
-DLLMissing=L'installation de votre Windows est incompl<70>te. Il manque le composant "Micrsoft Visual C++ Redistributable for Visual Studio 2012". Installer la version 32-bit (vcredist_x86.exe) d'abord (vous pourrez le trouver <20> https://www.microsoft.com/fr-fr/download/) puis relancer l'installation de DoliWamp apr<70>s.
-ContinueAnyway=Continuer malgr<67> tout (le process d'installaton <20>chouera)

build/exe/doliwamp/Languages/MyGerman.isl

@@ -2,7 +2,7 @@
 [CustomMessages]
 
 NameAndVersion=%1 Version %2
-AdditionalIcons=Zusätzliche Symbole:
+AdditionalIcons=Zus<EFBFBD>tzliche Symbole:
 CreateDesktopIcon=&Desktop-Symbol erstellen
 CreateQuickLaunchIcon=Symbol in der Schnellstartleiste erstellen
 ProgramOnTheWeb=%1 im Internet
@@ -10,38 +10,3 @@ UninstallProgram=%1 entfernen
 LaunchProgram=%1 starten
 AssocFileExtension=&Registriere %1 mit der %2-Dateierweiterung
 AssocingFileExtension=%1 wird mit der %2-Dateierweiterung registriert...
-
-
-YouWillInstallDoliWamp=Sie installieren DoliWamp (also Dolibarr + alle erforderliche Software von Drittanbietern wie Apache, MySQL und PHP) auf Ihrem Computer.
-ThisAssistantInstallOrUpgrade=WARNUNG: Die Verwendung eines auf einem lokalen Computer installierten ERP-CRM kann gefährlich sein: Wenn Ihr Computer ausfällt, können Sie alle Ihre Daten verlieren. Tun Sie dies, wenn Sie bereit sind, das Backup selbst ernsthaft zu verwalten. Wenn nicht, verwenden Sie stattdessen eine Installation in Saas (siehe https://saas.dolibarr.org).
-IfYouHaveTechnicalKnowledge=Wenn Sie über technische Kenntnisse verfügen und Apache, MySQL und PHP selbst verwalten möchten, sollten Sie diesen Assistenten nicht verwenden und eine manuelle Installation von Dolibarr auf Ihrem vorhandenen Server mit Apache, MySQL und PHP durchführen.
-ButIfYouLook=Aber wenn Sie auf Ihrem lokalen Computer nach einer automatischen Einrichtung suchen, sind Sie auf dem besten Weg ...
-DoYouWantToStart=Möchten Sie den Installationsprozess starten?
-
-TechnicalParameters=technische Parameter
-IfFirstInstall=Geben Sie bei der Erstinstallation einige technische Parameter an. Wenn Sie nicht verstehen, sich nicht sicher sind oder ein Upgrade durchführen, belassen Sie einfach die Standardwerte.
-
-; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS 
-SMTPServer=SMTP Server (your own or ISP SMTP server, first install only) :
-ApachePort=Apache Port (first install only, Standard ist 80) :
-MySqlPort=MySQL Port (first install only, Standard ist 3306) :
-MySqlPassword=MySQL Server und Datenbank Passwort für root (first install only):
-
-FailedToDeleteLock=Fehler beim Löschen der Datei %1/www/dolibarr/install.lock. Sie können die Warnung ignorieren, müssen sie jedoch möglicherweise später manuell entfernen, wenn Sie dazu aufgefordert werden. Klicken Sie auf OK, um fortzufahren ...
-
-PortAlreadyInUse=Port %1 scheint bereits verwendet zu werden. Sie sollten zurückgehen und einen anderen Wert für %2 Port wählen.  Auswahl abbrechen und einen anderen Wert wählen ? 
-
-FirefoxDetected=Firefox wurde auf Ihrem Computer erkannt. Möchten Sie ihn als Standardbrowser für Dolibarr verwenden?
-ChromeDetected=Chrome wurde auf Ihrem Computer erkannt. Möchten Sie ihn als Standardbrowser für Dolibarr verwenden?
-ChooseDefaultBrowser=Bitte wählen Sie Ihren Standardbrowser (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). Wenn Sie sich nicht sicher sind, klicken Sie einfach auf Öffnen:
-
-LaunchNow=Starten Sie jetzt Dolibarr
-
-ProgramHasBeenRemoved=Die Dolibarr-Programmdateien wurden entfernt. Alle Ihre Daten befinden sich jedoch noch im Verzeichnis %1. Für eine vollständige Deinstallation, müssen Sie dieses Verzeichnis manuell entfernen.
-DoliWampWillStartApacheMysql=Die DoliWamp-Installation wird nun starten oder Apache und MySQL neu starten. Dies kann nach dieser Bestätigung einige Sekunden bis eine Minute dauern. Wollen Sie mit der Installation oder Aktualisierung des von Dolibarr benötigten Web- und Datenbankservers starten ?
-
-OldVersionFoundAndMoveInNew=Eine alte Datenbankversion wurde gefunden und verschoben, um von der neuen Dolibarr-Version verwendet zu werden.
-OldVersionFoundButFailedToMoveInNew=Eine alte Datenbankversion wurde gefunden, konnte jedoch nicht verschoben werden, um mit der neuen Dolibarr-Version verwendet zu werden.
-
-DLLMissing=Your Windows installation is missing The "Micrsoft Visual C++ Redistributable for Visual Studio 2012" component. Please install the 32-bit version (vcredist_x86.exe) first (you can find it at https://www.microsoft.com/en-us/download/) and restart DoliWamp installation/upgrade after.
-ContinueAnyway=Fahren Sie trotzdem fort (der Installationsvorgang kann ohne diese Voraussetzung fehlschlagen).

build/exe/doliwamp/Languages/MySpanish.isl

@@ -1,47 +1,44 @@
 
 [CustomMessages]
 
-NameAndVersion=%1 versión %2
+NameAndVersion=%1 versi<EFBFBD>n %2
 AdditionalIcons=Iconos adicionales:
 CreateDesktopIcon=Crear un icono en el &escritorio
-CreateQuickLaunchIcon=Crear un icono de Inicio Rápido
+CreateQuickLaunchIcon=Crear un icono de Inicio R<EFBFBD>pido
 ProgramOnTheWeb=%1 en la Web
 UninstallProgram=Desinstalar %1
 LaunchProgram=Ejecutar %1
-AssocFileExtension=&Asociar %1 con la extensión de archivo %2
-AssocingFileExtension=Asociando %1 con la extensión de archivo %2...
+AssocFileExtension=&Asociar %1 con la extensi<EFBFBD>n de archivo %2
+AssocingFileExtension=Asociando %1 con la extensi<EFBFBD>n de archivo %2...
 
-YouWillInstallDoliWamp=Va a instalar DoliWamp (Dolibarr y otro software como Apache, Mysql y PHP) en su ordenador.
-ThisAssistantInstallOrUpgrade=ALERTA: Utilizar un ERP CRM instalado en un ordenador en local puede ser peligroso: si el ordenador se estropea, puede perder todos sus datos. Hágalo si está preparado para autogestionar sus copias de seguridad. Si no, puede utilizar una instalacion Saas (puede ver https://saas.dolibarr.org).
-IfYouHaveTechnicalKnowledge=Si tiene conocimientos técnicos y necesita usar su Apache, Mysql y PHP con otras aplicaciones aparte de Dolibarr, no debería usar este asistente, debería realizar una instalación manual de Dolibarr sobre un Apache, Mysql y PHP existente.
-ButIfYouLook=Pero si busca una instalación automática en tu propio ordenador, se encuentra en el buen camino...
-DoYouWantToStart=¿Quiere iniciar el proceso de instalación?
+YouWillInstallDoliWamp=Va a instalar o actualizar (Apache+Mysql+PHP+Dolibarr) en su ordenador.
+ThisAssistantInstallOrUpgrade=Este asistente instala o actualiza Dolibarr ERP-CRM y todos sus requisitos (Apache, Mysql y PHP) optimizados para el uso de  Dolibarr.
+IfYouHaveTechnicalKnowledge=Si tiene conocimientos t<EFBFBD>cnicos y necesita usar su Apache, Mysql y PHP con otras aplicaciones aparte de Dolibarr, no deber<EFBFBD>a usar este asistente, deber<EFBFBD>a realizar una instalaci<EFBFBD>n manual de Dolibarr sobre un Apache, Mysql y PHP existente.
+ButIfYouLook=Pero si busca una instalaci<EFBFBD>n autom<EFBFBD>tica, se encuentra en el buen camino...
+DoYouWantToStart=<EFBFBD>Quiere iniciar el proceso de instalaci<EFBFBD>n/actualizaci<63>n?
 
-TechnicalParameters=Parámetros técnicos
-IfFirstInstall=Si se trata de la primera instalación, deberá especificar algunos parámetros técnicos. Si no los entiende, no está seguro o va a proceder a una actualización, deje los campos con los valores propuestos por defecto.
+TechnicalParameters=Par<EFBFBD>metros t<EFBFBD>cnicos
+IfFirstInstall=Si se trata de la primera instalaci<EFBFBD>n, deber<EFBFBD> especificar algunos par<EFBFBD>metros t<EFBFBD>cnicos. Si no los entiende, no est<EFBFBD> seguro o va a proceder a una actualizaci<EFBFBD>n, deje los campos con los valores propuestos por defecto.
 
 ; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
-SMTPServer=Servidor SMTP (propio o su ISP, sólo primera instalación) :
-ApachePort=Puerto Apache (sólo primera instalación, normalmente el 80) :
-MySqlPort=Puerto Mysql (sólo primera instalación, normalmente el 3306) :
-MySqlPassword=Contraseña del servidor y la base de datos MySQL de root (sólo primera instalación):
+SMTPServer=Servidor SMTP (El suyo o el de su ISP, <20>nicamente primera instalaci<EFBFBD>n) :
+ApachePort=Puerto Apache (<EFBFBD>nicamente primera instalaci<EFBFBD>n, normalmente es el 80) :
+MySqlPort=Puerto Mysql (<EFBFBD>nicamente primera instalaci<EFBFBD>n, normalmente es el 3306) :
+MySqlPassword=Contrase<EFBFBD>a del servidor y la base de datos MySQL de root (<EFBFBD>nicamente primera instalaci<EFBFBD>n):
 
-FailedToDeleteLock=Error en la eliminación del archivo %1/www/dolibarr/install.lock. Puede ignorar el aviso pero es posible que deba eliminarlo manualmente más tarde. En este caso, será informado. Haga clic en OK para continuar...
+FailedToDeleteLock=Error en la eliminaci<EFBFBD>n del archivo %1/www/dolibarr/install.lock. Puede ignorar el aviso pero es posible que deba eliminarlo manualmente m<EFBFBD>s tarde. En este caso, ser<EFBFBD> informado. Haga clic en OK para continuar...
 
-PortAlreadyInUse=Parece que el puerto %1 ya esta siendo usado. Se recomienda cancelar, volver atras y especificar otro valor para el puerto %2. ¿Cancelar y escojer otro valor?
+PortAlreadyInUse=Parece que el puerto %1 ya esta siendo usado. Se recomienda cancelar, volver atras y especificar otro valor para el puerto %2. <EFBFBD>Cancelar y escojer otro valor?
 
 FirefoxDetected=Se ha detectado Firefox en su ordenador. Desea activarlo por defecto como navegador para Dolibarr ?
-ChromeDetected=Se ha detectado Chrome en su ordenador. Desea activarlo por defecto como navegador para Dolibarr ?
-ChooseDefaultBrowser=Escoja su navegador por defecto (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). Si no está seguro, simplementa haga clic en Abrir :
+ChooseDefaultBrowser=Escoja su navegador por defecto. Si no est<73> seguro, simplementa haga clic en Abrir :
 
 LaunchNow=Lanzar ahora Dolibarr
 
-ProgramHasBeenRemoved=Los archivos del programa Dolibarr han sido eliminados. Sin embargo todos sus archivos de datos se encuentran todavía en el directorio %1. Deberá eliminar este directorio manualmente para una desinstalación completa.
+ProgramHasBeenRemoved=Los archivos del programa Dolibarr han sido eliminados. Sin embargo todos sus archivos de datos se encuentran todav<EFBFBD>a en el directorio %1. Deber<EFBFBD> eliminar este directorio manualmente para una desinstalaci<EFBFBD>n completa.
 
-DoliWampWillStartApacheMysql=El instalador DoliWamp intentará iniciar o reiniciar Apache y MySQL, esto puede durar desde varios segundos a un minuto después de la confirmación. ¿Iniciar la instalación o actualización de los servidores Web y bases de datos requeridas por Dolibarr?
+DoliWampWillStartApacheMysql=El instalador DoliWamp intentar<EFBFBD> iniciar o reiniciar Apache y MySQL, esto puede durar desde varios segundos a un minuto despu<EFBFBD>s de la confirmaci<EFBFBD>n. <EFBFBD>Iniciar la instalaci<EFBFBD>n o actualizaci<EFBFBD>n de los servidores Web y bases de datos requeridas por Dolibarr?
 
-OldVersionFoundAndMoveInNew=Se ha encontrado una versión antigua de base de datos y ha sido movida para ser utilizada por la nueva versión de Dolibarr
-OldVersionFoundButFailedToMoveInNew=Se ha encontrado una versión antigua de base de datos, pero no se pudo mover para ser utilizada por la nueva versión de Dolibarr
+OldVersionFoundAndMoveInNew=Se ha encontrado una versi<EFBFBD>n antigua de base de datos y ha sido movida para ser utilizada por la nueva versi<EFBFBD>n de Dolibarr
+OldVersionFoundButFailedToMoveInNew=Se ha encontrado una versi<EFBFBD>n antigua de base de datos, pero no se pudo mover para ser utilizada por la nueva versi<EFBFBD>n de Dolibarr
  	  	 
-DLLMissing=Su instalación Windows no tiene el componente "Microsoft Visual C++ Redistributable for Visual Studio 2012". Instale primero la versión de 32-bit (vcredist_x86.exe) (puedes encontrarlo en https://www.microsoft.com/en-us/download/) y reiniciar después la instalación/actualización de DoliWamp.
-ContinueAnyway=Continua igualmente (el proceso de instalación podría fallar sin este prerequisito)

build/exe/doliwamp/README

@@ -0,0 +1,8 @@
+README (English)
+##################################################
+DOLIWAMP Package tools
+##################################################
+
+This directory contains files used by makepack-dolibarr.pl
+script to build the all-in-on .EXE package DoliWamp, ready
+to be distributedt (for Windows).

build/exe/doliwamp/README.md

@@ -1,10 +1,7 @@
 # DOLIWAMP, THE DOLIBARR INSTALLER FOR WINDOWS
 
 DoliWamp is a special all in one package installer for Windows (Dolibarr+Mysql+Apache+PHP). 
-It's a dedicated Dolibarr version for Windows newbies with no technical knowledge. This package will install or upgrade Dolibarr but also all prerequisites like the web server, and the database in one auto-install process.
-
-This directory contains files used by *makepack-dolibarr.pl* script to build the all-in-on .EXE package DoliWamp, ready
-to be distributed (for Windows).
+It's a dedicated Dolibarr version for Windows newbies with no technical knowledge. This package will install or upgrade Dolibarr but also and all prerequisites like the web server, and the database in one autoinstall process.
 
 If you have technical knowledge in web administration and plan to share your server instance (Apache, Mysql or PHP) with other projects than Dolibarr or want to use Dolibarr other components (PostgreSQL), you should not use this assistant and make a manual installation of Dolibarr on your existing server by downloading the standard package (.tgz or .zip file).
 

build/exe/doliwamp/UsedPort.cpp

@@ -277,7 +277,7 @@ help=!(Port > 0);
 Usage:
 if (help) {
 	printf("----- %s V%s (c)Laurent Destailleur -----\n",PROG,VERSION);
-	printf("%s is software that allows you to know if a TCP/IP port is used\n",PROG);
+	printf("%s is a software that allows you to know if a TCP/IP port is used\n",PROG);
 	printf("%s sources can be compiled for WIN32 (VC++, GCC CYGWIN, MINGW) or for\n");
 	printf("Unix/Linux (GCC)\n",PROG);
 	printf("\n");

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

@@ -402,7 +402,7 @@ $cfg['RecodingEngine'] = 'auto';
 
 // Specify some parameters for iconv used in charset conversion. See iconv
 // documentation for details:
-// https://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.html
+// http://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.html
 $cfg['IconvExtraParams'] = '//TRANSLIT';
 
 // Available charsets for MySQL conversion. currently contains all which could

build/exe/doliwamp/dolibarr.conf.install

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

build/exe/doliwamp/doliwamp.iss

@@ -28,11 +28,11 @@ OutputBaseFilename=__FILENAMEEXEDOLIWAMP__
 SourceDir=..\..\..
 AppId=doliwamp
 AppPublisher=NLTechno
-AppPublisherURL=https://www.nltechno.com
-AppSupportURL=https://www.dolibarr.org
-AppUpdatesURL=https://www.dolibarr.org
-AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql software.
-AppCopyright=Copyright (C) 2008-2020 Laurent Destailleur (NLTechno), Fabian Rodriguez (Le Goût du Libre)
+AppPublisherURL=http://www.nltechno.com
+AppSupportURL=http://www.dolibarr.org
+AppUpdatesURL=http://www.dolibarr.org
+AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql softwares.
+AppCopyright=Copyright (C) 2008-2015 Laurent Destailleur, NLTechno
 DefaultDirName=c:\dolibarr
 DefaultGroupName=Dolibarr
 ;LicenseFile=COPYING
@@ -41,8 +41,7 @@ Compression=lzma
 SolidCompression=yes
 WizardImageFile=build\exe\doliwamp\doliwamp.bmp
 WizardSmallImageFile=build\exe\doliwamp\doliwampsmall.bmp
-SetupIconFile=doc\images\dolibarr_favicon.ico
-;To say the installer must be ran as admin
+SetupIconFile=doc\images\dolibarr.ico
 PrivilegesRequired=admin
 DisableProgramGroupPage=yes
 ChangesEnvironment=no
@@ -81,7 +80,7 @@ Name: "desktopicon"; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:
 Name: "{app}\logs"
 Name: "{app}\tmp"
 Name: "{app}\dolibarr_documents"
-Name: "{app}\bin\apache\apache2.4.41\logs"
+Name: "{app}\bin\apache\apache2.2.11\logs"
 
 [Files]
 ; Stop/start
@@ -98,48 +97,34 @@ Source: "build\exe\doliwamp\mysqltestinstall.bat.install"; DestDir: "{app}\"; Fl
 Source: "build\exe\doliwamp\startdoliwamp_manual_donotuse.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\builddemosslfiles.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversion;
-
 ; PhpMyAdmin, Apache, Php, Mysql
 ; Put here path of Wampserver applications
-; Value OK: apache 2.2.6,  php 5.2.5 (5.2.11, 5.3.0 and 5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45
-; Value OK: apache 2.2.11, php 5.3.0 (if no php_exif, php_pgsql, php_zip), mysql 5.0.45
-; Value OK: apache 2.4.9,  php 5.5.12, mysql 5.0.45 instead of 5.6.17 (wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe)
-; Value To test: apache 2.4.41, php 7.3.12, mariadb10.4.10 (wampserver3.2.0_x64.exe)
-Source: "C:\Program Files\Wamp\apps\phpmyadmin4.1.14\*.*"; DestDir: "{app}\apps\phpmyadmin4.1.14"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log,darkblue_orange"
-;Source: "C:\Program Files\Wamp\bin\apache\apache2.4.9\*.*"; DestDir: "{app}\bin\apache\apache2.4.9"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
-Source: "C:\wamp64\bin\apache\apache2.4.41\*.*"; DestDir: "{app}\bin\apache\apache2.4.41"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
-;Source: "C:\Program Files\Wamp\bin\php\php5.5.12\*.*"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
-Source: "C:\wamp64\bin\php\php7.3.12\*.*"; DestDir: "{app}\bin\php\php7.3.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
-;Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
-Source: "C:\wamp64\bin\mariadb\mariadb10.4.10\*.*"; DestDir: "{app}\bin\mariadb\mariadb10.4.10"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
-
+; Value OK: apache 2.2.6, php 5.2.5 (5.2.11, 5.3.0 and 5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45 or 5.1.36
+; Value OK: apache 2.2.11, php 5.3.0 (if no php_exif, php_pgsql, php_zip), mysql 5.0.45 or 5.1.36
+Source: "C:\Program Files\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log,darkblue_orange"
+Source: "C:\Program Files\Wamp\bin\apache\apache2.2.11\*.*"; DestDir: "{app}\bin\apache\apache2.2.11"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
+Source: "C:\Program Files\Wamp\bin\php\php5.3.0\*.*"; DestDir: "{app}\bin\php\php5.3.0"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
+Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
 ; Mysql data files (does not overwrite if exists)
-; We must copy them because the tool mysql_install_db.exe to generate them at first install does not return to prompt so make install hang
-;Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mariadb\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db"
-
+Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db"
 ; Dolibarr
-Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,nltechno*\*,sabre\sabre\*\tests,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php"
-Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,dbmodel\*,fpdf\*,initdata\*,initdemo\*,iso-normes\*,licence\*,phpcheckstyle\*,phpunit\*,samples\*,test\*,uml\*,vagrant\*,xdebug\*"
+Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,nltechno*\*,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php"
+Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,dbmodel\*,fpdf\*,initdata\*,iso-normes\*,licence\*,phpcheckstyle\*,phpunit\*,samples\*,test\*,uml\*,vagrant\*,xdebug\*"
 Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*,images\dolibarr_screenshot2.png,images\dolibarr_screenshot3.png,images\dolibarr_screenshot4.png,images\dolibarr_screenshot5.png,images\dolibarr_screenshot6.png,images\dolibarr_screenshot7.png,images\dolibarr_screenshot8.png,images\dolibarr_screenshot9.png,images\dolibarr_screenshot10.png,images\dolibarr_screenshot11.png,images\dolibarr_screenshot12.png"
 Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php"
 Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,default.properties,install.lock"
-
 ; Config files
 Source: "build\exe\doliwamp\phpmyadmin.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\dolibarr.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\config.inc.php.install"; DestDir: "{app}\apps\phpmyadmin4.1.14"; Flags: ignoreversion;
-;Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.9\conf"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.41\conf"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\config.inc.php.install"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.2.11\conf"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mariadb\mariadb10.4.10"; Flags: ignoreversion;
-;Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php7.3.12"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.3.0"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\index.php.install"; DestDir: "{app}\www"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\install.forced.php.install"; DestDir: "{app}\www\dolibarr\htdocs\install"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\openssl.conf"; DestDir: "{app}"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\ca_demo_dolibarr.crt"; DestDir: "{app}"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\ca_demo_dolibarr.key"; DestDir: "{app}"; Flags: ignoreversion;
-
 ; Licence
 Source: "COPYRIGHT"; DestDir: "{app}"; Flags: ignoreversion;
 
@@ -160,16 +145,6 @@ Name: "{userdesktop}\Dolibarr Help center"; Filename: "{app}\rundolihelp.bat"; W
 ;Name: "{userstartup}\DoliWamp server"; Filename: "{app}\startdoliwamp.bat"; WorkingDir: "{app}"; Flags: runminimized; IconFilename: {app}\www\dolibarr\doc\images\dolibarr.ico
 
 
-[Registry]
-; Add "run as admin" flag. Same than command line: reg add "HKCU\Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" /v "<Path to your exe>" /t REG_SZ /d RUNASADMIN
-Root: "HKLM"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"; ValueType: string; ValueName: "{app}\startdoliwamp.bat"; ValueData: "RUNASADMIN";
-Root: "HKLM"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"; ValueType: string; ValueName: "{app}\stopdoliwamp.bat"; ValueData: "RUNASADMIN";
-Root: "HKLM32"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"; ValueType: string; ValueName: "{app}\startdoliwamp.bat"; ValueData: "RUNASADMIN";
-Root: "HKLM32"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"; ValueType: string; ValueName: "{app}\stopdoliwamp.bat"; ValueData: "RUNASADMIN";
-Root: "HKLM64"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"; ValueType: string; ValueName: "{app}\startdoliwamp.bat"; ValueData: "RUNASADMIN"; Check: IsWin64
-Root: "HKLM64"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"; ValueType: string; ValueName: "{app}\stopdoliwamp.bat"; ValueData: "RUNASADMIN"; Check: IsWin64
-
-
 [Code]
 
 //variables globales
@@ -215,45 +190,21 @@ var value: String;
 function InitializeSetup(): Boolean;
 begin
   Result := MsgBox(CustomMessage('YouWillInstallDoliWamp')+#13#13+CustomMessage('ThisAssistantInstallOrUpgrade')+#13#13+CustomMessage('IfYouHaveTechnicalKnowledge')+#13#13+CustomMessage('ButIfYouLook')+#13#13+CustomMessage('DoYouWantToStart'), mbConfirmation, MB_YESNO) = IDYES;
-
-  if Result then
-  begin
-  
-	//----------------------------------------------
-	// Test if msvcr110 DLL has been installed
-	//----------------------------------------------
-	
-	if not FileExists ('c:/windows/system32/msvcr110.dll') and not FileExists ('c:/windows/sysWOW64/msvcr110.dll') and not FileExists ('c:/winnt/system32/msvcr110.dll') and not FileExists ('c:/winnt/sysWOW64/msvcr110.dll') then
-	begin
-	    // TODO - offer to install the component by opening the URL in the default browser, abort installation if user doesn't accept 
-	    Result := MsgBox(CustomMessage('DLLMissing')+#13#13+CustomMessage('ContinueAnyway'), mbConfirmation, MB_YESNO) = IDYES;
-	    
-	end;
-	// Pb seems similar with msvcp110.dll
-	//vcredist_x64.exe
-	  
-  end;
-
 end;
 
 procedure InitializeWizard();
 begin
-
   //version des applis, a modifier pour chaque version de WampServer 2
-  //apacheVersion := '2.4.9';
-  //phpVersion := '5.5.12' ;
-  apacheVersion := '2.4.41';
-  phpVersion := '7.3.12' ;
-  //mysqlVersion := '5.0.45';
-  mysqlVersion := '10.4.10';
-  phpmyadminVersion := '4.1.14';
+  apacheVersion := '2.2.11';
+  phpVersion := '5.3.0' ;
+  mysqlVersion := '5.0.45';
+  phpmyadminVersion := '3.2.0.1';
 
   smtpServer := 'localhost';
   apachePort := '80';
   mysqlPort := '3306';
   newPassword := 'changeme';
 
-
   firstinstall := true;
 
 
@@ -281,9 +232,9 @@ begin
         if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\MSCRM','SMTPServer', value) then
         begin
           if value <> '' then smtpServer:=value;
-        end;
-      end;
-    end;
+        end
+      end
+    end
   end;
 
   if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\NLTechno\DoliWamp','apachePort', value) then
@@ -304,13 +255,14 @@ begin
 
   // Prepare an object calle "Page" of type wpInstalling.
   // Object will be show later in NextButtonClick function.
-  Page := CreateInputQueryPage(wpInstalling, CustomMessage('TechnicalParameters'), '', CustomMessage('IfFirstInstall'));
+  Page := CreateInputQueryPage(wpInstalling,
+  CustomMessage('TechnicalParameters'), '',
+  CustomMessage('IfFirstInstall'));
 
   // TODO Add control differently if first install or update
   if firstinstall
   then
   begin
-    // False means it's not a password edit
     Page.Add(CustomMessage('SMTPServer'), False);
     Page.Add(CustomMessage('ApachePort'), False);
     Page.Add(CustomMessage('MySqlPort'), False);
@@ -318,7 +270,6 @@ begin
   end
   else
   begin
-    // False means it's not a password edit
     Page.Add(CustomMessage('SMTPServer'), False);
     Page.Add(CustomMessage('ApachePort'), False);
     Page.Add(CustomMessage('MySqlPort'), False);
@@ -358,7 +309,8 @@ function NextButtonClick(CurPageID: Integer): Boolean;
 var myResult: Integer;
 var res: Boolean;
 var paramok: Boolean;
-var datadir: String;
+var datadirold: String;
+var datadirnew: String;
 var exedirold: String;
 var exedirnew: String;
 var themessage: String;
@@ -377,12 +329,10 @@ begin
     winPath := ExpandConstant('{win}');
     pathWithSlashes := path;
     StringChange (pathWithSlashes, '\','/');
-
-	
-	// Migration of database
-//	datadir := pathWithSlashes+'/bin/mariadb/marradb10.4.10/data';
-//    exedirold := pathWithSlashes+'/bin/mariadb/marradb10.4.10/';
-//    exedirnew := pathWithSlashes+'/bin/mariadb/marradb10.4.10/';
+    datadirold := pathWithSlashes+'/bin/mysql/mysql5.0.45/data';
+    datadirnew := pathWithSlashes+'/bin/mysql/data';
+    exedirold := pathWithSlashes+'/bin/mysql/mysql5.0.45';
+    exedirnew := pathWithSlashes+'/bin/mysql/mysql5.0.45';
 
     // If we have a new database version, we should only copy old my.ini file into new directory
     // and change only all basedir= strings to use new version. Like this, data dir is still correct.
@@ -409,21 +359,39 @@ begin
     //----------------------------------------------
 	// TODO Update this list when changing PHP/Apache versions
 	
-    phpDllCopy := 'libssh2.dll';
+    phpDllCopy := 'fdftk.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'icuuc64.dll';
+    phpDllCopy := 'fribidi.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'icuin64.dll';
+    phpDllCopy := 'gds32.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'icuio64.dll';
+    phpDllCopy := 'libeay32.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'icudt64.dll';
+    phpDllCopy := 'libmhash.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'libsasl.dll';
+    phpDllCopy := 'libmysql.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'php7apache2_4.dll';
+    phpDllCopy := 'libpq.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'php7ts.dll';
+    phpDllCopy := 'msql.dll';
+    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+    phpDllCopy := 'libmcrypt.dll';
+    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+    phpDllCopy := 'libmysqli.dll';
+    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+    phpDllCopy := 'ntwdblib.dll';
+    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+
+    phpDllCopy := 'php5activescript.dll';
+    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+    phpDllCopy := 'php5nsapi.dll';
+    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+    phpDllCopy := 'php5ts.dll';
+    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+
+    phpDllCopy := 'ssleay32.dll';
+    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+    phpDllCopy := 'yaz.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
 
 
@@ -433,7 +401,7 @@ begin
     begin
       themessage := FmtMessage(CustomMessage('FailedToDeleteLock'),[pathWithSlashes]);
  		  MsgBox(themessage,mbInformation,MB_OK);
-    end;
+    end
 
 
 		// Check if parameters already defined in conf.php file
@@ -515,17 +483,6 @@ begin
 		then
 		begin
 		    
-	    //----------------------------------------------
-	    // check that we don't try an upgrade (mysql upgrade no supported)
-	    //----------------------------------------------
-
-	    if FileExists (pathWithSlashes+'/bin/mysql/mysql5.0.45/bin/mysqld-nt.exe') then
-	    begin
-	      MsgBox('An existing installation using an old version of Mysql exists. Sorry, upgrade with this installer is not possible.', mbInformation, MB_OK);
-	      Abort();
-	    end;
-
-
 	    //----------------------------------------------
 	    // Rename file c:/windows/php.ini (we don't want it)
 	    //----------------------------------------------
@@ -565,20 +522,6 @@ begin
 	    begin
 	      //navigateur
 	      browser := 'iexplore.exe';
-	      
-	      if browser = 'iexplore.exe' then
-	      begin
-	        if FileExists (pfPath+'/Google/Chrome/Application/chrome.exe')  then
-	        begin
-	          if MsgBox(CustomMessage('ChromeDetected'),mbConfirmation,MB_YESNO) = IDYES then
-	          begin
-	            browser := pfPath+'/Google/Chrome/Application/chrome.exe';
-	          end;
-	        end;
-	      end;
-
-	      if browser = 'iexplore.exe' then
-	      begin
 	      if FileExists (pfPath+'/Mozilla Firefox/firefox.exe')  then
 	      begin
 	        if MsgBox(CustomMessage('FirefoxDetected'),mbConfirmation,MB_YESNO) = IDYES then
@@ -586,19 +529,6 @@ begin
 	          browser := pfPath+'/Mozilla Firefox/firefox.exe';
 	        end;
 	      end;
-		  end;
-	      
-	      if browser = 'iexplore.exe' then
-	      begin
-		    if FileExists (winPath+'/SystemApps/Microsoft.MicrosoftEdge_8wekyb3d8bbwe/MicrosoftEdge.exe')  then
-		    begin
-		      if MsgBox(CustomMessage('MicrosoftEdgeDetected'),mbConfirmation,MB_YESNO) = IDYES then
-		      begin
-		        browser := winPath+'/SystemApps/Microsoft.MicrosoftEdge_8wekyb3d8bbwe/MicrosoftEdge.exe';
-		      end;
-		    end;
-		  end;
-
 	      if browser = 'iexplore.exe' then
 	      begin
             if FileExists (pfPath+'/Internet Explorer/iexplore.exe')  then
@@ -628,7 +558,7 @@ begin
 	      StringChangeEx (srcContents, 'WAMPAPACHEPORT', myporta, True);
 	      StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
 	      SaveStringToFile(destFileA,srcContents, False);
-	    end;
+	    end
 
 
       if MsgBox(CustomMessage('DoliWampWillStartApacheMysql'),mbConfirmation,MB_YESNO) = IDYES then
@@ -651,7 +581,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPPHPMYADMINVERSION', phpmyadminVersion, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end;
+		    end
 		    DeleteFile(srcFile);
 		
 		
@@ -663,9 +593,7 @@ begin
 		    destFile := pathWithSlashes+'/alias/dolibarr.conf';
 		    srcFile := pathWithSlashes+'/alias/dolibarr.conf.install';
 		
-		    if FileExists(srcFile) then
-		    begin
-		      if not FileExists (destFile) then
+		    if not FileExists (destFile) and FileExists(srcFile) then
 		    begin
 		      LoadStringFromFile (srcFile, srcContents);
 		
@@ -674,18 +602,6 @@ begin
 		
 		      SaveStringToFile(destFile, srcContents, False);
 		    end
-		      else
-		      begin
-		        // We must replace to use format 2.4 of apache
-	            DeleteFile(destFile);
-  		        LoadStringFromFile (srcFile, srcContents);
-		
-		        StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
-		        StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
-		
-		        SaveStringToFile(destFile, srcContents, False);
-		      end;
-		    end;
 		    DeleteFile(srcFile);
 		
 		
@@ -698,25 +614,14 @@ begin
 		    destFile := pathWithSlashes+'/apps/phpmyadmin'+phpmyadminVersion+'/config.inc.php';
 		    srcFile := pathWithSlashes+'/apps/phpmyadmin'+phpmyadminVersion+'/config.inc.php.install';
 		
-		    if FileExists(srcFile) then
-		    begin
-	  	      if not FileExists (destFile) then
+		    if not FileExists (destFile) and FileExists (srcFile) then
 		    begin
+	        // sinon on prends le fichier par defaut
 	        LoadStringFromFile (srcFile, srcContents);
 	        StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
 	        StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
 	        SaveStringToFile(destFile,srcContents, False);
 		    end
-		      else
-		      begin
-		        // We must replace to use format 2.4 of apache
-	            DeleteFile(destFile);
-	            LoadStringFromFile (srcFile, srcContents);
-	            StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
-	            StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
-	            SaveStringToFile(destFile,srcContents, False);
-		      end;
-		    end;
 		
 		
 		
@@ -739,7 +644,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end;
+		    end
 		
 		
 		
@@ -748,8 +653,8 @@ begin
 		    // Create file my.ini (if not exists)
 		    //----------------------------------------------
 		
-		    destFile := pathWithSlashes+'/bin/mariadb/mariadb'+mysqlVersion+'/my.ini';
-		    srcFile := pathWithSlashes+'/bin/mariadb/mariadb'+mysqlVersion+'/my.ini.install';
+		    destFile := pathWithSlashes+'/bin/mysql/mysql'+mysqlVersion+'/my.ini';
+		    srcFile := pathWithSlashes+'/bin/mysql/mysql'+mysqlVersion+'/my.ini.install';
 		
 		    if not FileExists (destFile) then
 		    begin
@@ -758,10 +663,9 @@ begin
 		      //installDir et version de php
 		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
 		      StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
-		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end;
+		    end
 		
 		
 		
@@ -793,7 +697,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPAPACHEPORT', myporta, True);
 		      StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
 		      SaveStringToFile(destFile, srcContents, False);
-		    end;
+		    end
 		
 		
 		
@@ -816,7 +720,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end;
+		    end
 		
 		
 		
@@ -832,14 +736,32 @@ begin
 		      LoadStringFromFile (srcFile, srcContents);
 		
 		      //version de apache et mysql
-		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
 		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
 		      StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
-		      StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
-		      StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end;
+		    end
+		
+		
+		
+		    //----------------------------------------------
+		    // Create file install_services_auto.bat (always)
+		    //----------------------------------------------
+		
+		    destFile := pathWithSlashes+'/install_services_auto.bat';
+		    srcFile := pathWithSlashes+'/install_services_auto.bat.install';
+		
+		    if FileExists (srcFile) then
+		    begin
+		      LoadStringFromFile (srcFile, srcContents);
+		
+		      //version de apache et mysql
+		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
+		      StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
+		
+		      SaveStringToFile(destFile,srcContents, False);
+		    end
+		
 		
 		
 		
@@ -855,12 +777,11 @@ begin
 		      LoadStringFromFile (srcFile, srcContents);
 		
 		      //version de apache et mysql
-		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
 		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
 		      StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end;
+		    end
 		
 		
 		
@@ -881,7 +802,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end;
+		    end
 		
 		
 		    //----------------------------------------------
@@ -902,7 +823,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end;
+		    end
 		
 		
 		    //----------------------------------------------
@@ -923,7 +844,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end;
+		    end
 		    
 		
 		    //----------------------------------------------
@@ -942,7 +863,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end;
+		    end
 
 		
 		    //----------------------------------------------
@@ -959,7 +880,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPSMTP', mysmtp, True);
               StringChangeEx (srcContents, 'WAMPPHPVERSION', phpVersion, True);
 		      SaveStringToFile(destFile,srcContents, False);
-		    end;
+		    end
 		
 		    //----------------------------------------------
 		    // Create file php.ini in apache (if not exists)
@@ -975,15 +896,13 @@ begin
 		      StringChangeEx (srcContents, 'WAMPSMTP', mysmtp, True);
               StringChangeEx (srcContents, 'WAMPPHPVERSION', phpVersion, True);
 		      SaveStringToFile(destFile,srcContents, False);
-		    end;
+		    end
 		
 		
 		
-	   		// Uninstall services
+	   		// Uninstall and Install services
 		  	batFile := path+'\uninstall_services.bat';
         Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
-  			
-  			// Install services
   			batFile := path+'\install_services.bat';
   			Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
 			
@@ -1019,7 +938,7 @@ begin
 
       	res := False;
 		  	
-		  end;
+		  end
       
     end
     else
@@ -1029,9 +948,9 @@ begin
 		  	
 		  	res := False;
 
-    end;
+    end
     
-  end;
+  end
 
 
   Result := res;
@@ -1046,6 +965,7 @@ end;
 procedure DeinitializeSetup();
 begin
 //  DeleteFile(path+'\install_services.bat');
+//  DeleteFile(path+'\install_services_auto.bat');
 end;
 
 
@@ -1082,7 +1002,7 @@ Filename: "{app}\rundoliwamp.bat"; Description: {cm:LaunchNow}; Flags: shellexec
 
 [UninstallDelete]
 Type: files; Name: "{app}\*.*"
-Type: files; Name: "{app}\bin\mariadb\mariadb10.4.10\*.*"
+Type: files; Name: "{app}\bin\mysql\mysql5.0.45\*.*"
 Type: filesandordirs; Name: "{app}\alias"
 Type: filesandordirs; Name: "{app}\apps"
 Type: filesandordirs; Name: "{app}\bin\apache"

build/exe/doliwamp/httpd.conf.install

@@ -1,9 +1,9 @@
 #
 # This is the main Apache HTTP server configuration file.  It contains the
 # configuration directives that give the server its instructions.
-# See <URL:http://httpd.apache.org/docs/2.4/> for detailed information.
+# See <URL:http://httpd.apache.org/docs/2.2/> for detailed information.
 # In particular, see 
-# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
+# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
 # for a discussion of each configuration directive.
 #
 # Do NOT simply read the instructions in here without understanding
@@ -13,62 +13,43 @@
 # Configuration and logfile names: If the filenames you specify for many
 # of the server's control files begin with "/" (or "drive:/" for Win32), the
 # server will use that explicit path.  If the filenames do *not* begin
-# with "/", the value of ServerRoot is prepended -- so "logs/access_log"
-# with ServerRoot set to "/usr/local/apache2" will be interpreted by the
-# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log"
-# will be interpreted as '/logs/access_log'.
+# with "/", the value of ServerRoot is prepended -- so "logs/foo.log"
+# with ServerRoot set to "C:/Program Files/Apache Software Foundation/Apache2.2" will be interpreted by the
+# server as "C:/Program Files/Apache Software Foundation/Apache2.2/logs/foo.log".
 #
 # NOTE: Where filenames are specified, you must use forward slashes
 # instead of backslashes (e.g., "c:/apache" instead of "c:\apache").
-# If a drive letter is omitted, the drive on which httpd.exe is located
+# If a drive letter is omitted, the drive on which Apache.exe is located
 # will be used by default.  It is recommended that you always supply
-# an explicit drive letter in absolute paths to avoid confusion.
-ServerSignature On
-ServerTokens Full
+# an explicit drive letter in absolute paths, however, to avoid
+# confusion.
+#
+
+# ThreadsPerChild: constant number of worker threads in the server process
+# MaxRequestsPerChild: maximum  number of requests a server process serves
+ThreadsPerChild 250
+MaxRequestsPerChild  0
 
 #
 # ServerRoot: The top of the directory tree under which the server's
 # configuration, error, and log files are kept.
 #
 # Do not add a slash at the end of the directory path.  If you point
-# ServerRoot at a non-local disk, be sure to specify a local disk on the
-# Mutex directive, if file-based mutexes are used.  If you wish to share the
-# same ServerRoot for multiple httpd daemons, you will need to change at
-# least PidFile.
+# ServerRoot at a non-local disk, be sure to point the LockFile directive
+# at a local disk.  If you wish to share the same ServerRoot for multiple
+# httpd daemons, you will need to change at least LockFile and PidFile.
 #
-# Apache variable names used by Apache conf files:
-# The names and contents of variables:
-# APACHE24, VERSION_APACHE, INSTALL_DIR, APACHE_DIR, SRVROOT
-# should never be changed.
-Define APACHE24 Apache2.4
-Define VERSION_APACHE WAMPAPACHEVERSION
-Define INSTALL_DIR WAMPROOT
-Define APACHE_DIR ${INSTALL_DIR}/bin/apache/apache${VERSION_APACHE}
-Define SRVROOT ${INSTALL_DIR}/bin/apache/apache${VERSION_APACHE}
-
 ServerRoot "WAMPROOT/bin/apache/apacheWAMPAPACHEVERSION"
 
-#
-# Mutex: Allows you to set the mutex mechanism and mutex file directory
-# for individual mutexes, or change the global defaults
-#
-# Uncomment and change the directory if mutexes are file-based and the default
-# mutex file directory is not on a local disk or is not appropriate for some
-# other reason.
-#
-# Mutex default:logs
-
 #
 # Listen: Allows you to bind Apache to specific IP addresses and/or
 # ports, instead of the default. See also the <VirtualHost>
 # directive.
 #
 # Change this to Listen on specific IP addresses as shown below to 
-# prevent Apache from glomming onto all bound IP addresses.
+# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)
 #
 #Listen 12.34.56.78:80
-#Listen 0.0.0.0:80
-#Listen [::0]:80
 Listen WAMPAPACHEPORT
 
 #
@@ -83,136 +64,70 @@ Listen WAMPAPACHEPORT
 # Example:
 # LoadModule foo_module modules/mod_foo.so
 #
-LoadModule access_compat_module modules/mod_access_compat.so
 LoadModule actions_module modules/mod_actions.so
 LoadModule alias_module modules/mod_alias.so
-LoadModule allowmethods_module modules/mod_allowmethods.so
 LoadModule asis_module modules/mod_asis.so
 LoadModule auth_basic_module modules/mod_auth_basic.so
-LoadModule auth_digest_module modules/mod_auth_digest.so
-#LoadModule auth_form_module modules/mod_auth_form.so
+#LoadModule auth_digest_module modules/mod_auth_digest.so
 #LoadModule authn_anon_module modules/mod_authn_anon.so
-LoadModule authn_core_module modules/mod_authn_core.so
-#LoadModule authn_dbd_module modules/mod_authn_dbd.so
 #LoadModule authn_dbm_module modules/mod_authn_dbm.so
+LoadModule authn_default_module modules/mod_authn_default.so
 LoadModule authn_file_module modules/mod_authn_file.so
-#LoadModule authn_socache_module modules/mod_authn_socache.so
-#LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so
-#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
-LoadModule authz_core_module modules/mod_authz_core.so
-#LoadModule authz_dbd_module modules/mod_authz_dbd.so
 #LoadModule authz_dbm_module modules/mod_authz_dbm.so
+LoadModule authz_default_module modules/mod_authz_default.so
 LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
 LoadModule authz_host_module modules/mod_authz_host.so
-#LoadModule authz_owner_module modules/mod_authz_owner.so
 LoadModule authz_user_module modules/mod_authz_user.so
 LoadModule autoindex_module modules/mod_autoindex.so
-#LoadModule brotli_module modules/mod_brotli.so
-#LoadModule buffer_module modules/mod_buffer.so
-LoadModule cache_module modules/mod_cache.so
-LoadModule cache_disk_module modules/mod_cache_disk.so
-#LoadModule cache_socache_module modules/mod_cache_socache.so
 #LoadModule cern_meta_module modules/mod_cern_meta.so
 LoadModule cgi_module modules/mod_cgi.so
-#LoadModule charset_lite_module modules/mod_charset_lite.so
-#LoadModule data_module modules/mod_data.so
 #LoadModule dav_module modules/mod_dav.so
 #LoadModule dav_fs_module modules/mod_dav_fs.so
-#LoadModule dav_lock_module modules/mod_dav_lock.so
-#LoadModule dbd_module modules/mod_dbd.so
 #LoadModule deflate_module modules/mod_deflate.so
 LoadModule dir_module modules/mod_dir.so
-#LoadModule dumpio_module modules/mod_dumpio.so
 LoadModule env_module modules/mod_env.so
-#LoadModule expires_module modules/mod_expires.so
-#LoadModule ext_filter_module modules/mod_ext_filter.so
-LoadModule file_cache_module modules/mod_file_cache.so
-#LoadModule filter_module modules/mod_filter.so
-#LoadModule http2_module modules/mod_http2.so
+LoadModule expires_module modules/mod_expires.so
+#LoadModule file_cache_module modules/mod_file_cache.so
 #LoadModule headers_module modules/mod_headers.so
-#LoadModule heartbeat_module modules/mod_heartbeat.so
-#LoadModule heartmonitor_module modules/mod_heartmonitor.so
-#LoadModule ident_module modules/mod_ident.so
-#LoadModule imagemap_module modules/mod_imagemap.so
+LoadModule imagemap_module modules/mod_imagemap.so
 LoadModule include_module modules/mod_include.so
 #LoadModule info_module modules/mod_info.so
 LoadModule isapi_module modules/mod_isapi.so
-#LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so
-#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so
-#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so
-#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so
-#LoadModule ldap_module modules/mod_ldap.so
-#LoadModule logio_module modules/mod_logio.so
 LoadModule log_config_module modules/mod_log_config.so
-#LoadModule log_debug_module modules/mod_log_debug.so
-#LoadModule log_forensic_module modules/mod_log_forensic.so
-#LoadModule lua_module modules/mod_lua.so
-#LoadModule macro_module modules/mod_macro.so
-#LoadModule md_module modules/mod_md.so
 LoadModule mime_module modules/mod_mime.so
 #LoadModule mime_magic_module modules/mod_mime_magic.so
-LoadModule negotiation_module modules/mod_negotiation.so
 #LoadModule proxy_module modules/mod_proxy.so
 #LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
 #LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
 #LoadModule proxy_connect_module modules/mod_proxy_connect.so
-#LoadModule proxy_express_module modules/mod_proxy_express.so
-#LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
-#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
-#LoadModule proxy_hcheck_module modules/mod_proxy_hcheck.so
-#LoadModule proxy_html_module modules/mod_proxy_html.so
 #LoadModule proxy_http_module modules/mod_proxy_http.so
-#LoadModule proxy_http2_module modules/mod_proxy_http2.so
-#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so
-#LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so
-#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so
-#LoadModule ratelimit_module modules/mod_ratelimit.so
-#LoadModule reflector_module modules/mod_reflector.so
-#LoadModule remoteip_module modules/mod_remoteip.so
-#LoadModule request_module modules/mod_request.so
-#LoadModule reqtimeout_module modules/mod_reqtimeout.so
+#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
+LoadModule negotiation_module modules/mod_negotiation.so
 LoadModule rewrite_module modules/mod_rewrite.so
-#LoadModule sed_module modules/mod_sed.so
-#LoadModule session_module modules/mod_session.so
-#LoadModule session_cookie_module modules/mod_session_cookie.so
-#LoadModule session_crypto_module modules/mod_session_crypto.so
-#LoadModule session_dbd_module modules/mod_session_dbd.so
 LoadModule setenvif_module modules/mod_setenvif.so
-#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so
-#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
-#LoadModule socache_dbm_module modules/mod_socache_dbm.so
-#LoadModule socache_memcache_module modules/mod_socache_memcache.so
-#LoadModule socache_redis_module modules/mod_socache_redis.so
-#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
 #LoadModule speling_module modules/mod_speling.so
-#LoadModule ssl_module modules/mod_ssl.so
-#LoadModule status_module modules/mod_status.so
-#LoadModule substitute_module modules/mod_substitute.so
+LoadModule status_module modules/mod_status.so
 #LoadModule unique_id_module modules/mod_unique_id.so
 LoadModule userdir_module modules/mod_userdir.so
 #LoadModule usertrack_module modules/mod_usertrack.so
-#LoadModule version_module modules/mod_version.so
 LoadModule vhost_alias_module modules/mod_vhost_alias.so
-#LoadModule watchdog_module modules/mod_watchdog.so
-#LoadModule xml2enc_module modules/mod_xml2enc.so
+#LoadModule ssl_module modules/mod_ssl.so
+LoadModule php5_module "WAMPROOT/bin/php/phpWAMPPHPVERSION/php5apache2_2.dll"
 
-PHPIniDir "${APACHE_DIR}/bin"
-#LoadModule WAMPAPACHELOADMODULE "${INSTALL_DIR}/bin/php/phpWAMPPHPVERSIONWEB/WAMPPHPAPACHEDLL"
-LoadModule php7_module "WAMPROOT/bin/php/phpWAMPPHPVERSION/php7apache2_4.dll"
+#
+# ExtendedStatus controls whether Apache will generate "full" status
+# information (ExtendedStatus On) or just basic information (ExtendedStatus
+# Off) when the "server-status" handler is called. The default is Off.
+#
+ExtendedStatus On
 
-<IfModule unixd_module>
-#
-# If you wish httpd to run as a different user or group, you must run
-# httpd as root initially and it will switch.
-#
-# User/Group: The name (or #number) of the user/group to run httpd as.
-# It is usually good practice to create a dedicated user and group for
-# running httpd, as with most system services.
-#
-User daemon
-Group daemon
+<Location /server-status>
+SetHandler server-status
+Order Deny,Allow
+Deny from all
+Allow from localhost, 127.0.0.1
+</Location>
 
-</IfModule>
 
 # 'Main' server configuration
 #
@@ -231,7 +146,7 @@ Group daemon
 # e-mailed.  This address appears on some server-generated pages, such
 # as error documents.  e.g. admin@your-domain.com
 #
-ServerAdmin doliwamp@localhost
+ServerAdmin webmaster@localhost
 
 #
 # ServerName gives the name and port that the server uses to identify itself.
@@ -243,13 +158,62 @@ ServerAdmin doliwamp@localhost
 ServerName localhost
 
 #
-# Deny access to the entirety of your server's filesystem. You must
-# explicitly permit access to web content directories in other
-# <Directory> blocks below.
+# ServerTokens
+# This directive configures what you return as the Server HTTP response
+# Header. The default is 'Full' which sends information about the OS-Type
+# and compiled in modules.
+# Set to one of:  Full | OS | Minor | Minimal | Major | Prod
+# where Full conveys the most information, and Prod the least.
+#
+#ServerTokens Prod
+
+#
+# DocumentRoot: The directory out of which you will serve your
+# documents. By default, all requests are taken from this directory, but
+# symbolic links and aliases may be used to point to other locations.
+#
+DocumentRoot "WAMPROOT/www/"
+
+
+#
+# Timeout: The number of seconds before receives and sends time out.
+#
+Timeout 300
+
+#
+# KeepAlive: Whether or not to allow persistent connections (more than
+# one request per connection). Set to "Off" to deactivate.
+#
+KeepAlive On
+
+#
+# MaxKeepAliveRequests: The maximum number of requests to allow
+# during a persistent connection. Set to 0 to allow an unlimited amount.
+# We recommend you leave this number high, for maximum performance.
+#
+MaxKeepAliveRequests 500
+
+#
+# KeepAliveTimeout: Number of seconds to wait for the next request from the
+# same client on the same connection.
+#
+KeepAliveTimeout 30
+
+
+#
+# Each directory to which Apache has access can be configured with respect
+# to which services and features are allowed and/or disabled in that
+# directory (and its subdirectories). 
+#
+# First, we configure the "default" to be a very restrictive set of 
+# features.  
 #
 <Directory />
-    AllowOverride none
-    Require all denied
+    Options FollowSymLinks
+    AllowOverride None
+    Order deny,allow
+    Deny from all
+    Satisfy all
 </Directory>
 
 #
@@ -258,15 +222,12 @@ ServerName localhost
 # you might expect, make sure that you have specifically enabled it
 # below.
 #
-HostnameLookups Off
 
 #
-# DocumentRoot: The directory out of which you will serve your
-# documents. By default, all requests are taken from this directory, but
-# symbolic links and aliases may be used to point to other locations.
+# This should be changed to whatever you set DocumentRoot to.
 #
-DocumentRoot "${INSTALL_DIR}/www"
-<Directory "${INSTALL_DIR}/www/">
+<Directory "WAMPROOT/www/">
+
     #
     # Possible values for the Options directive are "None", "All",
     # or any combination of:
@@ -276,23 +237,26 @@ DocumentRoot "${INSTALL_DIR}/www"
     # doesn't give it to you.
     #
     # The Options directive is both complicated and important.  Please see
-    # http://httpd.apache.org/docs/2.4/mod/core.html#options
+    # http://httpd.apache.org/docs/2.2/mod/core.html#options
     # for more information.
     #
-    Options +Indexes +FollowSymLinks +Multiviews
+    Options Indexes FollowSymLinks
 
     #
     # AllowOverride controls what directives may be placed in .htaccess files.
     # It can be "All", "None", or any combination of the keywords:
-    #   AllowOverride FileInfo AuthConfig Limit
+    #   Options FileInfo AuthConfig Limit
     #
     AllowOverride all
 
     #
     # Controls who can get stuff from this server.
     #
-#   Don't modify this line - Instead modify Require of VirtualHost in httpd-vhost.conf
-    Require local
+#   onlineoffline tag - don't remove
+    Order Deny,Allow
+    Deny from all
+    Allow from 127.0.0.1
+
 </Directory>
 
 #
@@ -307,9 +271,10 @@ DocumentRoot "${INSTALL_DIR}/www"
 # The following lines prevent .htaccess and .htpasswd files from being 
 # viewed by Web clients. 
 #
-<Files ".ht*">
-    Require all denied
-</Files>
+<FilesMatch "^\.ht">
+    Order allow,deny
+    Deny from all
+</FilesMatch>
 
 #
 # ErrorLog: The location of the error log file.
@@ -318,8 +283,7 @@ DocumentRoot "${INSTALL_DIR}/www"
 # logged here.  If you *do* define an error logfile for a <VirtualHost>
 # container, that host's errors will be logged there and not here.
 #
-
-ErrorLog "${INSTALL_DIR}/logs/apache_error.log"
+ErrorLog "WAMPROOT/logs/apache_error.log"
 
 #
 # LogLevel: Control the number of messages logged to the error_log.
@@ -348,13 +312,13 @@ LogLevel warn
     # define per-<VirtualHost> access logfiles, transactions will be
     # logged therein and *not* in this file.
     #
-    CustomLog "${INSTALL_DIR}/logs/access.log" common
+    CustomLog "WAMPROOT/logs/access.log" common
 
     #
     # If you prefer a logfile with access, agent, and referer information
     # (Combined Logfile Format) you can use the following directive.
     #
-    #CustomLog "logs/access.log" combined
+    #CustomLog logs/access.log combined
 </IfModule>
 
 <IfModule alias_module>
@@ -363,7 +327,7 @@ LogLevel warn
     # exist in your server's namespace, but do not anymore. The client 
     # will make a new request for the document at its new location.
     # Example:
-    # Redirect permanent /foo http://www.example.com/bar
+    # Redirect permanent /foo http://localhost/bar
 
     #
     # Alias: Maps web paths into filesystem paths and is used to
@@ -384,36 +348,69 @@ LogLevel warn
     # client.  The same rules about trailing "/" apply to ScriptAlias
     # directives as to Alias.
     #
-    ScriptAlias /cgi-bin/ "${SRVROOT}/cgi-bin/"
+    ScriptAlias /cgi-bin/ "cgi-bin/"
 
 </IfModule>
 
-<IfModule cgid_module>
 #
-    # ScriptSock: On threaded servers, designate the path to the UNIX
-    # socket used to communicate with the CGI daemon of mod_cgid.
-    #
-    #Scriptsock cgisock
-</IfModule>
-
-#
-# "${SRVROOT}/cgi-bin" should be changed to whatever your ScriptAliased
+# "C:/Program Files/Apache Software Foundation/Apache2.2/cgi-bin" should be changed to whatever your ScriptAliased
 # CGI directory exists, if you have that configured.
 #
-<Directory "${SRVROOT}/cgi-bin">
+<Directory "cgi-bin">
     AllowOverride None
     Options None
-    Require all granted
+    Order allow,deny
+    Allow from all
 </Directory>
 
-<IfModule headers_module>
 # 
-    # Avoid passing HTTP_PROXY environment to CGI's on this or any proxied
-    # backend servers which have lingering "httpoxy" defects.
-    # 'Proxy' request header is undefined by the IETF, not listed by IANA
+# Apache parses all CGI scripts for the shebang line by default.
+# This comment line, the first line of the script, consists of the symbols
+# pound (#) and exclamation (!) followed by the path of the program that 
+# can execute this specific script.  For a perl script, with perl.exe in
+# the C:\Program Files\Perl directory, the shebang line should be:
+
+   #!c:/program files/perl/perl
+
+# Note you _must_not_ indent the actual shebang line, and it must be the
+# first line of the file.  Of course, CGI processing must be enabled by 
+# the appropriate ScriptAlias or Options ExecCGI directives for the files 
+# or directory in question.
 #
-    RequestHeader unset Proxy early
-</IfModule>
+# However, Apache on Windows allows either the Unix behavior above, or can
+# use the Registry to match files by extention.  The command to execute 
+# a file of this type is retrieved from the registry by the same method as 
+# the Windows Explorer would use to handle double-clicking on a file.
+# These script actions can be configured from the Windows Explorer View menu, 
+# 'Folder Options', and reviewing the 'File Types' tab.  Clicking the Edit
+# button allows you to modify the Actions, of which Apache 1.3 attempts to
+# perform the 'Open' Action, and failing that it will try the shebang line.
+# This behavior is subject to change in Apache release 2.0.
+#
+# Each mechanism has it's own specific security weaknesses, from the means
+# to run a program you didn't intend the website owner to invoke, and the
+# best method is a matter of great debate.
+#
+# To enable the this Windows specific behavior (and therefore -disable- the
+# equivilant Unix behavior), uncomment the following directive:
+#
+#ScriptInterpreterSource registry
+#
+# The directive above can be placed in individual <Directory> blocks or the
+# .htaccess file, with either the 'registry' (Windows behavior) or 'script' 
+# (Unix behavior) option, and will override this server default option.
+#
+
+#
+# DefaultType: the default MIME type the server will use for a document
+# if it cannot otherwise determine one, such as from filename extensions.
+# If your server contains mostly text or HTML documents, "text/plain" is
+# a good value.  If most of your content is binary, such as applications
+# or images, you may want to use "application/octet-stream" instead to
+# keep browsers from trying to display binary files as though they are
+# text.
+#
+DefaultType text/plain
 
 <IfModule mime_module>
     #
@@ -431,8 +428,8 @@ LogLevel warn
     # AddEncoding allows you to have certain browsers uncompress
     # information on the fly. Note: Not all browsers support this.
     #
-    AddEncoding x-compress .Z
-    AddEncoding x-gzip .gz .tgz
+    #AddEncoding x-compress .Z
+    #AddEncoding x-gzip .gz .tgz
     #
     # If the AddEncoding directives above are commented-out, then you
     # probably should define those extensions to indicate media types:
@@ -480,34 +477,19 @@ LogLevel warn
 #ErrorDocument 500 "The server made a boo boo."
 #ErrorDocument 404 /missing.html
 #ErrorDocument 404 "/cgi-bin/missing_handler.pl"
-#ErrorDocument 402 http://www.example.com/subscription_info.html
+#ErrorDocument 402 http://localhost/subscription_info.html
 #
 
-#
-# MaxRanges: Maximum number of Ranges in a request before
-# returning the entire resource, or one of the special
-# values 'default', 'none' or 'unlimited'.
-# Default setting is to accept 200 Ranges.
-#MaxRanges unlimited
-
 #
 # EnableMMAP and EnableSendfile: On systems that support it, 
-# memory-mapping or the sendfile syscall may be used to deliver
+# memory-mapping or the sendfile syscall is used to deliver
 # files.  This usually improves server performance, but must
 # be turned off when serving from networked-mounted 
 # filesystems or if support for these functions is otherwise
 # broken on your system.
-# Defaults: EnableMMAP On, EnableSendfile Off
 #
-EnableMMAP off
-EnableSendfile off
-
-# AcceptFilter: On Windows, none uses accept() rather than AcceptEx() and
-# will not recycle sockets between connections. This is useful for network
-# adapters with broken driver support, as well as some virtual network
-# providers such as vpn drivers, or spam, virus or spyware filters.
-AcceptFilter http none
-AcceptFilter https none
+#EnableMMAP off
+#EnableSendfile off
 
 # Supplemental configuration
 #
@@ -546,19 +528,17 @@ Include conf/extra/httpd-autoindex.conf
 # Various default settings
 #Include conf/extra/httpd-default.conf
 
-# Configure mod_proxy_html to understand HTML4/XHTML1
-<IfModule proxy_html_module>
-Include conf/extra/proxy-html.conf
-</IfModule>
+
 
 # Secure (SSL/TLS) connections
-#Include conf/extra/httpd-ssl.conf
 #
 # Note: The following must must be present to support
 #       starting without SSL on platforms with no /dev/random equivalent
 #       but a statically compiled-in mod_ssl.
 #
+
 <IfModule ssl_module>
+
 SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
 
@@ -753,4 +733,40 @@ SSLCertificateKeyFile "WAMPROOT/myserver.key"
 
 </IfModule>
 
-Include "${INSTALL_DIR}/alias/*.conf"
+
+
+# OPTIMIZE: To use gzip compression (for already compressed files).
+# Note that constant MAIN_OPTIMIZE_SPEED must have a value with bit 0 set. 
+#AddType text/javascript .jgz
+#AddEncoding gzip .jgz
+
+# OPTIMIZE: To use gzip compression (on the fly).
+# Note that you must also enable the module mod_deflate.
+# You can also set this with constant MAIN_OPTIMIZE_SPEED and bit 2 set. 
+#TODO
+
+# OPTIMIZE: To use cache on static pages (A259200 = 1 month).
+# Note that you must also enable the module mod_expires.
+#ExpiresActive On
+#ExpiresByType image/x-icon A2592000
+#ExpiresByType image/gif A2592000
+#ExpiresByType image/png A2592000
+#ExpiresByType image/jpeg A2592000
+#ExpiresByType text/css A2592000
+#ExpiresByType text/javascript A2592000
+#ExpiresByType application/x-javascript A2592000
+#ExpiresByType application/javascript A2592000
+    
+
+# To protect Dolibarr with HTTP Auth
+#<Location /dolibarr>
+#       Options +Indexes
+#       AuthUserFile /var/www/.htpasswd
+#       AuthName "Zone authent basic Dolibarr"
+#       AuthType Basic
+#       require user test
+#</Location>
+
+
+# Declare alias for Dolibarr, PHPMyAdmin and other softwares
+Include "WAMPROOT/alias/*.conf"

build/exe/doliwamp/index.php.install

@@ -527,15 +527,15 @@ a:hover {
 </head>
 
 <body>
-<table width="100%"><tr><td class="left">
+<table width="100%"><tr><td align="left">
 	<img src="index.php?img=pngLogo">
 </td>
-<td class="right">
+<td align="right">
 	<ul class="utility">
 		<li><a href="?lang={$langues[$langue]['autreLangueLien1']}">{$langues[$langue]['autreLangue1']}</a>
 		- <a href="?lang={$langues[$langue]['autreLangueLien2']}">{$langues[$langue]['autreLangue2']}</a></li>
 		<br><br>
-		<li>Provided by <a href="https://www.nltechno.com" targer="_blank">NLTechno</a></li>
+		<li>Provided by <a href="http://www.nltechno.com" targer="_blank">NLTechno</a></li>
 	</ul>
 </td></tr></table>
 <hr>
@@ -580,7 +580,7 @@ a:hover {
 
 
 	<ul id="foot">
-		<li><a href="https://www.nltechno.com/pages/dolibarrwinbin.php">DoliWamp project</a> was built from modified sources of <a href="http://www.wampserver.com">WampServer project</a> from Anaska</li>
+		<li><a href="http://www.nltechno.com/pages/dolibarrwinbin.php">DoliWamp project</a> was built from modified sources of <a href="http://www.wampserver.com">WampServer project</a> from Anaska</li>
 	</ul>
 </body>
 </html>

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

@@ -5,8 +5,7 @@
 // during install process to be used.
 //
 //
-$force_install_type='doliwamp';
-$force_install_noedit=2;		// 1=To block vars specific to distrib, 2 to block all technical parameters
+$force_install_noedit=2;
 $force_install_message='KeepDefaultValuesWamp';
 $force_install_main_data_root='WAMPROOT/dolibarr_documents';
 $force_install_type='mysqli';

build/exe/doliwamp/install_services.bat.install

@@ -8,23 +8,14 @@ echo ---- Execute install_services.bat >> doliwamp.log 2>>&1
 REM NET STOP doliwampapache
 REM NET STOP doliwampmysqld 
 
-cd "WAMPROOT"
-
 REM Apache x.x
-.\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k install -n doliwampapache >> doliwamp.log 2>>&1
+.\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k install -n doliwampapache
 REM reg add HKLM\SYSTEM\CurrentControlSet\Services\doliwampapache /V Start /t REG_DWORD /d 3 /f
 
 REM Mysql 5.0-
-REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --install-manual doliwampmysqld
-REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --install doliwampmysqld
+REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --install-manual doliwampmysqld
+.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --install doliwampmysqld
 REM Mysql 5.1+
 REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --install doliwampmysqld
-REM Mariadb
-REM The mysql_install_db allows to not provide files into mysql dir but does not return to prompt so install hangs
-REM .\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysql_install_db.exe --datadir=WAMPROOT/bin/mariadb/data --port=WAMPMYSQLPORT --password=WAMPMYSQLXXX >> doliwamp.log 2>>&1
-.\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysql_install_db.exe --datadir=WAMPROOT/bin/mariadb/data --port=WAMPMYSQLPORT >> doliwamp.log 2>>&1
-.\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysqld.exe --install doliwampmysqld >> doliwamp.log 2>>&1
 
 echo ---- End script >> doliwamp.log 2>>&1
-
-REM pause

build/exe/doliwamp/my.ini.install

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