Fix: Removed tables of external modules

Fix phpunit to be compatible with new version of phpunit
2014-08-06 10:36:44 +02:00 · 2014-05-02 00:08:34 +02:00
11350 changed files with 826786 additions and 1170261 deletions
--- a/.codeclimate.yml
+++ b/.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/*'
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,16 +0,0 @@
-build
-build.xml
-ChangeLog
-composer.json
-CONTRIBUTING.md
-COPYING
-COPYRIGHT
-dev
-doc
-Dockerfile
-INSTALL
-README-FR.md
-README.md
-robots.txt
-scripts
-test
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,19 +0,0 @@
-# EditorConfig is awesome: http://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
-[*.js]
-indent_style = tab
-[*.css]
-indent_style = tab
-[*.xml]
-indent_style = tab
-[*.md]
-trim_trailing_whitespace = false
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,52 +0,0 @@
-# Set default behaviour, in case users don't have core.autocrlf set.
-# More info: https://help.github.com/articles/dealing-with-line-endings
-* text=auto
-
-
-# Explicitly declare text files we want to always be normalized and converted 
-# to native line endings on checkout.
-*.php text eol=lf
-*.pl text eol=lf
-*.sql text eol=lf
-*.htm text eol=lf
-*.html text eol=lf
-*.js text eol=lf
-*.css text eol=lf
-*.lang text eol=lf
-*.txt text eol=lf
-*.md text eol=lf
-*.pp text eol=lf
-*.sh text eol=lf
-*.yaml text eol=lf
-
-.bash_aliases text eol=lf
-
-# Denote all files that are truly binary and should not be modified.
-*.bmp binary
-*.ico binary
-*.png binary
-*.jpg binary
-*.odt binary
-*.odf binary
-*.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
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,135 +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](http://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 your 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
-```
-
-#### Keyword
-In uppercase if you want to have the log comment appears into the generated ChangeLog file.
-
-The keyword can be ommitted if your commit does not fit in any of the following categories:
- Fix: for a bug fix
- Close: for closing a referenced feature request
- New: for an unreferenced new feature (Opening a feature request and using close is prefered)
-
-#### Issuenum
-If your commit fixes a referenced bug or feature request.
-
-In the form of a # followed by the GitHub issue number.
-
-#### Desc
-A short description of the commit content.
-
-This should ideally be less than 50 characters.
-
-#### LongDesc
-A long description of the commit content.
-
-You can really go to town here and explain in depth what you've been doing.
-
-Feel free to express technical details, use cases or anything relevant to the current commit.
-
-This section can span multiple lines.
-
-Try to keep lines under 120 characters.
-
-#### Samples
-<pre>
-FIX|Fix #456 Short description (where #456 is number of bug fix, if it exists. In upper case to appear into ChangeLog)
-or
-CLOSE|Close #456 Short description (where #456 is number of feature request, 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
-Short description (when the commit is not introducing feature nor closing a bug)
-
-Long description (Can span accross multiple lines).
-</pre>
-
-### Pull Requests
-When submitting a pull request, use same rule as [Commits](#commits) for the message.
-
-If your pull request only contains one commit, GitHub will be smart enough to fill it for you.
-Otherwise, please be a bit verbose about what you're providing.
-
-Your Pull Request must pass the Continuous Integration checks.
-Also, some code changes need a prior approbation:
-
-* if you want to include a new external library (into htdocs/includes directory), please ask before to the project manager (@eldy) to see if such a library can be accepted.
-
-* if you add a new table, you must first create a page on http://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Than ask the project manager (@eldy) if the new data model you plan to add can be accepted as you suggest.
-
-### Resources
-[Developer documentation](http://wiki.dolibarr.org/index.php/Developer_documentation)
-
-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/).
-
-Join an existing translation team or create your own and translate into the interface.
-
-Your translations will be available in the next major release.
-
-### Resources
-[Translator documentation](http://wiki.dolibarr.org/index.php/Translator_documentation)
-
-Documentation
-------------
-The project's documentation is maintained on the [Wiki](http://wiki.dolibarr.org/index.php).
-
-*Note*: to help prevent spam, you need to create an account before being able to edit.
-
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,41 +0,0 @@
-# Instructions
-*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
-*Please:*
- *only keep the "Bug" or "Feature Request" section*
- *replace the bracket enclosed texts with meaningful informations*
- *remove any unused sub-section*
-
-
-# Bug
-[*Short description*]
-
-## Environment
- **Version**: [*Affected Dolibarr version(s)*]
- **OS**: [*Server OS type and version*]
- **Web server**: [*Webserver type and version*]
- **PHP**: [*PHP version*]
- **Database**: [*Database type and version*]
- **URL(s)**: [*Affected URL(s)*]
-
-## Expected and actual behavior
-[*Verbose description*]
-
-## Steps to reproduce the behavior
-[*Verbose description*]
-
-## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)
-[*Files*]
-
-
-
-# Feature Request
-[*Short description*]
-
-## Use case
-[*Verbose description*]
-
-## Suggested implementation
-[*Verbose description*]
-
-## Suggested steps
-[*List of tasks to achieve goal*]
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.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*]
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1,15 @@
 htdocs/conf/conf.php
 htdocs/conf/conf.php.old
 documents/
+custom/
 custom2/
-test/report/
+test/
 nbproject
 default.properties
 .settings/
 .buildpath
 .gitmodules
 dolibarr_install.log
-upgrade.log
 doxygen_warnings.log
 /.project
 .DS_Store
-.idea
-*.iml
-Thumbs.db
-# Vagrant generated files
-.vagrant
-# Composer installed repositories
-/htdocs/includes/**/.git
-# Composer autoloader and unwanted files
-htdocs/includes/autoload.php
-htdocs/includes/bin/
-htdocs/includes/composer/
--- a/.gitmessage
+++ b/.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 ]=====^|
--- a/.mailmap
+++ b/.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@capnetworks.com> Regis Houssin <regis@dolibarr.fr>
-Regis Houssin <regis.houssin@capnetworks.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 García de La Fuente <marcosgdf@gmail.com> Marcos García <marcosgdf@gmail.com>
-Marcos Garcí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.dolibarr@gmail.com> aspangaro <aspangaro.dolibarr@gmail.com>
-Alexandre Spangaro <aspangaro.dolibarr@gmail.com> Spangaro Alexandre <aspangaro.dolibarr@gmail.com>
-Alexandre Spangaro <aspangaro.dolibarr@gmail.com> Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
-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>
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -1,225 +0,0 @@
-# .scrutinizer.yml
-imports:
-    - javascript
-    - php
-
-filter:
-    excluded_paths:
-        - build/*
-        - dev/*
-        - doc/*
-        - test/*
-        - htdocs/includes/*
-    paths: 
-        - htdocs/*
-        - scripts/*
-    
-tools:
-    # php_analyzer. Doc on https://scrutinizer-ci.com/docs/tools/php/php-analyzer/
-    php_analyzer:
-        enabled: true
-        extensions:
-            - php
-        dependency_paths: 
-            - htdocs/includes/
-        filter:
-            excluded_paths:
-                - build/*
-                - dev/*
-                - doc/*
-                - test/*
-                - htdocs/includes/*
-            paths:
-                - htdocs/
-                - scripts/
-        config:
-            parameter_reference_check:
-                enabled:              true
-            checkstyle:
-                enabled:              false
-                no_trailing_whitespace:  true
-                naming:
-                    enabled:              true
-                    local_variable:       ^[a-z][a-zA-Z0-9]*$
-                    abstract_class_name:  ^Abstract|Factory$
-                    utility_class_name:   Utils?$
-                    constant_name:        ^[A-Z][A-Z0-9]*(?:_[A-Z0-9]+)*$
-                    property_name:        ^[a-z][a-zA-Z0-9]*$
-                    method_name:          ^(?:[a-z]|__)[a-zA-Z0-9]*$
-                    parameter_name:       ^[a-z][a-zA-Z0-9]*$
-                    interface_name:       ^[A-Z][a-zA-Z0-9]*Interface$
-                    type_name:            ^[A-Z][a-zA-Z0-9]*$
-                    exception_name:       ^[A-Z][a-zA-Z0-9]*Exception$
-                    isser_method_name:    ^(?:is|has|should|may|supports)
-            unreachable_code:
-                enabled:              true
-            check_access_control:
-                enabled:              true
-            typo_checks:
-                enabled:              true
-            check_variables:
-                enabled:              true
-            check_calls:
-                enabled:              true
-                too_many_arguments:   true
-                missing_argument:     true
-                argument_type_checks:  lenient # Allowed Values: "disabled", "lenient", "strict"
-            suspicious_code:
-                enabled:              true
-                overriding_parameter:  false
-                overriding_closure_use:  true
-                parameter_closure_use_conflict:  true
-                parameter_multiple_times:  true
-                non_existent_class_in_instanceof_check:  true
-                non_existent_class_in_catch_clause:  true
-                assignment_of_null_return:  true
-                non_commented_switch_fallthrough:  true
-                non_commented_empty_catch_block:  true
-                overriding_private_members:  true
-                use_statement_alias_conflict:  true
-                precedence_in_condition_assignment:  true
-            dead_assignments:
-                enabled:              true
-            verify_php_doc_comments:
-                enabled:              false
-                parameters:           true
-                return:               true
-                suggest_more_specific_types:  true
-                ask_for_return_if_not_inferrable:  true
-                ask_for_param_type_annotation:  true
-            loops_must_use_braces:
-                enabled:              true
-            check_usage_context:
-                enabled:              true
-            simplify_boolean_return:
-                enabled:              false
-            phpunit_checks:
-                enabled:              false
-            reflection_checks:
-                enabled:              true
-
-            # Checks Common Precedence Mistakes
-            precedence_checks:
-                enabled:              true
-                assignment_in_condition:  true
-                comparison_of_bit_result:  true
-            basic_semantic_checks:
-                enabled:              true
-            # Disabled unused code. In most cases, we want to keep it.
-            unused_code:
-                enabled:              false		
-            deprecation_checks:
-                enabled:              true
-            useless_function_calls:
-                enabled:              true
-            metrics_lack_of_cohesion_methods:
-                enabled:              true
-            metrics_coupling:
-                enabled:              true
-                stable_code:
-                    namespace_prefixes:   []
-                    classes:              []
-            doctrine_parameter_binding:
-                enabled:              false
-            doctrine_entity_manager_injection:
-                enabled:              false
-            symfony_request_injection:
-                enabled:              false
-            doc_comment_fixes:
-                enabled:              true
-            reflection_fixes:
-                enabled:              false
-            use_statement_fixes:
-                enabled:              true
-                remove_unused:        true
-                # Whether you would like multiple imports in one USE statement to be preserved, e.g. ``use A, B;``.
-                preserve_multiple:    false
-                # Whether you would like to preserve blank lines between use statements.
-                preserve_blanklines:  false
-                order_alphabetically:  false
-         # To use specific config for a specific path, use path_configs: (see example on page https://scrutinizer-ci.com/docs/configuration/tool_config_structure)
-                        
-    # php_depend
-    php_pdepend:
-        enabled: false
-        configuration_file: null
-        suffixes:
-            - php
-        excluded_dirs: {  }
-        filter:
-            excluded_paths:
-                - 'build/*'
-                - 'dev/*'
-                - 'doc/*'
-                - 'test/*'
-                - 'htdocs/includes/*'
-            paths: {  }
-
-    # change tracking
-    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: {  }
-
-    # Similar code detection
-    php_sim:
-        enabled: false
-        min_mass: 30
-        filter:
-            excluded_paths:
-                - 'build/*'
-                - 'dev/*'
-                - 'doc/*'
-                - 'test/*'
-                - '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
-        use_native_config: true
-        extensions:
-            - js
-        filter:
-            excluded_paths:
-                - 'build/*'
-                - 'dev/*'
-                - 'doc/*'
-                - 'test/*'
-                - 'htdocs/includes/*'
-            paths: {  }
-        config: {  }
-        path_configs: {  }
-
-
-before_commands: {  }
-after_commands: {  }
-artifacts: {  }
-build_failure_conditions: {  }
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,336 +1,84 @@
 # This script is used by Travis CI to run automatically Continuous test integration
 # from Dolibarr GitHub repository.
+# Command run is phpunit
 # For syntax, see http://about.travis-ci.org/docs/user/languages/php/

-sudo: required
-
-language: php
-
-php:
- '5.3'
- '5.4'
- '5.5'
- '5.6'
- '7.0'
- nightly
-
-addons:
-  mariadb: '10.0'
-  # FIXME: find a way to import a MySQL dump into PostgreSQL
-  #postgresql: '9.3'
-  apt:
-    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
-
-# Start on every boot
 services:
- memcached
+ - memcached # will start memcached
+
+# This will tell travis to run phpunit
+language: php
+php:
+ - "5.3"
+ - "5.4"

 env:
-  global:
-  # Set to true for very verbose output
-  - DEBUG=false
-  matrix:
-  # MariaDB overrides MySQL installation so it's not possible to test both yet
-  #- 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
-
-matrix:
-  fast_finish: true
-  allow_failures:
-  - php: nightly
-  # FIXME
-  #- env: DB=postgresql
-  # TODO
-  #- env: DB=sqlite
-
-notifications:
-  email:
-    on_success: never # [always|never|change] default: change
-    on_failure: change # [always|never|change] default: always
-  irc:
-    channels:
-    - "chat.freenode.net#dolibarr"
-    on_success: change
-    on_failure: always
-    use_notice: true
-
-before_install:
- |
-  echo "Disabling Xdebug for composer"
-  export PHP_VERSION_NAME=$(phpenv version-name)
-  cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/conf.d/xdebug.ini /tmp/xdebug.ini
-  phpenv config-rm xdebug.ini
-  echo
-
-install:
- |
-  echo "Updating Composer"
-  rm $TRAVIS_BUILD_DIR/composer.json
-  rm $TRAVIS_BUILD_DIR/composer.lock
-  composer self-update
-  composer -n init
-  composer -n config vendor-dir htdocs/includes
-  echo
-
- |
-  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" = 'nightly' ]; then
-    composer -n require phpunit/phpunit ^5
-  fi
-  echo
-
- |
-  echo "Installing PHP CodeSniffer"
-  composer -n require squizlabs/php_codesniffer ^2
-  echo
-
- |
-  echo "Adding path of binaries tools installed by composer to the PATH"
-  export PATH="$TRAVIS_BUILD_DIR/htdocs/includes/bin:$PATH"
-  echo
-  
+ - DB=mysql
+# - DB=postgres  

 before_script: 
- |
-  echo Start travis
-  echo Current dir is `pwd`
-  echo Home dir is `echo ~`
-  echo TRAVIS_BUILD_DIR is $TRAVIS_BUILD_DIR
+ - echo Start travis
+ - echo Current dir is `pwd`
+ - echo Home dir is `echo ~`
+ - echo Update composer
+# - ~/.phpenv/versions/$(phpenv version-name)/bin/composer.phar self-update 
+ - echo Create dir $(pwd)/htdocs/documents
+ - sudo mkdir -p $(pwd)/htdocs/documents/admin/temp;
+ - sudo touch $(pwd)/htdocs/documents/dolibarr.log;
+ - sudo chmod a+rwx /home; sudo chmod a+rwx /home/travis; sudo chmod -R a+rwx /home/travis/build;
+ - sudo chmod -R a+rwx $(pwd);
+ - sudo chown -R www-data:travis $(pwd)/htdocs/documents;
+ - find $(pwd)/htdocs/documents -type d -exec ls -alt {} \;
+ - echo Edit php.ini file
+ - echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+ - echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+# - echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+ - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+ - echo "zend_extension_ts = xdebug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+ - cat ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+ - echo Init database
+ - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS myapp_test;' -U postgres; fi"
+ - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE myapp_test;' -U postgres; fi"
+ - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'DROP DATABASE IF EXISTS myapp_test;'; fi"
+ - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE IF NOT EXISTS myapp_test;'; fi"
+ - sh -c "if [ '$DB' = 'mysql' ]; then mysql -D myapp_test < $(pwd)/dev/initdata/mysqldump_dolibarr_3.3.0.sql; fi"
+ - echo Create config file htdocs/conf/conf.php
+ - echo '<?php ' > htdocs/conf/conf.php
+ - sh -c "if [ '$DB' = 'pgsql' ]; then echo '$'dolibarr_main_db_type=\'pgsql\'';' >> htdocs/conf/conf.php; fi"
+ - sh -c "if [ '$DB' = 'mysql' ]; then echo '$'dolibarr_main_db_type=\'mysqli\'';' >> htdocs/conf/conf.php; fi"
+ - echo '$'dolibarr_main_url_root=\'http://localhost/\'';' >> htdocs/conf/conf.php
+ - echo '$'dolibarr_main_document_root=\'$(pwd)/htdocs\'';' >> htdocs/conf/conf.php
+ - echo '$'dolibarr_main_data_root=\'$(pwd)/htdocs/documents\'';' >> htdocs/conf/conf.php
+ - echo '$'dolibarr_main_db_host=\'localhost\'';' >> htdocs/conf/conf.php
+ - echo '$'dolibarr_main_db_name=\'myapp_test\'';' >> htdocs/conf/conf.php
+ - echo '$'dolibarr_main_db_user=\'travis\'';' >> htdocs/conf/conf.php
+ - echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> htdocs/conf/conf.php
+ - echo '?>' >> htdocs/conf/conf.php
+ - echo Show conf.php content
+ - cat htdocs/conf/conf.php
+ - echo Install apache server
+ - sudo apt-get update > /dev/null
+ - sudo apt-get install -y --force-yes apache2 libapache2-mod-php5 php5-curl php5-mysql php5-pgsql php5-intl
+ - sudo sed -i -e "s,/var/www,$(pwd)/htdocs,g" /etc/apache2/sites-available/default
+ - echo Show default virtual host
+ - sudo cat /etc/apache2/sites-available/default
+ - sudo /etc/init.d/apache2 restart
+ - wget http://localhost/
+ - cat index.html
 
- |
-  echo "Re-enabling Xdebug for PHP CodeSniffer and PHP Unit"
-  phpenv config-add /tmp/xdebug.ini
-  echo

- |
-  echo "Setting up PHP"
-  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
-
- |
-  if [ "$DEBUG" = true ]; then
-    echo "Debugging informations"
-    # Check PHP
-    php -i
-    # Check PHP CodeSniffer installation
-    which phpcs
-    phpcs --version
-    phpcs -i
-    # Check PHPUnit installation
-    which phpunit
-    phpunit --version
-    # Check MySQL
-    mysql --version
-    mysql -e "SELECT VERSION();"
-    echo
-  fi
-  
- |
-  echo "Setting up database"
-  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
-    echo "MySQL"
-    mysql -e 'DROP DATABASE IF EXISTS travis;'
-    mysql -e 'CREATE DATABASE IF NOT EXISTS travis;'
-    mysql -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
-  fi
-  # FIXME: find a way to import a MySQL dump into PostgreSQL
-  #if [ "$DB" = 'postgresql' ]; then
-  #  pgsql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
-  #fi
-  # TODO: SQLite
-  echo
-
- |
-  export CONF_FILE=htdocs/conf/conf.php
-  echo "Setting up Dolibarr $CONF_FILE"
-  echo '<?php ' > $CONF_FILE
-  echo '$'dolibarr_main_url_root=\'http://127.0.0.1\'';' >> $CONF_FILE
-  echo '$'dolibarr_main_document_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $CONF_FILE
-  echo '$'dolibarr_main_data_root=\'$TRAVIS_BUILD_DIR/documents\'';' >> $CONF_FILE
-  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
-  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
-    echo '$'dolibarr_main_db_type=\'mysqli\'';' >> $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
-
- |
-  echo "Create documents directory and set permissions"
-  # and admin/temp subdirectory needed for unit tests
-  mkdir -p documents/admin/temp
-  echo "first line" > documents/dolibarr.log
-  echo
-
- |
-  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
-    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
-  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/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

+# Omitting "script:" will default to phpunit
+# use the $DB env variable to determine the phpunit.xml to use
+#script: phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml --coverage-text test/phpunit/AllTests.php
+#script: phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml --coverage-text test/phpunit/BuildDocTest.php
+#script: phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml test/phpunit/WebservicesOtherTest.php
 script: 
- |
-  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
-
- |
-  echo "Checking PHP syntax errors"
-  # Ensure we catch errors
-  set -e
-  parallel-lint --exclude htdocs/includes --blame .
-  set +e
-  echo
-
-# TODO: dev/* checks
-
- |
-  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/codesniffer/ruleset.xml --encoding=utf-8 .
-  set +e
-  echo
-
-# TODO: Check Javascript (jshint?)
-
-# TODO: Check CSS (csslint?)
-
-# TODO: check SQL syntax (pgsanity?)
-
- |
-  echo "Upgrading Dolibarr"
-  # 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 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 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade390400-2.log
-  php step5.php 3.9.0 4.0.0 > $TRAVIS_BUILD_DIR/upgrade390400-3.log
-  cd -
-  set +e
-  echo
-  #cat $TRAVIS_BUILD_DIR/upgrade390400-2.log
-  #cat /tmp/dolibarr_install.log
-  
- |
-  echo "Unit testing"
-  # Ensure we catch errors. Set this to +e if you want to go to the end to see log file.
-  set -e
-  phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php
-  set +e
-
- |
-  #echo "Output dolibarr.log"
-  #echo cat documents/dolibarr.log
+# - phpcs -s --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/build/html/,/documents/,/includes/,/test/report/ .
+ - phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml test/phpunit/AllTests.php

 after_script:
- |
-  # Dolibarr log file
-  #echo "After script"
-  #cat documents/dolibarr.log
-
-
-after_success:
- |
-  echo Success
-
-after_failure:
- |
-  echo Failure
-  # This part of code seems to be never executed, error or not ???
-  echo "Debugging informations"
-  # Upgrade log files
-  cat *.log
-  echo "Debugging informations"
-  # Apache log file
-  sudo cat /var/log/apache2/error.log
-  # Dolibarr log file
-  cat documents/dolibarr.log
-  if [ "$DEBUG" = true ]; then
-    # MariaDB log file
-    sudo cat /var/log/mysql/error.log
-    # TODO: PostgreSQL log file
-    echo
-  fi
+# - echo Output dolibarr log file; cat $(pwd)/htdocs/documents/dolibarr.log
+ - echo Output apache log file; sudo cat /var/log/apache2/error.log
+ - echo End travis

--- a/.tx/config
+++ b/.tx/config
@@ -1,369 +0,0 @@
-[main]
-host = https://www.transifex.com
-lang_map = uz: uz_UZ, sw: sw_SW, sr@latin: sr_RS
-
-[dolibarr.accountancy]
-file_filter = htdocs/langs/<lang>/accountancy.lang
-source_file = htdocs/langs/en_US/accountancy.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.admin]
-file_filter = htdocs/langs/<lang>/admin.lang
-source_file = htdocs/langs/en_US/admin.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.agenda]
-file_filter = htdocs/langs/<lang>/agenda.lang
-source_file = htdocs/langs/en_US/agenda.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.banks]
-file_filter = htdocs/langs/<lang>/banks.lang
-source_file = htdocs/langs/en_US/banks.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.bills]
-file_filter = htdocs/langs/<lang>/bills.lang
-source_file = htdocs/langs/en_US/bills.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.bookmarks]
-file_filter = htdocs/langs/<lang>/bookmarks.lang
-source_file = htdocs/langs/en_US/bookmarks.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.boxes]
-file_filter = htdocs/langs/<lang>/boxes.lang
-source_file = htdocs/langs/en_US/boxes.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.cashdesk]
-file_filter = htdocs/langs/<lang>/cashdesk.lang
-source_file = htdocs/langs/en_US/cashdesk.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.categories]
-file_filter = htdocs/langs/<lang>/categories.lang
-source_file = htdocs/langs/en_US/categories.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.commercial]
-file_filter = htdocs/langs/<lang>/commercial.lang
-source_file = htdocs/langs/en_US/commercial.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.companies]
-file_filter = htdocs/langs/<lang>/companies.lang
-source_file = htdocs/langs/en_US/companies.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.compta]
-file_filter = htdocs/langs/<lang>/compta.lang
-source_file = htdocs/langs/en_US/compta.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.contracts]
-file_filter = htdocs/langs/<lang>/contracts.lang
-source_file = htdocs/langs/en_US/contracts.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.cron]
-file_filter = htdocs/langs/<lang>/cron.lang
-source_file = htdocs/langs/en_US/cron.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.deliveries]
-file_filter = htdocs/langs/<lang>/deliveries.lang
-source_file = htdocs/langs/en_US/deliveries.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.dict]
-file_filter = htdocs/langs/<lang>/dict.lang
-source_file = htdocs/langs/en_US/dict.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.donations]
-file_filter = htdocs/langs/<lang>/donations.lang
-source_file = htdocs/langs/en_US/donations.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.ecm]
-file_filter = htdocs/langs/<lang>/ecm.lang
-source_file = htdocs/langs/en_US/ecm.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.errors]
-file_filter = htdocs/langs/<lang>/errors.lang
-source_file = htdocs/langs/en_US/errors.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.exports]
-file_filter = htdocs/langs/<lang>/exports.lang
-source_file = htdocs/langs/en_US/exports.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.externalsite]
-file_filter = htdocs/langs/<lang>/externalsite.lang
-source_file = htdocs/langs/en_US/externalsite.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.ftp]
-file_filter = htdocs/langs/<lang>/ftp.lang
-source_file = htdocs/langs/en_US/ftp.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.help]
-file_filter = htdocs/langs/<lang>/help.lang
-source_file = htdocs/langs/en_US/help.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.holiday]
-file_filter = htdocs/langs/<lang>/holiday.lang
-source_file = htdocs/langs/en_US/holiday.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.hrm]
-file_filter = htdocs/langs/<lang>/hrm.lang
-source_file = htdocs/langs/en_US/hrm.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.incoterm]
-file_filter = htdocs/langs/<lang>/incoterm.lang
-source_file = htdocs/langs/en_US/incoterm.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.install]
-file_filter = htdocs/langs/<lang>/install.lang
-source_file = htdocs/langs/en_US/install.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.interventions]
-file_filter = htdocs/langs/<lang>/interventions.lang
-source_file = htdocs/langs/en_US/interventions.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.languages-not-res]
-file_filter = htdocs/langs/<lang>/languages.lang
-source_file = htdocs/langs/en_US/languages.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.ldap]
-file_filter = htdocs/langs/<lang>/ldap.lang
-source_file = htdocs/langs/en_US/ldap.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.link]
-file_filter = htdocs/langs/<lang>/link.lang
-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
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.mails]
-file_filter = htdocs/langs/<lang>/mails.lang
-source_file = htdocs/langs/en_US/mails.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.main]
-file_filter = htdocs/langs/<lang>/main.lang
-source_file = htdocs/langs/en_US/main.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.margins]
-file_filter = htdocs/langs/<lang>/margins.lang
-source_file = htdocs/langs/en_US/margins.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.members]
-file_filter = htdocs/langs/<lang>/members.lang
-source_file = htdocs/langs/en_US/members.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.oauth]
-file_filter = htdocs/langs/<lang>/oauth.lang
-source_file = htdocs/langs/en_US/oauth.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.opensurvey]
-file_filter = htdocs/langs/<lang>/opensurvey.lang
-source_file = htdocs/langs/en_US/opensurvey.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.orders]
-file_filter = htdocs/langs/<lang>/orders.lang
-source_file = htdocs/langs/en_US/orders.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.other]
-file_filter = htdocs/langs/<lang>/other.lang
-source_file = htdocs/langs/en_US/other.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.paybox]
-file_filter = htdocs/langs/<lang>/paybox.lang
-source_file = htdocs/langs/en_US/paybox.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.paypal]
-file_filter = htdocs/langs/<lang>/paypal.lang
-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
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.productbatch]
-file_filter = htdocs/langs/<lang>/productbatch.lang
-source_file = htdocs/langs/en_US/productbatch.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.products]
-file_filter = htdocs/langs/<lang>/products.lang
-source_file = htdocs/langs/en_US/products.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.projects]
-file_filter = htdocs/langs/<lang>/projects.lang
-source_file = htdocs/langs/en_US/projects.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.propal]
-file_filter = htdocs/langs/<lang>/propal.lang
-source_file = htdocs/langs/en_US/propal.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.receiptprinter]
-file_filter = htdocs/langs/<lang>/receiptprinter.lang
-source_file = htdocs/langs/en_US/receiptprinter.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.resource]
-file_filter = htdocs/langs/<lang>/resource.lang
-source_file = htdocs/langs/en_US/resource.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.salaries]
-file_filter = htdocs/langs/<lang>/salaries.lang
-source_file = htdocs/langs/en_US/salaries.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.sendings]
-file_filter = htdocs/langs/<lang>/sendings.lang
-source_file = htdocs/langs/en_US/sendings.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.sms]
-file_filter = htdocs/langs/<lang>/sms.lang
-source_file = htdocs/langs/en_US/sms.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.stocks]
-file_filter = htdocs/langs/<lang>/stocks.lang
-source_file = htdocs/langs/en_US/stocks.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.trips]
-file_filter = htdocs/langs/<lang>/trips.lang
-source_file = htdocs/langs/en_US/trips.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.users]
-file_filter = htdocs/langs/<lang>/users.lang
-source_file = htdocs/langs/en_US/users.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.withdrawals]
-file_filter = htdocs/langs/<lang>/withdrawals.lang
-source_file = htdocs/langs/en_US/withdrawals.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.website]
-file_filter = htdocs/langs/<lang>/website.lang
-source_file = htdocs/langs/en_US/website.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.workflow]
-file_filter = htdocs/langs/<lang>/workflow.lang
-source_file = htdocs/langs/en_US/workflow.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
--- a/99
+++ b/99
@@ -7,109 +7,65 @@ published by the Free Software Foundation; either version 3 of the License,
 or (at your option) any later version (GPL-3+).
 More information: http://www.gnu.org/licenses/gpl-3.0.txt

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

-Component              Version       License                     GPL Compatible  Usage
-------------------------------------------------------------------------------------
+Composant         Version  License                     Compatible GPL   Usage
+----------------------------------------------------------------------------
 PHP libraries:
-AdoDb-Date             0.36          Modified BSD License        Yes             Date convertion (not into rpm package)
-ChromePHP              4.1.0         Apache Software License 2.0 Yes             Return server log to chrome browser console
-CKEditor               4.5.8         LGPL-2.1+                   Yes             Editor WYSIWYG
-EvalMath               1.0           BSD                         Yes             Safe math expressions evaluation
-Escpos-php                           MIT License                 Yes             Thermal receipt printer library, for use with ESC/POS compatible printers
-FPDI                   1.5.2         Apache Software License 2.0 Yes             PDF templates management
-GeoIP                  1.4           LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
-Mobiledetect           2.8.17        MIT License                 Yes             Detect mobile devices browsers
+AdoDb-Date        0.21		Modified BSD License		Yes				Date convertion (not into rpm package)
+CKEditor		  3.6.4		LGPL-2.1+					Yes				Editor WYSIWYG
+FPDI              1.4.2		Apache Software License 2.0	Yes				PDF templates management (with FPDF_TPL 1.2)
+GeoIP			  2004      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
-odtPHP                 1.0.1         GPL-2+  b                   Yes             Library to build/edit ODT files
-PHPExcel               1.8.1         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
-php-iban               1.4.7         LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
-PHPoAuthLib            0.8.2         MIT License                 Yes             Library to provide oauth1 and oauth2 to different service
-PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
-Restler                3.0.0RC6      LGPL-3+                     Yes             Library to develop REST Web services
-TCPDF                  6.2.12        LGPL-3+                     Yes             PDF generation
-TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
-Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
+OdtPHP            1.0.1		GPL-2+						Yes				Library to build/edit ODT files
+PHPExcel		  1.7.6		LGPL-2.1+					Yes				Read/Write XLS files, read ODS files
+TCPDF             5.9.180	LGPL-3+						Yes				PDF generation

 JS libraries:
-jQuery                 1.11.3        MIT License                 Yes             JS library
-jQuery UI              1.11.4        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.70.0        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.8.3         MIT License                 Yes             JS library to build graph
-jQuery JCrop           0.9.8         GPL and MIT License         Yes             JS library plugin Crop (to crop images)
-jQuery Jeditable       1.7.1         GPL and MIT License         Yes             JS library plugin jeditable (to edit in place)
+jQuery            1.8.2		MIT Licence					Yes				JS library
+jQuery UI         1.9.1		GPL and MIT Licence			Yes				JS library plugin UI
+jQuery Timepicker 1.1.0		GPL and MIT Licence			Yes				JS library Timepicker addon for Datepicker
+jQuery Colorpicker 1.1	    MIT Licence					Yes				JS library for color picker for a defined list of colors
+jQuery DataTables 1.9.1     BSD							Yes				JS library for tables output
+jQuery Flot       0.7		MIT Licence					Yes				JS library to build graph
+jQuery FileUpload 5.0.3		GPL and MIT Licence			Yes				JS library to upload files
+jQuery JCrop      0.9.8		GPL and MIT Licence			Yes				JS library plugin Crop (to crop images)
+jQuery jeditable  1.7.1		GPL and MIT Licence			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 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.4.3         GPL and MIT License         Yes             JS library plugin Layout
-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
-jQuery Tiptip          1.3           GPL and MIT License         Yes             JS library for tooltips
-jsGantt                1.2           BSD License                 Yes             JS library (to build Gantt reports)
-JsTimezoneDetect       1.0.6         MIT License                 Yes             JS library to detect user timezone
+jQuery blockUI    2.43      GPL and MIT Licence         Yes             JS library plugin blockUI (to use ajax popups)
+jQuery jPicker	  1.1.00	GPL and MIT	Licence			Yes				JS library for color picker with not defined list of colors
+jQuery Layout     1.3.0		GPL and MIT Licence			Yes				JS library plugin Layout (RC-29.15)
+jQuery TableDnD   0.5		GPL and MIT Licence			Yes				JS library plugin TableDnD (to reorder table rows)
+jQuery Mobile	  1.3.0		GPL and MIT Licence			Yes				JS library for smartphone (not used)
+jQuery Tiptip     1.3		GPL and MIT Licence			Yes				JS library for tooltips
+JSGantt           1.2		BSD Licence					Yes				JS library (to build Gantt reports)

 For licenses compatibility informations:
-http://www.gnu.org/licenses/licenses.en.html
+http://www.fsf.org/licensing/licenses/index_html


 Copyright
 ---------

-Copyright (C) 2016
-
-Copyright (C) 2015
- Laurent Destailleur <eldy@users.sourceforge.net>
- Marcos García <marcosgdf@gmail.com>
- Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
- Frederic France <frederic.france@free.fr>
- Regis Houssin <regis.houssin@capnetworks.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 <aspangaro.dolibarr@gmail.com>
- Frederic France <frederic.france@free.fr>
-
 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 <aspangaro.dolibarr@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 <aspangaro.dolibarr@gmail.com>

 Copyright (C) 2011
 - Laurent Destailleur <eldy@users.sourceforge.net>
@@ -169,7 +125,6 @@ Copyright (C) 2004
 - 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>
--- a/2251
+++ b/2251
--- a/14
+++ b/14
@@ -1,14 +0,0 @@
-FROM php:5.6-apache
-
-RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
-	&& docker-php-ext-install gd
-
-RUN docker-php-ext-install mysqli
-
-COPY htdocs/ /var/www/html/
-
-RUN chown -hR www-data:www-data /var/www/html
-
-EXPOSE 80
--- a/4
+++ b/4
@@ -1,6 +1,6 @@
 INSTALL
 -------

-English:     See README.md file.
+English:     See README file.

-French:      Voir fichier README-FR.md.
+French:      Voir fichier README-FR.
--- a/139
+++ b/139
@@ -0,0 +1,139 @@
+README (english)
+--------------------------------
+Starter documentation
+--------------------------------
+
+1) Install Dolibarr
+2) Upgrade Dolibarr from an older version
+3) What's new in this version
+4) What Dolibarr can do
+5) What Dolibarr can't do yet, todo list
+
+
+I - DOLIBARR INSTALL
+--------------------
+
+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, Mandriva, Opensue, Mageia).
+
+You can download this at:
+http://www.dolibarr.org/downloads/
+
+If you already have installed a Web server and a Mysql database, you can
+install the standard version like this:
+
+- Uncompress the downloaded archive.
+ 
+- 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 web 
+  server administrator).
+  
+- 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).
+  
+- From your browser, call the dolibarr "install/" page. Url depends on choice
+  made on first step:
+   http://localhost/dolibarr/htdocs/install/
+  or
+   http://yourdolibarrvirtualhost/install/
+   
+- Follow instructions provided by installer...
+
+
+
+II - DOLIBARR 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://yourdolibarrhost/install/index.php
+
+  Then choose the "update" option according to your case.
+  Note: Migrate process can be ran safely several times.
+  
+
+III - WHAT'S NEW
+----------------
+
+See ChangeLog file found into package.
+
+
+
+IV - WHAT DOLIBARR CAN DO
+-------------------------
+
+Main modules/features:
+- Products and services catalog
+- Customers, Prospects or Suppliers directory
+- Address book
+- Stock management
+- Bank accounts management
+- Orders management with PDF export
+- Commercial proposals management with PDF export
+- Contracts management
+- Invoices management with PDF export
+- Payments management
+- Standing orders management
+- Shipping management
+- ECM (Electronic Content Management)
+- EMailings
+- Agenda with ical,vcal export for third tools integration
+- Management of foundation members
+- Donation management
+
+Other modules:
+- Bookmarks management
+- Can reports Dolibarr events inside Webcalendar or Phenix
+- Data export tools
+- LDAP connectivity
+- Third parties or products categories 
+- ClickToDial phone numbers
+- RSS
+
+Miscellanous:
+- Multi-user, with several permissions levels for each feature.
+- Serveral 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 menu and permissions).
+- Very user friendly and easy to use.
+- Optional WYSIWYG forms, optional Ajax forms.
+- Several skins.
+- Code is highly customizable (a lot of use of modules and submodules).
+- Works with Mysql 4.1 or higher, or PostgreSql 8.14 or higher.
+- Works with PHP 5.0 or higher.
+- An easy to understand and maintain code (PHP with no heavy frameworks).
+- A trigger architecture to allow you to make Dolibarr business events run
+  PHP code to update your own information system.
+- "NPR VAT Rate" (French particularity for managing VAT in DOM-TOM 
+  called "Non Perçue Récupérable").
+
+
+
+V - WHAT DOLIBARR CAN'T DO YET (TODO LIST)
+------------------------------------------
+This is features that Dolibarr does not support completely yet:
+- No accountancy (only bank management).
+- Dolibarr manage one currency at once (mono-currency).
+- Dolibarr manage one company/foundation (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).
+- Does not support double VAT (Federal / provincial) for Canada.
+- Dolibarr does not contains Payroll module.
+- Tasks on module project can't have dependencies between each other.
+- Dolibarr does not include any Webmail.
+- Dolibarr can't do coffee (not yet). 
--- a/130
+++ b/130
@@ -0,0 +1,130 @@
+README (french)
+--------------------------------
+Documentation démarrage rapide
+--------------------------------
+
+1) Installer Dolibarr
+2) Mettre à jour Dolibarr depuis une ancienne version
+3) Ce qui est nouveau dans cette version
+4) Ce que peux faire Dolibarr
+5) Ce que ne peux pas faire Dolibarr (pas encore)
+
+
+I - INSTALLER DOLIBARR
+----------------------
+
+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).
+Vous pouvez les télécharger à l'adresse: 
+http://www.dolibarr.org/downloads/
+
+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:
+
+- 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).
+  
+- 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/
+   
+- Suivez les instructions fournies par l'installeur...
+
+
+
+II - METTRE A JOUR DOLIBARR
+---------------------------
+
+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.
+  
+- 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.
+  
+
+III - CE QUI EST NOUVEAU
+------------------------
+
+Voir fichier ChangeLog.
+
+
+
+IV - CE QUE DOLIBARR PEUT FAIRE
+-------------------------------
+
+Modules principaux:
+- Gestion de catalogue de produits et services
+- Gestion de stock
+- Gestion des comptes bancaires
+- Annuaires des prospects et/ou client et/ou fournisseurs
+- Annuaires des contacts
+- Gestion des actions/taches avec un agenda intégré (ou lien avec webcalendar)
+- Gestion des commandes
+- Gestion des propositions commerciales
+- Gestion de contrats de services
+- Gestion des factures clients et fournisseurs
+- Gestion des paiements
+- Gestion des virements bancaires
+- Gestion des expéditions
+
+Autres modules:
+- Gestion de la TVA NPR (non perçue récupérable - pour les utilisateurs français des DOM-TOM)
+- Gestion des adhérents d'association
+- Gestion des dons
+- Gestion de marque-pages
+- Agenda
+- Point de vente/Caisse enregistreuse
+- Fonctions d'EMailing de masses vers les clients, prospect ou utilisateurs Dolibarr
+- Rapports
+- Fonctions d'exports
+- Connectivité LDAP
+- Export PDF de tous les éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
+- De nombreuses autres fonctionnalités issues de modules officiels ou non (AWStats, Bittorrent, Gravatar, Google, Webcalendar...) 
+
+Miscellanous:
+- 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.
+- Plusieurs thèmes visuels.
+- Code simple et facilement personnalisable.
+- Fonctionne avec MySQL 4.1+ ou PostgreSql 8.1.4+.
+- Fonctionne avec PHP 5.0+.
+- Compatible avec toutes les offres Cloud du marché respectant les prérequis MySQL et PHP. 
+
+
+V - 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 (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 (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.
+- Ne gère pas la double tva (Fédérale / provinciale) du canada.
+- Dolibarr ne contient pas de module de Gestion de la paie.
+- Les taches 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). 
--- a/README-FR.md
+++ b/README-FR.md
@@ -1,151 +0,0 @@
-# DOLIBARR ERP & CRM
-
-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_640x480.png)
-
-
-
-## LICENCE
-
-Dolibarr est distribué sous les termes de la licence GNU General Public License v3+ ou supérieure.
-
-
-
-## INSTALLER DOLIBARR
-
-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).
-
-Vous pouvez les télécharger depuis la rubrique *download* du portail officiel: 
-https://www.dolibarr.org/
-
-Si vous avez déjà installé un serveur Web avec PHP et une base de donnée (Mysql),
-vous pouvez installer Dolibarr avec cette version de la manière suivante:
-
- 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).
-  
- 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/
-   
- Suivez les instructions fournies par l'installeur...
-
-
-
-## METTRE A JOUR DOLIBARR
-
-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.
-  
- 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.
-  
-
-## CE QUI EST NOUVEAU
-
-Voir fichier ChangeLog.
-
-
-
-## CE QUE DOLIBARR PEUT FAIRE
-
-### Modules principaux (tous optionnels):
-
- 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
- Agenda partagé
- 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 expéditions
- GED (Gestion Electronique de Documents)
- EMailings de masse
- Réalisation de sondages
- Point de vente/Caisse enregistreuse
- …
-
-### Autres modules:
-
- Gestion de marque-pages
- Gestion des promesses de dons
- Gestion de la TVA NPR (non perçue récupérable - pour les utilisateurs français des DOM-TOM)
- Rapports
- Imports/Exports des données
- Connectivité LDAP
- De nombreuses autres fonctionnalités issues de modules officiels ou non (AWStats, Bittorrent, Gravatar, Google, Webcalendar...) 
- …
-
-### Divers:
-
- Application multi-utilisateurs avec différents niveaux de permissions par module.
- Peux être multi-société par ajout du module externe multi-société.
- Peux-être multi-devise par ajout du module externe multi-devise.
- Plusieurs gestionnaires de menus (possibilité de différencier les menus pour les utilisateurs internes ou externes comme les clients ou fournisseurs).
- Application simple à utiliser.
- Plusieurs thèmes visuels.
- Code simple et facilement personnalisable.
- Requiert PHP et Mysql ou Postgresql (Voir versions exactes sur http://wiki.dolibarr.org/index.php/Prérequis). 
- Compatible avec toutes les offres Cloud du marché respectant les prérequis MySQL et PHP ou Postgresql.
- Export PDF de tous les éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
-
-
-## CE QUE DOLIBARR NE PEUT PAS FAIRE (TACHES A FAIRE)
-
-Voici un liste de fonctionnalites pas encore gérées par Dolibarr:
- Pas encore de compta analytique double-partie (uniquement gestion de trésorerie).
- Dolibarr ne gère qu'une seule monnaie à la fois (mono-devise).
- Dolibarr ne contient pas de module de Gestion de la paie.
- Les tâches du module de gestion de projets n'ont pas de dépendance entre elle.
- Dolibarr ne contient pas de Webmail.
- Dolibarr ne fait pas le café (pas encore). 
-
-
-## ACTUALITES ET RESEAUX SOCIAUX
-
-Suivez le projet Dolibarr project sur les réseaux francophones
-
- Facebook: <https://www.facebook.com/dolibarr.fr>
- Google+: <https://plus.google.com/+DolibarrFrance>
- Twitter: <https://www.twitter.com/dolibarr_france>
-
-ou sur les réseaux anglophones
-
- [Facebook](https://www.facebook.com/dolibarr)
- [Google+](https://plus.google.com/+DolibarrOrg)
- [Twitter](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)
--- a/README.md
+++ b/README.md
@@ -1,171 +1,133 @@
 # DOLIBARR ERP & CRM

-![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg) ![Downloads per day](https://img.shields.io/sourceforge/dm/dolibarr.svg)
+Dolibarr ERP & CRM is a modern software to manage your 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, ...).

-It's an Open Source software (wrote in PHP language) designed for small, medium or large companies, foundations and freelances.
-
-You can freely use, study, modify or distribute it according to its Free Software licence.
-
-You can use it as a standalone application or as a web application to be able to access it from the Internet or a LAN.
-
-![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_640x400.png)

 ## 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

-### Download
+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, Opensue, Mandriva or Mageia).

-Releases can be downloaded from [official website](https://www.dolibarr.org/).
+You can download this at: [Official website] (http://www.dolibarr.org/downloads/)

-### Simple setup
+If you already have installed a Web server and a Mysql database, you can install the standard version like this:

-If you have low technical skills and you're looking to install Dolibarr ERP/CRM in few clicks, you can use one of the packaged versions:
+- Uncompress the downloaded archive.

- DoliWamp for Windows
- DoliDeb for Debian or Ubuntu
- DoliRpm for Redhat, Fedora, OpenSuse, Mandriva or Mageia
+- 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).
  
-### Advanced setup
+- 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).
  
-You can use a Web server and a supported database (MySQL recommended) to install the standard version.
+- From your browser, call the dolibarr "install/" page.

- Uncompress the downloaded archive
- 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)
- 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)
- From your browser, go to the dolibarr "install/" page
-
-    The URL will depends on choices made in the first step:
+Url depends on choice made on first step:

 	http://localhost/dolibarr/htdocs/install/
-        
 or

 	http://localhost/dolibarr/install/
-        
 or

 	http://yourdolibarrvirtualhost/install/
   
- Follow the installer instructions
+- Follow instructions provided by installer...

-## UPGRADING

- Overwrite all old files from 'dolibarr' directory with files provided into the new version's package.
- If you're upgrading from version x.y.z to x.y.w (only third number differs), there is no need to run any migration process.
- If you're upgrading 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) and follow the upgrade process.

-*Note: migration process can safely be done multiple times.*
+## 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.
+  
+

 ## WHAT'S NEW

-See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
+See ChangeLog file found into package.

-## FEATURES

-### Main modules (all optional)

- Customers, Prospects and/or Suppliers directory
- Products and/or Services catalog
- Commercial proposals management
- Customer and Supplier Orders management
- Invoices and payment management
- Standing orders management (European SEPA)
- Bank accounts management
- Shared calendar
- Opportunities and/or project management (following project benefit including invoices, expense reports, time spent, ...)
- Projects management
- Contracts management
+## WHAT DOLIBARR CAN DO
+
+### Main modules/features:
+
+- Products and services catalog
+- Customers, Prospects or Suppliers directory
+- Address book
 - Stock management
+- Bank accounts management
+- Orders management with PDF export
+- Commercial proposals management with PDF export
+- Contracts management
+- Invoices management with PDF export
+- Payments management
+- Standing orders management
 - Shipping management
- Interventions management
- Agenda with ical and vcal export for third party tools integration
- Electronic Document Management (EDM)
- Foundations members management
- Employee's holidays management
- Mass emailing
- Surveys
- Point of Sale
- …
+- ECM (Electronic Content Management)
+- EMailings
+- Agenda with ical,vcal export for third tools integration
+- Management of foundation members
+- Donation management

-### Other modules
+### Other modules:

 - Bookmarks management
- Donations management
- Reporting
- Data export/import
- Thirdparties and/or products categories
- Barcodes support
- Margin calculations
+- Can reports Dolibarr events inside Webcalendar or Phenix
+- Data export tools
 - LDAP connectivity
- ClickToDial integration
- RSS integration
- Skype integration
- Payment platforms integration (PayBox, PayPal)
- …
+- Third parties or products categories 
+- ClickToDial phone numbers
+- RSS

-### Other general features
- Multi-Users and groups with finely grained rights
- Localization in most major languages
- Can manage several companies by adding external module multi-company.
- Can manage several currencies by adding external module multi-currency.
- Very user friendly and easy to use
- Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
- Works with PHP 5.3+ and MySQL 4.1+ or PostgreSQL 8.1. (See requirements on the [Wiki](http://wiki.dolibarr.org/index.php/Prerequisite))
- Compatible with all Cloud solutions that match MySQL, PHP or PostgreSQL prerequisites.
- An easy to understand, maintain and code interfaces with your own information system (PHP with no heavy framework; trigger and hook architecture)
- Support for country specific features:
-    - Spanish Tax RE and ISPF
-    - French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)
-    - Canadian double taxes (federal/province) and other countries using cumulative VAT
-    - Tunisian tax stamp
-    - Compatible with [European directives](http://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
- PDF or ODT generation for invoice, proposals, orders...
- …
+### Miscellanous:

-### Extending
+- Multi-user, with several permissions levels for each feature.
+- Serveral 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 menu and permissions).
+- Very user friendly and easy to use.
+- Optional WYSIWYG forms, optional Ajax forms.
+- Several skins.
+- Code is highly customizable (a lot of use of modules and submodules).
+- Works with Mysql 4.1 or higher, or PostgreSql 8.14 or higher.
+- Works with PHP 5.0 or higher.
+- An easy to understand and maintain code (PHP with no heavy frameworks).
+- A trigger architecture to allow you to make Dolibarr business events run PHP code to update your own information system.
+- "NPR VAT Rate" (French particularity for managing VAT in DOM-TOM called "Non Perçue Récupérable").

-Dolibarr can be extended with a lot of other external modules from third party developers available at the [DoliStore](https://www.dolistore.com).

-## FUTURE

-These are features that Dolibarr does **not** yet fully support:
+## WHAT DOLIBARR CAN'T DO YET (TODO LIST)

- Double-entry bookkeeping yet (only bank and treasury management)
- Tasks dependencies in projects
- Payroll module
- Webmail
- Dolibarr can't do coffee (yet)
+This is features that Dolibarr does not support completely yet:

-## DOCUMENTATION
-
-Administrator, user, developer and translator's documentations are available along with other community resources on the [Wiki](http://wiki.dolibarr.org).
-
-## CONTRIBUTING
-
-See file [CONTRIBUTING](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)
-
-## CREDITS
-
-Dolibarr is the work of many contributors over the years and uses some fine libraries.
-
-See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) file.
-
-## NEWS AND SOCIAL NETWORKS
-
-Follow Dolibarr project on:
-
- [Facebook](https://www.facebook.com/dolibarr)
- [Google+](https://plus.google.com/+DolibarrOrg)
- [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)
+- No accountancy (only bank management).
+- Dolibarr manage one currency at once (mono-currency).
+- Dolibarr manage one company/foundation (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).
+- Does not support double VAT (Federal / provincial) for Canada.
+- Dolibarr does not contains Payroll module.
+- Tasks on module project can't have dependencies between each other.
+- Dolibarr does not include any Webmail.
+- Dolibarr can't do coffee (not yet).
--- a/build.xml
+++ b/build.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Script build for hudson CI -->
 <project name="dolibarr" default="hudson" basedir=".">
+
 <!-- Exclude/ignore paths -->
 <property name="ignorepaths" value="${basedir}/htdocs/conf,${basedir}/htdocs/core/filemanagerdol,${basedir}/htdocs/includes" />
- <property name="ignoreregexp" value="**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*" />
+ <property name="ignoreregexp" value="**/PEAR/*,**/NET/*,**/HTTP/*" />
 
 <target name="clean">
  <!-- Clean up -->
@@ -46,7 +46,7 @@
   				--exclude '${basedir}/htdocs/conf'
   				--exclude '${basedir}/htdocs/core/filemanagerdol'
   				--exclude '${basedir}/htdocs/includes'
-   				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*'
+   				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*'
   				--min-tokens 70
   				--min-lines 20 
   				htdocs
@@ -61,7 +61,7 @@
   				--exclude '${basedir}/htdocs/conf'
   				--exclude '${basedir}/htdocs/core/filemanagerdol'
   				--exclude '${basedir}/htdocs/includes'
-   				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*'
+   				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*'
   				htdocs
   				" />
  </exec>
@@ -79,10 +79,17 @@
  </exec>
 </target>

+ <!-- Generate Doxygen documentation -->
+ <target name="doxygen" description="Dolibarr documentation" >
+  <exec executable="doxygen" dir="${basedir}" failonerror="false">
+   <arg value="${basedir}/build/doxygen/jenkins_doxygen.doxyfile"/>
+  </exec>
+ </target>
+ 
 <!-- Run unit tests and generate junit.xml and clover.xml -->
 <target name="phpunit">
  <exec executable="phpunit" dir="${basedir}" failonerror="true">
-   <arg line="	--configuration ${basedir}/test/phpunit/phpunittest.xml
+   <arg line="	--configuration ${basedir}/test/phpunit/jenkins_phpunittest.xml
 				--log-junit ${basedir}/hudson/logs/junit.xml
 				--coverage-clover ${basedir}/hudson/coverage/clover.xml
  				--coverage-html ${basedir}/hudson/coverage/
@@ -91,12 +98,5 @@
  </exec>
 </target>

- <!-- Generate Doxygen documentation -->
- <target name="doxygen" description="Dolibarr documentation" >
-  <exec executable="doxygen" dir="${basedir}" failonerror="false">
-   <arg value="${basedir}/build/doxygen/jenkins_doxygen.doxyfile"/>
-  </exec>
- </target>
-
 <target name="hudson" depends="clean,phpunit,phpcs,parallelTasks"/>
 </project>
--- a/build/.gitignore
+++ b/build/.gitignore
--- a/build/README
+++ b/build/README
@@ -28,6 +28,9 @@ Note: Prerequisites to build autoexe DoliWamp package:
  recommanded), open file build/exe/doliwamp.iss and click on button "Compile".
  The .exe file will be build into directory build.

+- To build a translaction package, launch the script
+> perl makepack-dolibarrlang.pl
+
 - To build a theme package, launch the script
 > perl makepack-dolibarrtheme.pl

--- a/build/aps/APP-META-1.1.xml
+++ b/build/aps/APP-META-1.1.xml
--- a/build/aps/APP-META-1.2.xml
+++ b/build/aps/APP-META-1.2.xml
--- a/build/aps/README
+++ b/build/aps/README
--- a/build/aps/configure.php
+++ b/build/aps/configure.php
@@ -1,4 +1,4 @@
-#!/usr/bin/env php
+#!/usr/bin/php
 <?php
 /*-----------------------------------------------------
 *
@@ -149,3 +149,4 @@ function php_quote($val)
    return $res_val;
 }

+?>
--- a/build/aps/install.forced.php.install
+++ b/build/aps/install.forced.php.install
@@ -21,3 +21,4 @@ $force_install_databaserootpass='';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
+?>
--- a/build/composer/README
+++ b/build/composer/README
@@ -1,10 +0,0 @@
-
-To test upgrade of a lib with composer:
-
-composer update --no-dev --no-autoloader --dry-run ccampbell/chromephp
-
-To upgrade a lib with composer:
-
-composer update --no-dev --no-autoloader ccampbell/chromephp
-
-
--- a/build/debian/README.Debian
+++ b/build/debian/README.Debian
@@ -1,13 +0,0 @@
-Information about Dolibarr in Debian
------------------------------------
-
-The Debian package provides integration with apache2 and lighttpd.
-If you have one of those servers installed, then Dolibarr is immediately
-accessible at http://localhost/dolibarr/
-
-But it won't be usable until you configure it via
-http://localhost/dolibarr/install/
-
-To complete the setup process you will need the MySQL root credentials
-because the Dolibarr installer will create the database and the dedicated user
-for you.
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -7,75 +7,21 @@ This directory contains files used by makepack-dolibarr.pl
 script to build a package, ready to be distributed,
 with format .DEB (for Debian, Ubuntu, ...).

-
-
-##### Prepare linux env to work
-
 # 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
+# apt-get -i debhelper dpkg-source gpg lintian


-# To generate gpg key for email used into changelog
-* Check your existing keys/emails
-> gpg --list-key
-* Generate a new one, if none exists for email you use as author
-> gpg --gen-key							Generate a GPG key (-> pubring.gpg + secring.gpg)
-Files are saved int .gnupg directory
-* Create a file ~/.gpb.conf by
-> cat >~/.gbp.conf <<END
-[DEFAULT]
-pristine-tar = True
-
-[buildpackage]
-ignore-branch = True
-
-[git-buildpackage]
-sign-tags = True
-export-dir = ../build-area/
-
-[git-import-orig]
-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:
-Host svn.debian.org git.debian.org bzr.debian.org hg.debian.org darcs.debian.org arch.debian.org
-	User eldy-guest
-	IdentityFile ~/.ssh/id_rsa
-* Check login on page https://alioth.debian.org/users/login
-Ex: https://alioth.debian.org/users/eldy-guest
-* Setup your ssh as described into page: http://wiki.debian.org/Alioth/SSH
-* Ask to be included into project collab-maint: http://alioth.debian.org/projects/collab-maint/
-
-
-
-##### Some interesting command to know
-
-# To translate .po files
+# This is standard command to work on Debian packaging:
+#
+# gpg --gen-key                          Generate a GPG key (-> pubring.gpg + secring.gpg)
+#
 # debconf-updatepo					     		To run into po dir to regenate templates.pot
 # podebconf-report-po --from email@email.com	To send email to ask translations
 # Edit manually file XX.po and remove all lines "#, fuzzy" when translation is complete
 # 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 package   
-
-# To manipulate packages
+#
 # dpkg -l                                List all packages
 # dpkg -b                                To build binary only package
 # dpkg -c package.deb                    List content of package
@@ -84,16 +30,13 @@ Ex: https://alioth.debian.org/users/eldy-guest
 # dpkg-reconfigure -plow package		 Reconfigure package
 # dpkg -L packagename                    List content of installed package 
 # dpkg -r packagename                    Remove config files and interactive saved answers
-# dpkg -s packagename                    Give status of installed package
 # dpkg --purge                           Remove config files and interactive saved answers
 #
 # dpkg-buildpackage -us -uc              Build a source and binary package
 #
 # gdebi package.deb						 Install a package + dependencies

-
-
-##### Global view of submit new package to Debian:
+To submit a package to Debian:

 - Post an ITP with reportbugs :
 > reportbug -B debian --email username@domain.tld wnpp
@@ -112,298 +55,3 @@ See page http://www.debian.org/devel/wnpp/#l1 for example of ITP requests conten
 - Once package is uploaded, following URL are available:
 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
-
-severity 123 xxx
-
-
-##### 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 unstable env
-
-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
-
-Create a chroot called "unstable-amd64-sbuild".
-Chroot env is stored into /srv/chroot directory.
-> sudo sbuild-createchroot --keyring=unstable /srv/chroot/unstable 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
-> cat /etc/debian_chroot       to check which debian branch we are into
-> vi /usr/sbin/policy-rc.d     and replace return code 101 (not allowed) into 0 (ok)
-> apt-get install links mysql-client
-
-To test a package
-> On host server, stop any server on port 80 and 3306 (same port will be used by chroot env)
-> cp ../build-area/* /srv/chroot/unstable/tmp
-> sudo schroot -c name_of_chroot
-> cd /tmp
-> 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).
-
-
-
-
-##### Create/Maintain TCPDF package
-
-To update tcpdf package:
-
-* You can git clone tcpdf
-> git clone git.debian.org:/git/collab-maint/tcpdf.git [tcpdf-debian]
-or better
-> mkdir gitdebian
-> cd gitdebian
-> gbp-clone git.debian.org:/git/collab-maint/tcpdf.git
-
-* You can then create a PHP project from Eclipse called tcpdf-debian
-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.
-
-* Into root dir, 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.
-
-* 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)
-
-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
-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]
-
-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
-> 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 push --tags
-
-* Compilation is then done by a debian developer and sent
-> sbuild ...
-> dput ...
-
-* Go into page. You should see new package into unstable.
-http://packages.qa.debian.org/t/tcpdf.html
-
-* Package will be into release when test will be moved as stable.
-
-
-##### Create/Maintain dolibarr package
-
-To update dolibarr debian package when upstream (official version of external project) has changed:
-
-* You can git clone debian git repo
-> git clone git.debian.org:/git/collab-maint/dolibarr.git [dolibarr-debian]
-or better
-> cd ~; mkdir git-debian; cd git-debian
-> gbp-clone git.debian.org:/git/collab-maint/dolibarr.git
-
-* You can then create a PHP project from Eclipse called dolibarr-debian
-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:
-> 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 tgz file to remove 
- htdocs/includes/ckeditor
- 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 git root directory, run
-> git-import-orig -vv ../dolibarr-x.y.z+dfsgw.tgz --debian-branch=[master|jessie] --upstream-branch=[upstream|upstream-3.5.x]
-and enter version when requested with format
-x.y.z+dfsgw
-(x.y.z = version, w start from 1 and is increased for each new import)
-
-Note: If there was errors solved manually 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
-> dch -v x.y.z+dfsgw-v "My comment" will add entry.
-For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version (x.y.z = version, w start from 1 and increased for each new import)
-Then check/modify changelog to replace "version" or "unstable" with "UNRELEASED".
-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).
-
-
-To update dolibarr debian package when only files into debian has changed:
-
-* Change files and commit.
-* Add a tag debian/x.y.z+dfsgw-2 (increase the last 1 into 2, 3...)
-
-
-To update dolibarr debian package when only files not into debian has changed:
-
-* Manually, add patches into debian/patches and update file debian/series, or do the 2 steps with "quilt import filepatch.patch"
-* You can test patching of serie with "quilt push" (autant de fois que de patch). Avec "quilt pop -a", on revien a l'état du upstream sans les patch.
-
-Once files has been prepared, it's time to test:
-
-* Try to build package
-> rm -fr ../build-area;
-> git-buildpackage -us -uc --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-3.5.x|3.5.5]
-ou
-> git-buildpackage -us -uc --git-ignore-branch --git-upstream-branch=[upstream|upstream-3.5.x|3.5.5]
-
-Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-3.5.x]
-Note: You can use git-buildpackage -us -uc --git-ignore-new  if you want to test build with uncommited file
-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)
-> 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
-
-* 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 push --tags
-
-
-* Compilation is then done by a debian developer and sent
-> sbuild ...
-> dput ...
-
-* Package arrives into FTPmaster taskboard with status NEW (pending upload). You can view it at:
-http://ftp-master.debian.org/new/
- 
-* Once package is validated, you should see it into area unstable at:
-http://packages.qa.debian.org
-
-* Package will be into release when test will be moved as stable.
-
-
-##### Send an unblock request 
-
-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 "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 update of a stable package
-
-reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
-Choose package "release.debian.org"
-Then "unblock"
-Then name of package "dolibarr"
-Fill message, for example:
-"
-A security error CVE-2015-3935 was reported for Dolibarr ERP CRM package. This bug is fixed into official package 3.5.7 of Dolibarr.
-Package 3.5.7 is a maintenance release compared to 3.5.5 and contains only fixes. But not only bugs reported to debian, it includes also other fixes (but they are all related to stability or security).
-I think it is a better solution to validate this maintenance release based on the new upstream version of Dolibarr than applying a patch of the only CVE-2015-3935.
-Pro are:
- It fixes all debian reported bugs (including security one)
- It fixes also stability bugs
- Patches were already tested because deployed and used by several thousands of users.
- It is easier for package maintener to include this official set of fixes than applying one patch after one patch for each debian report or backported each patch into a dedicated version.
- Debian maintenance version matches with official project maintenance version (better when all fixes are not related to the way the software is packaged)
-Cons are: 
- The patch include more than the only one security reported fxes
-
-So I just need to know if it's ok to push such a version 3.5.7 (fixes for 3.5.* branch) instead of only one fix for only the few (the only) reported debian bugs,
-since it provides more stability and is for me a more secured process.
-"
-
--- a/build/debian/README.source
+++ b/build/debian/README.source
@@ -0,0 +1,12 @@
+==================================================================
+Dolibarr - Web based software to manage a small company or foundation
+==================================================================
+
+
+Note for package maintainers
+----------------------------
+This file explains how to modify official sources (from http://www.dolibarr.org)
+to have ready to use source files to build a debian package.
+
+All changes are included into patch file
+build/debian/patches
--- a/build/debian/apache.conf
+++ b/build/debian/apache.conf
@@ -0,0 +1,75 @@
+# Apache config file for Dolibarr
+
+<IfModule mod_alias.c>
+Alias /dolibarr /usr/share/dolibarr/htdocs
+</IfModule>
+
+# You can also use dolibarr as a VirtualHost
+# <VirtualHost *:*>
+#     ServerName mydolibarrhostname.com
+#     ServerAdmin root@example.com
+#     DocumentRoot /usr/share/dolibarr/
+#     ErrorLog logs/ldap.example.com-error.log
+#     CustomLog logs/ldap.example.com-access.log common
+# </VirtualHost>
+
+# Directory for web pages
+<DirectoryMatch /usr/share/dolibarr>
+  Order deny,allow
+  Allow from all
+  DirectoryIndex index.php
+  Options +FollowSymLinks +Indexes
+
+  ErrorDocument 401 /public/error-401.php
+  ErrorDocument 404 /public/error-404.php
+
+  <IfModule mod_php4.c>
+    php_flag magic_quotes_gpc Off
+    php_flag register_globals Off
+  </IfModule>
+
+  <IfModule mod_php5.c>
+    php_flag magic_quotes_gpc Off
+    php_flag register_globals Off
+  </IfModule>
+
+
+    # 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
+
+</DirectoryMatch>
+
+# Directory for public pages
+<DirectoryMatch /usr/share/dolibarr/htdocs/public>
+    AllowOverride All
+    Order deny,allow
+    Allow from all
+</DirectoryMatch>
+
+# Config files
+<DirectoryMatch /etc/dolibarr>
+	AllowOverride All
+    Order deny,allow
+    Allow from all
+</DirectoryMatch>
+
+# Directory for data files
+<DirectoryMatch /usr/share/dolibarr/documents>
+    AllowOverride All
+    Order deny,allow
+    Allow from all
+</DirectoryMatch>
+<DirectoryMatch /var/lib/dolibarr/documents>
+    AllowOverride All
+    Order deny,allow
+    Allow from all
+</DirectoryMatch>
--- a/build/debian/apache/.htaccess
+++ b/build/debian/apache/.htaccess
@@ -1,21 +0,0 @@
-# File used to disable access into directory documents
-<IfVersion >= 2.3>
-Require all denied
-</IfVersion>
-<IfVersion < 2.3>
-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
--- a/build/debian/apache/dolibarr.conf
+++ b/build/debian/apache/dolibarr.conf
@@ -1,56 +0,0 @@
-# Apache config file for Dolibarr
-<IfModule mod_alias.c>
-Alias /dolibarr /usr/share/dolibarr/htdocs
-</IfModule>
-
-# You can also use dolibarr as a VirtualHost
-# <VirtualHost *:*>
-#     ServerName mydolibarrhostname.com
-#     ServerAdmin root@example.com
-#     DocumentRoot /usr/share/dolibarr/
-#     ErrorLog logs/ldap.example.com-error.log
-#     CustomLog logs/ldap.example.com-access.log common
-#
-#	<IfVersion >= 2.3>
-#	Require all granted
-#	</IfVersion>
-#	<IfVersion < 2.3>
-#	Order allow,deny
-#	Allow from all
-#	</IfVersion>
-#
-# </VirtualHost>
-
-# Directory for web pages
-<Directory /usr/share/dolibarr/htdocs>
-	<IfVersion >= 2.3>
-	Require all granted
-	</IfVersion>
-	<IfVersion < 2.3>
-	Order allow,deny
-	Allow from all
-	</IfVersion>
-
-    DirectoryIndex index.php
-    Options +FollowSymLinks +Indexes
-
-    ErrorDocument 401 /dolibarr/public/error-401.php
-    ErrorDocument 404 /dolibarr/public/error-404.php
-
-    <IfModule mod_php5.c>
-      php_flag magic_quotes_gpc Off
-      php_flag register_globals Off
-    </IfModule>
-
-    # 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
-</Directory>
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -1,6 +1,6 @@
-dolibarr (__VERSION__) UNRELEASED; urgency=low
+dolibarr (3.3.5) unstable; urgency=low

  [ Laurent Destailleur (eldy) ]
  * New upstream release.
    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 12 May 2015 12:00:00 +0100     
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 30 Dec 2013 12:00:00 +0100     
--- a/build/debian/conf.php.install
+++ b/build/debian/conf.php.install
@@ -226,3 +226,5 @@ $dolibarr_main_prod='0';
 # Default value: 0 (use database value if exist)
 # Examples:
 # $dolibarr_mailing_limit_sendbyweb='0';
+
+?>
--- a/build/debian/control
+++ b/build/debian/control
@@ -1,50 +1,39 @@
 Source: dolibarr
+Maintainer: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
+Uploaders: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
+Standards-Version: 3.9.2
 Section: web
 Priority: optional
-Maintainer: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
-# Uploaders: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>		# Only if differs from Maintainer
-Standards-Version: 3.9.6
 Homepage: http://www.dolibarr.org
-Build-Depends: debhelper (>= 9), po-debconf
-# This package need at least debian 7 or ubuntu 13.04 or any distribution based on this version
+Build-Depends: debhelper (>= 7), po-debconf, dpatch

 Package: dolibarr
-Architecture: all
 Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
-    php5-cli, 
-# Required PHP extensions
-    php5-mysql | php5-mysqli, php5-curl, php5-gd, php5-ldap,
-# Required PHP libraries
-    php-pear, php-mail-mime, 
-#    php-tcpdf, libfpdi-php,
-#    libfpdf-tpl-php, php-fpdf,
-#    libphp-adodb,
-#    libnusoap-php,
-#    libphp-pclzip,
-# Required javascript libraries
-#    javascript-common, libjs-jquery, libjs-jquery-ui, libjs-jquery-flot, ckeditor,
-# Misc dependencies
-#    fonts-dejavu-core | ttf-dejavu-core,
+    php5-mysql | php5-mysqli, 
+    php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, php5-geoip,
+	libphp-adodb,
+    libnusoap-php,
+    libphp-pclzip,
+    libjs-jquery, libjs-jquery-ui, libjs-flot, ckeditor,
+    ttf-dejavu-core,
    xdg-utils,
    mysql-server,
-    mysql-client,
    ${misc:Depends},
    ${perl:Depends}
-Recommends: apache2 | lighttpd | httpd
-Suggests: www-browser, php5-geoip
-Description: Web based software to manage a company or foundation
- Dolibarr ERP & CRM is an easy to use open source/free software package for 
- companies, foundations or freelances. It includes different 
+Recommends: apache2 | lighttpd | httpd, mysql-client
+Suggests: www-browser
+Architecture: all
+Description: Web based software to manage a small company or foundation
+ Dolibarr ERP & CRM is an easy to use open source/free software for small 
+ and medium companies, foundations or freelances. It includes different 
 features for Enterprise Resource Planning (ERP) and Customer Relationship
 Management (CRM) but also for different other activities.
- .
 It's a web software you can install as a standalone program or on any web
 hosting provider to use it from anywhere with any web browser.
 .
- Dolibarr was designed to be easy to use. Only the features that you need
- are visible, depending on which modules were activated.
- .
- This is an example of most common used modules:
+ Dolibarr was designed to be easy to use. Only features you need are 
+ visible, depending on which module were activated.
+ Most common used modules are:
 .
 Customers, Suppliers or Prospects directory,
 Contacts directory,
@@ -68,6 +57,6 @@ Description: Web based software to manage a company or foundation
 Wizards to export and import data,
 LDAP connectivity,
 PDF exports,
- And a lot more modules...
+ And a lot of more modules...
 .
- You can also add external modules from third parties or develop yours.
+ You can also add third parties external modules or develop yours.
--- a/build/debian/copyright
+++ b/build/debian/copyright
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Dolibarr
 Upstream-Contact: Laurent Destailleur <eldy@users.sourceforge.net>
-Source: http://www.dolibarr.org/files/stable/standard/
+Source: http://sourceforge.net/projects/dolibarr/files/

 Files: *
 Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>
@@ -61,7 +61,7 @@ License: GPL-3+
 Files: htdocs/includes/adodbtime/*
 Copyright: 2003-2005, John Lim
           unknown, jackbbs
-License: BSD-3-Clause
+License: BSD
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
@@ -159,7 +159,7 @@ Comments:
 Those files are not shipped in the binary package as we
 configure Dolibarr to use Dejavu fonts from "fonts-dejavu-core".
  
-Files: doc/images/*
+Files: docs/images/*
 Copyright: Laurent Destailleur 
 License: CC-BY-SA-3.0
 You are free:
@@ -176,7 +176,7 @@ License: CC-BY-SA-3.0
 .
 For more information, see http://creativecommons.org/licenses/by-sa/3.0/

-Files: htdocs/includes/fpdfi/*
+Files: htdocs/includes/fpdi/*
 Copyright: 2004-2011 Setasign - Jan Slabon
 License: GPL-2+
 This program is free software; you can redistribute it
@@ -272,7 +272,7 @@ Comment:

 Files: htdocs/includes/jquery/plugins/flot/*
 Copyright: Flot team
-License: Public-Domain
+License: Public Domain
 This work is not subject to copyright in any jurisdiction
 Comment:
 Those files are not shipped in the binary package because we configure
--- a/build/debian/dolibarr.desktop
+++ b/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
--- a/build/debian/dolibarr.doc-base
+++ b/build/debian/dolibarr.doc-base
@@ -0,0 +1,10 @@
+Document: dolibarr
+Title: Dolibarr ERP & CRM documentation
+Author: Dolibarr team
+Abstract: This documentation covers the install, use and administration of
+ Dolibarr ERP & CRM software. 
+Section: Office
+
+Format: HTML
+Index: /usr/share/doc/dolibarr/index.html
+Files: /usr/share/doc/dolibarr/*.html
--- a/build/debian/dolibarr.docs
+++ b/build/debian/dolibarr.docs
@@ -1 +0,0 @@
-README.md
--- a/build/debian/dolibarr.install
+++ b/build/debian/dolibarr.install
@@ -1,11 +1,12 @@
-debian/dolibarr.desktop usr/share/applications/
-debian/dolibarr.xpm usr/share/pixmaps/
-debian/apache/.htaccess var/lib/dolibarr/documents/
-debian/apache/dolibarr.conf etc/apache2/conf-available/
-debian/lighttpd/50-dolibarr.conf etc/lighttpd/conf-available/
-debian/install.forced.php.install etc/dolibarr/
-htdocs usr/share/dolibarr/
-scripts usr/share/dolibarr/
-doc/install usr/share/doc/dolibarr/
-doc/user usr/share/doc/dolibarr/
-doc/index.html usr/share/doc/dolibarr/
+debian/dolibarr.desktop usr/share/applications
+debian/dolibarr.xpm usr/share/pixmaps
+README usr/share/doc/dolibarr
+doc/install usr/share/doc/dolibarr
+doc/user usr/share/doc/dolibarr
+doc/index.html usr/share/doc/dolibarr
+build/debian/apache.conf etc/dolibarr
+build/debian/lighttpd.conf etc/dolibarr
+build usr/share/dolibarr
+dev usr/share/dolibarr
+htdocs usr/share/dolibarr
+scripts usr/share/dolibarr
--- a/build/debian/dolibarr.lintian-overrides
+++ b/build/debian/dolibarr.lintian-overrides
@@ -1,10 +1 @@
-# We want a www-data group-writable /var/lib/dolibarr/documents/
-dolibarr: non-standard-dir-perm var/lib/dolibarr/documents/ 2775 != 0755
-# We depend on xdg-utils providing xdg-open and we use that to open an URL
-dolibarr: desktop-command-not-in-package usr/share/applications/dolibarr.desktop xdg-open
-# 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
+# No overrided lintian rules is this version.
--- a/build/debian/dolibarr.postinst
+++ b/build/debian/dolibarr.postinst
@@ -13,70 +13,27 @@ set -e
 #          <conflicting-package> <version>
 # for details, see /usr/share/doc/packaging-manual/

-if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
-	# Needs to be run outside of functions to have access to parameters
-	. /usr/share/apache2/apache2-maintscript-helper
+
+
+
+lighttpd_install() {
+	if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then
+		if which lighty-enable-mod >/dev/null 2>&1 ; then
+			echo "Add link for Lighttpd config file"
+			ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf
+			# We enabled it
+			lighty-enable-mod dolibarr fastcgi-php
+		else
+			echo "Lighttpd not installed, skipping"
 		fi
-
-setup_empty_conf() {
-	echo Create empty file $config		
-    mkdir -p /etc/dolibarr
-    touch /etc/dolibarr/conf.php
-    chown root:www-data /etc/dolibarr/conf.php
-    chmod 664 /etc/dolibarr/conf.php
-}
-
-is_new_upstream_version() {
-    # $1 can be empty (not installed) and will result in a true value
-    # for the check
-    old_version=$(echo "$1" | sed -e 's/-[^-]*$//' -e 's/^[0-9]*://')
-    new_version=$(dpkg-query -f '${Version}' -W dolibarr | \
-		  sed -e 's/-[^-]*$//' -e 's/^[0-9]*://')
-    test "$old_version" != "$new_version"
-}
-
-enable_install_upgrade_wizard() {
-	echo Enable install wizard by removing install.lock file if present
-    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 a3enconf"
-		a2enconf dolibarr
-	else 
 	if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then
 		echo "Add link for Apache config file"
-			ln -s /etc/$webserver/conf-available/dolibarr.conf /etc/$webserver/conf.d/dolibarr.conf
-		fi
-	fi
-}
-
-lighttpd_install() {
-	if which lighty-enable-mod >/dev/null 2>&1 ; then
-		echo "Enable lighttpd link for dolibarr config file"
-		lighty-enable-mod dolibarr fastcgi-php
-	else
-		echo "Lighttpd not installed, skipping"
+		ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf
 	fi
 }

@@ -92,28 +49,16 @@ echo Run the dolibarr postinst script

 # Define vars
 docdir='/var/lib/dolibarr/documents'
-installfileorig="/etc/dolibarr/install.forced.php.install"
+installfileorig="/usr/share/dolibarr/build/debian/install.forced.php.install"
 installconfig="/etc/dolibarr/install.forced.php"
 config="/etc/dolibarr/conf.php"


 case "$1" in
 	configure)
-		if [ -z "$2" ]; then
-			echo First install
-		    #setup_empty_conf
-		else
-			echo This is not a first install
-		fi
-
-		php_install
-		apache_install
-		lighttpd_install
 	
 		# Remove lock file
-		if is_new_upstream_version "$2"; then
-		    enable_install_upgrade_wizard
-		fi
+		rm -f $docdir/install.lock

        # Create document directory for uploaded data files
        mkdir -p $docdir
@@ -121,7 +66,7 @@ case "$1" in
        chmod -R 775 $docdir
        chmod -R g+s $docdir

-		# Copy install config file (with matching Debian values) into target directory
+		# Copy install config file (with matching Debian) values into target directory
 		superuserlogin=''
 		superuserpassword=''
 		if [ -f /etc/mysql/debian.cnf ] ; then
@@ -142,22 +87,25 @@ case "$1" in
 		if [ ! -s $config ] || ! grep -q "File generated by" $config
 		then
 			# Create an empty conf.php with permission to web server
-			setup_empty_conf
-		#else
+			echo Create empty file $config		
+			touch $config
+	    	chmod -R 660 $config
+			chown -R root:www-data $config
+		else
 			# 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
-			##grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
-			##grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
-			#grep -q -c "dolibarr_js_CKEDITOR" $config       || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
-			#grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
-			#grep -q -c "dolibarr_js_JQUERY_UI" $config      || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
-			#grep -q -c "dolibarr_js_JQUERY_FLOT" $config    || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
-			#grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config			
+			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
+			#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
+			#grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
+			grep -q -c "dolibarr_js_CKEDITOR" $config       || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
+			grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
+			grep -q -c "dolibarr_js_JQUERY_UI" $config      || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
+			grep -q -c "dolibarr_js_JQUERY_FLOT" $config    || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
+			grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config			
 		fi
 	
 		db_get dolibarr/reconfigure-webserver
--- a/build/debian/dolibarr.postrm
+++ b/build/debian/dolibarr.postrm
@@ -177,19 +177,18 @@ case "$1" in
 			    passopt="--password='"`echo "$dbadmpass" | sed -e "s/'/'"'"'"'"'"'"'/g"`"'"
 			fi
 			mysqlcmd="mysql $hostopt $passopt -u $dbadmin"
-			mysqlcmdnopass="mysql $hostopt -u $dbadmin"

 		    # Now run the drop user
 			if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'localhost';\"" ; then
 				echo postrm Database login $dbuser@localhost removed
 			else
-			    error="Unable to run $mysqlcmdnopass -f -e \"DROP USER '$dbuser'@'localhost';\""
+			    error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'localhost';\""
 				echo postrm $error
 			fi
 			if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'%';\"" ; then
 				echo postrm Database login $dbuser@% removed
 			else
-			    error="Unable to run $mysqlcmdnopass -f -e \"DROP USER '$dbuser'@'%';\""
+			    error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'%';\""
 				echo postrm $error
 			fi

--- a/build/debian/dolibarr.templates.futur
+++ b/build/debian/dolibarr.templates.futur
--- a/build/debian/get-orig-source.sh
+++ b/build/debian/get-orig-source.sh
@@ -1,26 +1,23 @@
 #!/bin/sh
+# Scan for new official sources and download file
+# run with debian/get-orig-source.sh [x.y.z]

 tmpdir=$(mktemp -d)
+echo "tmpdir = $tmpdir"

-
-# Download source file
 if [ -n "$1" ]; then
    uscan_opts="--download-version=$1"
 fi
-#uscan --noconf --force-download --no-symlink --verbose --destdir=$tmpdir $uscan_opts
+uscan --noconf --force-download --no-symlink --verbose --destdir=$tmpdir $uscan_opts

 cd $tmpdir

-# Other method to download (comment uscan if you use this)
-wget http://www.dolibarr.org/files/stable/standard/dolibarr-3.5.4.tgz
-
-# Rename file to add +dfsg
 tgzfile=$(echo *.tgz)
 version=$(echo "$tgzfile" | perl -pi -e 's/^dolibarr-//; s/\.tgz$//; s/_/./g; s/\+nmu1//; ')

 cd - >/dev/null

 mv $tmpdir/dolibarr-${version}.tgz ../
-echo "File ../dolibarr-${version}.tgz is ready for git-import-orig"
+echo "File ../dolibarr-${version}.tgz is ready for git-import"

 rm -rf $tmpdir
--- a/build/debian/install.forced.php.install
+++ b/build/debian/install.forced.php.install
@@ -26,19 +26,21 @@ $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 
-// - 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';
-//$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
-//$force_dolibarr_lib_PHPEXCEL_PATH='';	// Use '' or 'disabled'
-//$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';	// Use '/javascript/ckeditor' or 'disabled'
-//$force_dolibarr_js_JQUERY='/javascript/jquery';
-//$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui';
-//$force_dolibarr_js_JQUERY_FLOT='/javascript/flot';
-//$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf';
+// If we enable/disable libraries declaration during install, we must also check they are 
+// not removed from package (see in rules file),
+// declared into dependencies (see 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';
+$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
+$force_dolibarr_lib_PHPEXCEL_PATH='';
+$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';
+$force_dolibarr_js_JQUERY='/javascript/jquery';
+$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui';
+$force_dolibarr_js_JQUERY_FLOT='/javascript/flot';
+$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf';
+
+?>
--- a/build/debian/lighttpd/50-dolibarr.conf
+++ b/build/debian/lighttpd/50-dolibarr.conf
--- a/build/debian/patches/00list
+++ b/build/debian/patches/00list
@@ -0,0 +1 @@
+install.dpatch
--- a/build/debian/patches/install.dpatch
+++ b/build/debian/patches/install.dpatch
@@ -0,0 +1,50 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## install.patch by <eldy@users.sourceforge.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Updates htdocs/filefunc.inc.php
+## DP: Updates htdocs/install/inc.php
+## DP: Updates htdocs/support/inc.php
+
+@DPATCH@
+
+
+--- old/htdocs/filefunc.inc.php 2011-09-03 02:32:48.666952000 +0200
+++ new/htdocs/filefunc.inc.php	2011-09-03 02:33:00.510952001 +0200
+@@ -63,8 +63,8 @@
+ $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";
+ 
+ 
+ // Include configuration
+--- old/htdocs/install/inc.php	2011-09-03 02:33:26.450952000 +0200
+++ new/htdocs/install/inc.php	2011-09-03 02:33:36.286952001 +0200
+@@ -71,8 +71,8 @@
+ $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))
+--- old/htdocs/support/inc.php	2011-09-03 02:34:39.606952000 +0200
+++ new/htdocs/support/inc.php	2011-09-03 02:33:59.814952000 +0200
+@@ -69,8 +69,8 @@
+ $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))
--- a/build/debian/patches/series
+++ b/build/debian/patches/series
@@ -1 +0,0 @@
-use-etc-dolibarr-conf.patch
--- a/build/debian/patches/use-etc-dolibarr-conf.patch
+++ b/build/debian/patches/use-etc-dolibarr-conf.patch
@@ -1,50 +0,0 @@
-Description: Enable /etc/dolibarr/conf.php so that we use packaged libraries
- Update some PHP include files to refer to /etc/dolibarr/conf.php
- instead of the in-tree conf/conf.php.
- .
- /etc/dolibarr/conf.php configures Dolibarr to use packaged libraries
- instead of the embedded ones.
-Author: Laurent Destailleur <eldy@users.sourceforge.net>
-Forwarded: not-needed
-Last-Update: 2013-07-29
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/htdocs/filefunc.inc.php
-+++ b/htdocs/filefunc.inc.php
-@@ -63,8 +63,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";
- 
- 
- // Include configuration
--- a/htdocs/install/inc.php
-+++ b/htdocs/install/inc.php
-@@ -73,8 +73,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";
- 
- 
- // Load conf file if it is already defined
--- a/htdocs/support/inc.php
-+++ b/htdocs/support/inc.php
-@@ -69,8 +69,8 @@ $conffiletoshowshort = "conf.php";
- $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";
- 
- 
- // Load conf file if it is already defined
--- a/build/debian/po/POTFILES.in
+++ b/build/debian/po/POTFILES.in
--- a/build/debian/po/fr.po
+++ b/build/debian/po/fr.po
@@ -17,8 +17,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: dolibarr@packages.debian.org\n"
 "POT-Creation-Date: 2013-04-23 12:16+0200\n"
 "PO-Revision-Date: 2011-07-29 22:45+0100\n"
-"Last-Translator: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>\n"
-"Language-Team: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>\n"
+"Last-Translator: Laurent Destailleur <eldy@users.sourceforge.net>\n"
+"Language-Team: Laurent Destailleur <eldy@users.sourceforge.net>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
--- a/build/debian/rules
+++ b/build/debian/rules
@@ -7,17 +7,29 @@ export DH_OPTIONS=-v
 #export DH_COMPAT=7    # This is the debhelper compatability version to use, now defined into compat file


-%:
+# use dpatch
+include /usr/share/dpatch/dpatch.make
+
+
+configure:
 	dh $@

-override_dh_auto_clean:
-# Do nothing. Added to disable launchpad to use bugged dh_auto_clean search for ant
+build: patch
+	dh $@

-override_dh_auto_build:
-# Do nothing. Added to disable launchpad to use bugged dh_auto_build search for ant
+build-arch: patch
+	dh $@

-override_dh_install:
-	dh_install
+build-indep: patch
+	dh $@
+
+binary:
+	dh $@
+
+binary-indep:
+	dh $@
+	
+clean:
 	# Delete files
 	rm -f  .buildpath
 	rm -fr .cache
@@ -29,6 +41,7 @@ override_dh_install:
 	rm -f  build.xml
 	rm -f  quickbuild.xml
 	rm -f  pom.xml
+	rm -f  README.md

 	rm -f  htdocs/install/mssql/README
 	rm -f  htdocs/install/mysql/README
@@ -77,45 +90,36 @@ override_dh_install:
 	rm -fr build/rpm
 	rm -fr build/zip
 	
-	# clean from all PHP embedded libraries (we use package dependencies instead)
-#	rm -fr htdocs/includes/adodbtime
+	# clean from all embedded libraries (we use package dependencies instead)
+	rm -fr htdocs/includes/adodbtime
+	rm -fr htdocs/includes/ckeditor
 #	rm -fr htdocs/includes/fpdfi
-#	rm -fr htdocs/includes/geoip
-#	rm -fr htdocs/includes/nusoap
-#	rm -fr htdocs/includes/odtphp/zip/pclzip
-	# clean from all JS-CSS embedded libraries (we use package dependencies instead)
-#	rm -fr htdocs/includes/ckeditor
-#	rm -fr htdocs/includes/jquery/js
-#	rm -fr htdocs/includes/jquery/css
-#	rm -fr htdocs/includes/jquery/plugins/flot
-	# clean from all embedded fonts (we use package dependencies instead)
-#	rm -fr htdocs/includes/fonts
-
-	# clean from useless files
+	rm -fr htdocs/includes/fonts
+	rm -fr htdocs/includes/geoip
+	rm -fr htdocs/includes/nusoap
+	rm -fr htdocs/includes/odtphp/zip/pclzip
+	rm -fr htdocs/includes/phpmailer
+	rm -fr htdocs/includes/jquery/css
+	rm -fr htdocs/includes/jquery/js
+	rm -fr htdocs/includes/jquery/plugins/flot
+	rm -fr htdocs/includes/jquery/plugins/jstree
+	rm -fr htdocs/includes/jquery/plugins/lightbox
+	rm -fr htdocs/includes/jquery/plugins/mobile
 	rm -fr htdocs/includes/jquery/plugins/multiselect
 	rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PDF
 	rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip
 	rm -fr htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33
 	rm -fr htdocs/includes/tcpdf/fonts/freefont-20100919
 	rm -fr htdocs/includes/tcpdf/fonts/utils
+
 	# clean from files to avoid warning of missing dependencies
 	rm -fr htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.py

-	# Licence files are already included into copyright file.
-	rm -f  htdocs/includes/jquery/plugins/flot/LICENSE.txt
-	rm -f  htdocs/includes/phpexcel/license.txt
+	# Licence files are included into copyright file.
+	rm -fr htdocs/includes/phpexcel/license.txt
 	rm -f  htdocs/includes/tcpdf/LICENSE.TXT

-	# Drop unwanted executable permissions
-	find debian/dolibarr/usr/share/dolibarr/htdocs -type f -print0 | \
-	     xargs -0 chmod 644
-	# Add missing executable permissions
-	find debian/dolibarr/usr/share/dolibarr/scripts -type f -name '*.php' -print0 | \
-	     xargs -0 chmod 755
+	dh $@

-override_dh_fixperms:
-	dh_fixperms
-	# Give rights to the webserver on the upload directory
-	chown www-data:www-data debian/dolibarr/var/lib/dolibarr/documents
-	chmod 2775 debian/dolibarr/var/lib/dolibarr/documents
+binary-arch:
 	
--- a/build/debian/source/format
+++ b/build/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)
--- a/build/debian/source/lintian-overrides
+++ b/build/debian/source/lintian-overrides
@@ -1,5 +0,0 @@
-# Remove warning, we want to keep both standard and minified sources.
-dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jsgantt/*
-dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jquery/*
-# This is a textual data file
-source-is-missing htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json
--- a/build/debian/watch
+++ b/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
--- a/build/dmg/dolimamp/install.forced.php
+++ b/build/dmg/dolimamp/install.forced.php
@@ -14,3 +14,4 @@ $force_install_databaserootpass='root';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
+?>
--- a/build/doxygen/dolibarr-doxygen-build.pl
+++ b/build/doxygen/dolibarr-doxygen-build.pl
@@ -24,31 +24,14 @@ if (! -s $CONFFILE)
    print "Error: current directory for building Dolibarr doxygen documentation is not correct.\n";
    print "\n";
 	print "Change your current directory then, to launch the script, run:\n";
-	print '> perl .\dolibarr-doxygen-build.pl  (on Windows)'."\n";
+	print '> perl ..\dolibarr-doxygen-build.pl  (on Windows)'."\n";
 	print '> perl ../dolibarr-doxygen-build.pl  (on Linux or BSD)'."\n";
    sleep 4;
    exit 1;   
 }

-$SOURCE="../..";
-
-# Get version $MAJOR, $MINOR and $BUILD
-$result = open( IN, "< " . $SOURCE . "/htdocs/filefunc.inc.php" );
-if ( !$result ) { die "Error: Can't open descriptor file " . $SOURCE . "/htdocs/filefunc.inc.php\n"; }
-while (<IN>) {
-	if ( $_ =~ /define\('DOL_VERSION','([\d\.a-z\-]+)'\)/ ) { $PROJVERSION = $1; break; }
-}
-close IN;
-($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
-if ($MINOR eq '') { die "Error can't detect version into ".$SOURCE . "/htdocs/filefunc.inc.php"; }
-
-
-$version=$MAJOR.".".$MINOR.".".$BUILD;
-
-
-print "Running doxygen for version ".$version.", please wait...\n";
-print "cat $CONFFILE | sed -e 's/x\.y\.z/".$version."/' | doxygen $OPTIONS - 2>&1\n";
-$result=`cat $CONFFILE | sed -e 's/x\.y\.z/$version/' | doxygen $OPTIONS - 2>&1`;
+print "Running doxygen, please wait...\n";
+$result=`doxygen $OPTIONS $CONFFILE 2>&1`;

 print $result;

--- a/build/doxygen/dolibarr-doxygen-filter.pl
+++ b/build/doxygen/dolibarr-doxygen-filter.pl
--- a/build/doxygen/dolibarr-doxygen-getversion.pl
+++ b/build/doxygen/dolibarr-doxygen-getversion.pl
--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/build/doxygen/dolibarr-doxygen.doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = dolibarr
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.

-PROJECT_NUMBER = x.y.z
+PROJECT_NUMBER = 3.3.2

 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
@@ -611,7 +611,7 @@ RECURSIVE = YES
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.

-EXCLUDE = ../../build ../../dev ../../doc ../../document ../../documents ../../htdocs/conf/conf.php ../../htdocs/custom ../../htdocs/document ../../htdocs/documents ../../htdocs/includes
+EXCLUDE = ../../build ../../dev ../../doc ../../documents ../../htdocs/conf/conf.php ../../htdocs/includes ../../htdocs/document ../../htdocs/documents

 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
 # directories that are symbolic links (a Unix filesystem feature) are excluded
--- a/build/doxygen/doxygen_footer.html
+++ b/build/doxygen/doxygen_footer.html
@@ -4,14 +4,17 @@ File added into doxygen generated documentation


 <!-- Google analytics -->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+<script type="text/javascript">

-  ga('create', 'UA-9049390-16', 'auto');
-  ga('send', 'pageview');
+  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 -->
@@ -19,11 +22,11 @@ File added into doxygen generated documentation

 <hr class="footer" />
 <address class="footer"><small>Generated on $datetime
-for <a href="https://www.dolibarr.org">$projectname</a> by Doxygen $doxygenversion </small></address>
+for <a href="http://www.dolibarr.org">$projectname</a> by Doxygen </a> $doxygenversion </small></address>


 <!--  Google AdSense -->
-<div class="center">
+<center>
 <script type="text/javascript"><!--
 google_ad_client = "pub-1071905880519467";
 /* PUBBANDEAUDOLIBARR */
@@ -32,20 +35,10 @@ google_ad_width = 468;
 google_ad_height = 60;
 //-->
 </script>
-<script type="text/javascript" src="https://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
-</div>
+<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
+</center>
 <!-- End google adsense -->
 <br>

-</div>
-
-<!-- Twitter ad collector -->
-<script src="//platform.twitter.com/oct.js" type="text/javascript"></script>
-<script type="text/javascript">twttr.conversion.trackPid('ntm4n', { tw_sale_amount: 0, tw_order_quantity: 0 });</script>
-<noscript>
-<img height="1" width="1" style="display:none;" alt="" src="https://analytics.twitter.com/i/adsct?txn_id=ntm4n&p_id=Twitter&tw_sale_amount=0&tw_order_quantity=0" />
-<img height="1" width="1" style="display:none;" alt="" src="//t.co/i/adsct?txn_id=ntm4n&p_id=Twitter&tw_sale_amount=0&tw_order_quantity=0" />
-</noscript>
-
 </body>
 </html>
--- a/build/doxygen/doxygen_header.html
+++ b/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>
@@ -12,23 +14,7 @@
 <link href="tabs.css" rel="stylesheet" type="text/css" />
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <!-- End from dolibarr.org -->
-
-<!-- Facebook Pixel Code -->
-<script>
-!function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?
-n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n;
-n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0;
-t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window,
-document,'script','//connect.facebook.net/en_US/fbevents.js');
-
-fbq('init', '1998533953704960');
-fbq('track', "PageView");</script>
-<noscript><img height="1" width="1" style="display:none"
-src="https://www.facebook.com/tr?id=1998533953704960&ev=PageView&noscript=1"
-/></noscript>
-<!-- End Facebook Pixel Code -->
 </head>
-
 <body>
 <div id="top">

@@ -38,7 +24,7 @@ src="https://www.facebook.com/tr?id=1998533953704960&ev=PageView&noscript=1"
 </div>

 <div id="logodol">
-<div class="center">
+<center>
 <table width="100%">
 	<tr>
 		<td><div id="projectname">$projectname</div> - <span id="projectnumber">$projectnumber</span></td>
@@ -49,15 +35,15 @@ src="https://www.facebook.com/tr?id=1998533953704960&ev=PageView&noscript=1"
 				<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 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>
 				<div class="clr"></div>
 				</div>

@@ -68,7 +54,7 @@ src="https://www.facebook.com/tr?id=1998533953704960&ev=PageView&noscript=1"
 		<!-- banner end --></td>
 	</tr>
 </table>
-</div>
+</center>

 </div>

--- a/build/doxygen/jenkins_doxygen.doxyfile
+++ b/build/doxygen/jenkins_doxygen.doxyfile
--- a/build/exe/doliwamp/.gitignore
+++ b/build/exe/doliwamp/.gitignore
@@ -1 +0,0 @@
-/doliwamp.tmp.iss
--- a/build/exe/doliwamp/Languages/MyCatalan.isl
+++ b/build/exe/doliwamp/Languages/MyCatalan.isl
@@ -20,7 +20,7 @@ DoYouWantToStart=Vol iniciar el proc
 TechnicalParameters=Par<61>metres t<>cnics
 IfFirstInstall=Si es tracta de la primera instal laci<63>, haur<75> d'especificar alguns par<61>metres t<>cnics. Si no els ent<6E>n, no sabeu o va a procedir a una actualitzaci<63>, deixi els camps amb els valors proposats per defecte.

-; WARNING !!! STRINGS HERE MUST BE LOWER THAN 70 CHARACTERS
+; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
 SMTPServer=Servidor SMTP (El seu o el del seu ISP, <20>nicament primera instal.laci<63>) :
 ApachePort=Puerto Apache (<28>nicament primera instal.laci<63>, normalment <20>s el 80) :
 MySqlPort=Puerto Mysql (<28>nicament primera instal.laci<63>, normalment <20>s el 3306) :
@@ -31,7 +31,6 @@ FailedToDeleteLock=FailedToDeleteLock=Error en l'eliminaci
 PortAlreadyInUse=Sembla que el port %1 ja est<73> sent utilitzat. Es recomana cancel<65>lar, tornar enrere i especificar un altre valor per al port% 2. Cancel<65>lar i escollir un altre valor?

 FirefoxDetected=S'ha detectat Firefox al seu ordinador. Voleu activar per defecte com a navegador per Dolibarr?
-ChromeDetected=S'ha detectat Chrome al seu ordinador. Voleu activar per defecte com a navegador per Dolibarr?
 ChooseDefaultBrowser=Esculli el seu navegador per defecte. Si no est<73> segur, simplement feu clic a Obrir:

 LaunchNow=Llan<61>ar ara Dolibarr
--- a/build/exe/doliwamp/Languages/MyEnglish.isl
+++ b/build/exe/doliwamp/Languages/MyEnglish.isl
@@ -31,7 +31,6 @@ FailedToDeleteLock=Failed to delete the file %1/www/dolibarr/install.lock. You c
 PortAlreadyInUse=Port %1 seems to be already in use. You should cancel to go back and choose another value for %2 port. Cancel choice and choose another value ?

 FirefoxDetected=Firefox has been detected on your computer. Would you like to use it as the default browser for Dolibarr ?
-ChromeDetected=Chrome has been detected on your computer. Would you like to use it as the default browser for Dolibarr ?
 ChooseDefaultBrowser=Please choose your default browser. If you are not sure, just click Open :

 LaunchNow=Launch Dolibarr now
--- a/build/exe/doliwamp/Languages/MyFrench.isl
+++ b/build/exe/doliwamp/Languages/MyFrench.isl
@@ -21,8 +21,8 @@ TechnicalParameters=Param
 IfFirstInstall=S'il s'agit de la premi<6D>re installation, merci de sp<73>cifier ces quelques param<61>tres techniques. Si vous ne les comprennez pas, <20>tes non s<>r, ou proc<6F>dez <20> une mise <20> jour, laissez les champs avec les valeurs propos<6F>es par d<>faut.


-; WARNING !!! STRINGS FOR THIS 4 STRINGS MUST BE LOWER THAN 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,7 +32,6 @@ FailedToDeleteLock=Echec de la suppression du fichier %1/www/dolibarr/install.lo
 PortAlreadyInUse=Le port %1 semble d<>j<EFBFBD> utilis<69>. Il est recommand<6E> d'annuler pour revenir en arri<72>re et sp<73>cifier une autre valeur pour le port %2. Annuler le choix et choisir une autre valeur ?

 FirefoxDetected=Firefox a <20>t<EFBFBD> d<>tect<63> sur votre ordinateur. Voulez-vous en faire votre navigateur par d<>faut pour Dolibarr ?
-ChromeDetected=Chrome a <20>t<EFBFBD> d<>tect<63> sur votre ordinateur. Voulez-vous en faire votre navigateur par d<>faut pour Dolibarr ?
 ChooseDefaultBrowser=Merci de choisir votre navigateur par d<>faut. Si vous n'<27>tes pas s<>r, cliquez simplement sur Ouvrir :

 LaunchNow=Lancer Dolibarr maintenant
--- a/build/exe/doliwamp/Languages/MySpanish.isl
+++ b/build/exe/doliwamp/Languages/MySpanish.isl
@@ -20,7 +20,7 @@ DoYouWantToStart=
 TechnicalParameters=Par<61>metros t<>cnicos
 IfFirstInstall=Si se trata de la primera instalaci<63>n, deber<65> especificar algunos par<61>metros t<>cnicos. Si no los entiende, no est<73> seguro o va a proceder a una actualizaci<63>n, deje los campos con los valores propuestos por defecto.

-; WARNING !!! STRINGS HERE MUST BE LOWER THAN 70 CHARACTERS
+; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
 SMTPServer=Servidor SMTP (El suyo o el de su ISP, <20>nicamente primera instalaci<63>n) :
 ApachePort=Puerto Apache (<28>nicamente primera instalaci<63>n, normalmente es el 80) :
 MySqlPort=Puerto Mysql (<28>nicamente primera instalaci<63>n, normalmente es el 3306) :
@@ -31,7 +31,6 @@ FailedToDeleteLock=Error en la eliminaci
 PortAlreadyInUse=Parece que el puerto %1 ya esta siendo usado. Se recomienda cancelar, volver atras y especificar otro valor para el puerto %2. <20>Cancelar y escojer otro valor?

 FirefoxDetected=Se ha detectado Firefox en su ordenador. Desea activarlo por defecto como navegador para Dolibarr ?
-ChromeDetected=Se ha detectado Chrome en su ordenador. Desea activarlo por defecto como navegador para Dolibarr ?
 ChooseDefaultBrowser=Escoja su navegador por defecto. Si no est<73> seguro, simplementa haga clic en Abrir :

 LaunchNow=Lanzar ahora Dolibarr
--- a/build/exe/doliwamp/UsedPort.cpp
+++ b/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");
--- a/build/exe/doliwamp/config.inc.php.install
+++ b/build/exe/doliwamp/config.inc.php.install
@@ -376,7 +376,7 @@ $cfg['DefaultConnectionCollation'] = 'utf8_unicode_ci';
 //        libraries/select_lang.lib.php
 // $cfg['Lang']     = 'en-iso-8859-1';

-// Regular expression to limit listed languages, eg. '^(cs|en)' for Czech and
+// Regullar expression to limit listed languages, eg. '^(cs|en)' for Czech and
 // English only
 $cfg['FilterLanguages'] = '';

--- a/build/exe/doliwamp/dolibarr.conf.install
+++ b/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>
--- a/build/exe/doliwamp/doliwamp.bmp
+++ b/build/exe/doliwamp/doliwamp.bmp
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -16,10 +16,10 @@
 [Setup]
 ; ----- Change this -----
 AppName=DoliWamp
-; Replace key with DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
-AppVerName=__FILENAMEEXEDOLIWAMP__
-; Replace key with DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
-OutputBaseFilename=__FILENAMEEXEDOLIWAMP__
+; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
+AppVerName=DoliWamp-3.3.5
+; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
+OutputBaseFilename=DoliWamp-3.3.5
 ; ----- End of change
 ;OutputManifestFile=build\doliwampbuild.log
 ; Define full path from which all relative path are defined
@@ -32,7 +32,7 @@ AppPublisherURL=http://www.nltechno.com
 AppSupportURL=http://www.dolibarr.org
 AppUpdatesURL=http://www.dolibarr.org
 AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql softwares.
-AppCopyright=Copyright (C) 2008-2016 Laurent Destailleur, NLTechno
+AppCopyright=Copyright (C) 2008-2013 Laurent Destailleur, NLTechno
 DefaultDirName=c:\dolibarr
 DefaultGroupName=Dolibarr
 ;LicenseFile=COPYING
@@ -42,7 +42,6 @@ SolidCompression=yes
 WizardImageFile=build\exe\doliwamp\doliwamp.bmp
 WizardSmallImageFile=build\exe\doliwamp\doliwampsmall.bmp
 SetupIconFile=doc\images\dolibarr.ico
-;To say the installer must be ran as admin
 PrivilegesRequired=admin
 DisableProgramGroupPage=yes
 ChangesEnvironment=no
@@ -81,18 +80,18 @@ Name: "desktopicon"; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:
 Name: "{app}\logs"
 Name: "{app}\tmp"
 Name: "{app}\dolibarr_documents"
-Name: "{app}\bin\apache\apache2.4.9\logs"
+Name: "{app}\bin\apache\apache2.2.11\logs"

 [Files]
 ; Stop/start
 Source: "build\exe\doliwamp\stopdoliwamp.bat"; DestDir: "{app}\"; Flags: ignoreversion; AfterInstall: close()
 Source: "build\exe\doliwamp\startdoliwamp.bat"; DestDir: "{app}\"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\install_services.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\uninstall_services.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\removefiles.bat"; DestDir: "{app}\"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\rundoliwamp.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\rundolihelp.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\rundoliadmin.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\install_services.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\uninstall_services.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\mysqlinitpassword.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\mysqltestinstall.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\startdoliwamp_manual_donotuse.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
@@ -100,28 +99,27 @@ Source: "build\exe\doliwamp\builddemosslfiles.bat.install"; DestDir: "{app}\"; F
 Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversion;
 ; PhpMyAdmin, Apache, Php, Mysql
 ; Put here path of Wampserver applications
-; Value OK: apache 2.2.6, php 5.2.5 (5.2.11, 5.3.0 and 5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45
-; Value OK: apache 2.2.11, php 5.3.0 (if no php_exif, php_pgsql, php_zip), mysql 5.0.45
-; Value ???: apache 2.4.19, php 5.5.12, mysql 5.0.45 instead of 5.6.17 (wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe)
-Source: "C:\Program Files\Wamp\apps\phpmyadmin4.1.14\*.*"; DestDir: "{app}\apps\phpmyadmin4.1.14"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log,darkblue_orange"
-Source: "C:\Program Files\Wamp\bin\apache\apache2.4.9\*.*"; DestDir: "{app}\bin\apache\apache2.4.9"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
-Source: "C:\Program Files\Wamp\bin\php\php5.5.12\*.*"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
+; 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)
 Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db"
 ; Dolibarr
-Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,nltechno*\*,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php"
-Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,dbmodel\*,fpdf\*,initdata\*,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\*,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\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\php.ini.install"; DestDir: "{app}\bin\php\php5.5.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;
@@ -135,7 +133,6 @@ Source: "COPYRIGHT"; DestDir: "{app}"; Flags: ignoreversion;
 [Icons]
 Name: "{group}\Dolibarr ERP-CRM"; Filename: "{app}\rundoliwamp.bat"; WorkingDir: "{app}"; IconFilename: {app}\www\dolibarr\doc\images\dolibarr.ico
 Name: "{group}\Tools\Help center"; Filename: "{app}\rundolihelp.bat"; WorkingDir: "{app}"; IconFilename: {app}\www\dolibarr\doc\images\dolihelp.ico
-Name: "{group}\Tools\Host your ERP-CRM in the Cloud"; Filename: "http://wiki.dolibarr.org/index.php/Cloud_Solutions"; WorkingDir: "{app}"; IconFilename: {app}\www\dolibarr\doc\images\dolihelp.ico
 Name: "{group}\Tools\Start DoliWamp server"; Filename: "{app}\startdoliwamp.bat"; WorkingDir: "{app}"; IconFilename: {app}\www\dolibarr\doc\images\doliwampon.ico
 Name: "{group}\Tools\Stop DoliWamp server"; Filename: "{app}\stopdoliwamp.bat"; WorkingDir: "{app}"; IconFilename: {app}\www\dolibarr\doc\images\doliwampoff.ico
 Name: "{group}\Tools\Admin DoliWamp server"; Filename: "{app}\rundoliadmin.bat"; WorkingDir: "{app}"; IconFilename: {app}\www\dolibarr\doc\images\doliadmin.ico
@@ -147,16 +144,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
@@ -207,10 +194,10 @@ 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.2.11';
+  phpVersion := '5.3.0' ;
  mysqlVersion := '5.0.45';
-  phpmyadminVersion := '4.1.14';
+  phpmyadminVersion := '3.2.0.1';

  smtpServer := 'localhost';
  apachePort := '80';
@@ -244,9 +231,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
@@ -267,13 +254,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);
@@ -281,7 +269,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);
@@ -321,7 +308,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;
@@ -340,23 +328,11 @@ begin
    winPath := ExpandConstant('{win}');
    pathWithSlashes := path;
    StringChange (pathWithSlashes, '\','/');
-    datadir := pathWithSlashes+'/bin/mysql/data';
+    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';

-
-    //----------------------------------------------
-    // Test if msvcr110 DLL has been installed
-    //----------------------------------------------
-	
-    if not FileExists ('c:/windows/system32/msvcr110.dll') and not FileExists ('c:/windows/sysWOW64/msvcr110.dll') and not FileExists ('c:/winnt/system32/msvcr110.dll') and not FileExists ('c:/winnt/sysWOW64/msvcr110.dll') then
-    begin
-      // TODO Copy file or ask to install package ?
-      //CustomMessage('YouWillInstallDoliWamp')+#13#13
-      MsgBox('The package vcredist_x86.exe must have been installed first. It seems it is not. Please install it first from <a href="http://ccc">http://www.microsoft.com/en-us/download/details.aspx?id=30679</a> then restart DoliWamp installation/upgrade.',mbInformation,MB_OK);
-    end;
-
-
    // If we have a new database version, we should only copy old my.ini file into new directory
    // and change only all basedir= strings to use new version. Like this, data dir is still correct.
    // Install of service and stop/start scripts are already rebuild by installer.
@@ -424,7 +400,7 @@ begin
    begin
      themessage := FmtMessage(CustomMessage('FailedToDeleteLock'),[pathWithSlashes]);
 		  MsgBox(themessage,mbInformation,MB_OK);
-    end;
+    end


 		// Check if parameters already defined in conf.php file
@@ -545,20 +521,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
@@ -566,8 +528,6 @@ begin
 	          browser := pfPath+'/Mozilla Firefox/firefox.exe';
 	        end;
 	      end;
-		  end;
-	      
 	      if browser = 'iexplore.exe' then
 	      begin
            if FileExists (pfPath+'/Internet Explorer/iexplore.exe')  then
@@ -597,7 +557,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
@@ -620,7 +580,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPPHPMYADMINVERSION', phpmyadminVersion, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end;
+		    end
 		    DeleteFile(srcFile);
 		
 		
@@ -632,9 +592,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);
 		
@@ -643,18 +601,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);
 		
 		
@@ -667,25 +613,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;
 		
 		
 		
@@ -708,7 +643,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end;
+		    end
 		
 		
 		
@@ -727,10 +662,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
 		
 		
 		
@@ -762,7 +696,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPAPACHEPORT', myporta, True);
 		      StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
 		      SaveStringToFile(destFile, srcContents, False);
-		    end;
+		    end
 		
 		
 		
@@ -785,7 +719,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end;
+		    end
 		
 		
 		
@@ -801,12 +735,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);
 		
 		      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
+		
 		
 		
 		
@@ -822,12 +776,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
 		
 		
 		
@@ -848,7 +801,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end;
+		    end
 		
 		
 		    //----------------------------------------------
@@ -869,7 +822,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end;
+		    end
 		
 		
 		    //----------------------------------------------
@@ -890,7 +843,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end;
+		    end
 		    
 		
 		    //----------------------------------------------
@@ -909,7 +862,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
-		    end;
+		    end

 		
 		    //----------------------------------------------
@@ -926,7 +879,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)
@@ -942,7 +895,7 @@ begin
 		      StringChangeEx (srcContents, 'WAMPSMTP', mysmtp, True);
              StringChangeEx (srcContents, 'WAMPPHPVERSION', phpVersion, True);
 		      SaveStringToFile(destFile,srcContents, False);
-		    end;
+		    end
 		
 		
 		
@@ -984,7 +937,7 @@ begin

      	res := False;
 		  	
-		  end;
+		  end
      
    end
    else
@@ -994,9 +947,9 @@ begin
 		  	
 		  	res := False;

-    end;
+    end
    
-  end;
+  end


  Result := res;
@@ -1011,6 +964,7 @@ end;
 procedure DeinitializeSetup();
 begin
 //  DeleteFile(path+'\install_services.bat');
+//  DeleteFile(path+'\install_services_auto.bat');
 end;


--- a/build/exe/doliwamp/doliwampsmall.bmp
+++ b/build/exe/doliwamp/doliwampsmall.bmp
--- a/build/exe/doliwamp/httpd.conf.install
+++ b/build/exe/doliwamp/httpd.conf.install
@@ -66,23 +66,19 @@ Listen WAMPAPACHEPORT
 #
 LoadModule actions_module modules/mod_actions.so
 LoadModule alias_module modules/mod_alias.so
-LoadModule allowmethods_module modules/mod_allowmethods.so
 LoadModule asis_module modules/mod_asis.so
 LoadModule auth_basic_module modules/mod_auth_basic.so
 #LoadModule auth_digest_module modules/mod_auth_digest.so
 #LoadModule authn_anon_module modules/mod_authn_anon.so
 #LoadModule authn_dbm_module modules/mod_authn_dbm.so
+LoadModule authn_default_module modules/mod_authn_default.so
 LoadModule authn_file_module modules/mod_authn_file.so
-LoadModule authz_core_module modules/mod_authz_core.so
 #LoadModule authz_dbm_module modules/mod_authz_dbm.so
-#LoadModule authz_default_module modules/mod_authz_default.so
+LoadModule authz_default_module modules/mod_authz_default.so
 LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
 LoadModule authz_host_module modules/mod_authz_host.so
 LoadModule authz_user_module modules/mod_authz_user.so
 LoadModule autoindex_module modules/mod_autoindex.so
-LoadModule buffer_module modules/mod_buffer.so
-LoadModule cache_module modules/mod_cache.so
-LoadModule cache_disk_module modules/mod_cache_disk.so
 #LoadModule cern_meta_module modules/mod_cern_meta.so
 LoadModule cgi_module modules/mod_cgi.so
 #LoadModule dav_module modules/mod_dav.so
@@ -100,23 +96,23 @@ LoadModule isapi_module modules/mod_isapi.so
 LoadModule log_config_module modules/mod_log_config.so
 LoadModule mime_module modules/mod_mime.so
 #LoadModule mime_magic_module modules/mod_mime_magic.so
-LoadModule negotiation_module modules/mod_negotiation.so
 #LoadModule proxy_module modules/mod_proxy.so
 #LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
 #LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
 #LoadModule proxy_connect_module modules/mod_proxy_connect.so
 #LoadModule proxy_http_module modules/mod_proxy_http.so
 #LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
+LoadModule negotiation_module modules/mod_negotiation.so
 LoadModule rewrite_module modules/mod_rewrite.so
 LoadModule setenvif_module modules/mod_setenvif.so
 #LoadModule speling_module modules/mod_speling.so
-#LoadModule ssl_module modules/mod_ssl.so
 LoadModule status_module modules/mod_status.so
 #LoadModule unique_id_module modules/mod_unique_id.so
 LoadModule userdir_module modules/mod_userdir.so
 #LoadModule usertrack_module modules/mod_usertrack.so
 LoadModule vhost_alias_module modules/mod_vhost_alias.so
-LoadModule php5_module "WAMPROOT/bin/php/phpWAMPPHPVERSION/php5apache2_4.dll"
+#LoadModule ssl_module modules/mod_ssl.so
+LoadModule php5_module "WAMPROOT/bin/php/phpWAMPPHPVERSION/php5apache2_2.dll"

 #
 # ExtendedStatus controls whether Apache will generate "full" status
@@ -127,9 +123,9 @@ ExtendedStatus On

 <Location /server-status>
 SetHandler server-status
-Require local
-#Require ip 1.2.3.4
-#Require host 1.2.3.4
+Order Deny,Allow
+Deny from all
+Allow from localhost, 127.0.0.1
 </Location>


@@ -215,7 +211,9 @@ KeepAliveTimeout 30
 <Directory />
    Options FollowSymLinks
    AllowOverride None
-    Require all denied
+    Order deny,allow
+    Deny from all
+    Satisfy all
 </Directory>

 #
@@ -255,13 +253,9 @@ KeepAliveTimeout 30
    # Controls who can get stuff from this server.
    #
 #   onlineoffline tag - don't remove
-	
-	Require all granted
-    
-    <RequireAny>
-		Require ip 127.0.0.1
-		Require host localhost
-	</RequireAny>
+    Order Deny,Allow
+    Deny from all
+    Allow from 127.0.0.1

 </Directory>

@@ -278,7 +272,8 @@ KeepAliveTimeout 30
 # viewed by Web clients. 
 #
 <FilesMatch "^\.ht">
-    Require all denied
+    Order allow,deny
+    Deny from all
 </FilesMatch>

 #
@@ -364,7 +359,8 @@ LogLevel warn
 <Directory "cgi-bin">
    AllowOverride None
    Options None
-    Require all granted
+    Order allow,deny
+    Allow from all
 </Directory>

 # 
@@ -414,7 +410,7 @@ LogLevel warn
 # keep browsers from trying to display binary files as though they are
 # text.
 #
-#DefaultType text/plain
+DefaultType text/plain

 <IfModule mime_module>
    #
@@ -749,7 +745,7 @@ SSLCertificateKeyFile "WAMPROOT/myserver.key"
 # You can also set this with constant MAIN_OPTIMIZE_SPEED and bit 2 set. 
 #TODO

-# OPTIMIZE: To use cache on static pages (A259200 = 1 month, A7200 = 2 hours, A691600 = 8 days = recommanded for static resources).
+# 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
@@ -762,15 +758,5 @@ SSLCertificateKeyFile "WAMPROOT/myserver.key"
 #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"
--- a/build/exe/doliwamp/install_services.bat.install
+++ b/build/exe/doliwamp/install_services.bat.install
@@ -8,8 +8,6 @@ echo ---- Execute install_services.bat >> doliwamp.log 2>>&1
 REM NET STOP doliwampapache
 REM NET STOP doliwampmysqld 

-cd "WAMPROOT"
-
 REM Apache x.x
 .\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k install -n doliwampapache
 REM reg add HKLM\SYSTEM\CurrentControlSet\Services\doliwampapache /V Start /t REG_DWORD /d 3 /f
@@ -21,5 +19,3 @@ REM Mysql 5.1+
 REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --install doliwampmysqld

 echo ---- End script >> doliwamp.log 2>>&1
-
-REM pause
--- a/build/exe/doliwamp/my.ini.install
+++ b/build/exe/doliwamp/my.ini.install
@@ -69,7 +69,7 @@ port=WAMPMYSQLPORT


 #Path to installation directory. All paths are usually resolved relative to this.
-basedir=WAMPROOT/bin/mysql/mysqlWAMPMYSQLVERSION
+basedir=WAMPROOT/bin/mysql/mysql5.0.45

 #log file
 log-error=WAMPROOT/logs/mysql.log
@@ -77,6 +77,10 @@ log-error=WAMPROOT/logs/mysql.log
 #Path to the database root
 datadir=WAMPROOT/bin/mysql/data

+# The default character set that will be used when a new schema or table is
+# created and no character set is defined
+default-character-set=latin1
+
 # The default storage engine that will be used when create new tables when
 default-storage-engine=INNODB

@@ -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,7 +226,7 @@ port=WAMPMYSQLPORT


 #Path to installation directory. All paths are usually resolved relative to this.
-basedir=WAMPROOT/bin/mysql/mysqlWAMPMYSQLVERSION
+basedir=WAMPROOT/bin/mysql/mysql5.0.45

 #log file
 log-error=WAMPROOT/logs/mysql.log
@@ -204,6 +234,10 @@ log-error=WAMPROOT/logs/mysql.log
 #Path to the database root
 datadir=WAMPROOT/bin/mysql/data

+# The default character set that will be used when a new schema or table is
+# created and no character set is defined
+default-character-set=latin1
+
 # The default storage engine that will be used when create new tables when
 default-storage-engine=INNODB

@@ -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
--- a/build/exe/doliwamp/php.ini.install
+++ b/build/exe/doliwamp/php.ini.install
@@ -603,7 +603,7 @@ upload_max_filesize = 2M
 ;;;;;;;;;;;;;;;;;;

 ; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
-allow_url_fopen = On
+allow_url_fopen = Off

 ; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
 allow_url_include = Off
--- a/build/exe/doliwamp/phpmyadmin.conf.install
+++ b/build/exe/doliwamp/phpmyadmin.conf.install
@@ -1,29 +1,22 @@
 Alias /phpmyadmin "WAMPROOT/apps/phpmyadminWAMPPHPMYADMINVERSION/" 

-# NOTE FOR APACHE 2.2:
-# To grant access to dolibarr from outside set lines
-#
-#	Order Allow,Deny 
-#	Allow from all
-#
-# instead of
+# to give access to phpmyadmin from outside 
+# replace the lines
 #
 #        Order Deny,Allow
 #	Deny from all
 #	Allow from 127.0.0.1
 #
-# NOTE FOR APACHE 2.3:
-# To grant access to dolibarr from outside set lines
+# by
 #
-#	Require all granted
-#
-# instead of
-#
-#	Require local
+#        Order Allow,Deny 
+#   Allow from all
 #

 <Directory "WAMPROOT/apps/phpmyadminWAMPPHPMYADMINVERSION/">
    Options Indexes FollowSymLinks MultiViews
    AllowOverride all
-    Require local
+        Order Deny,Allow
+	Deny from all
+	Allow from 127.0.0.1
 </Directory>
--- a/build/exe/doliwamp/startdoliwamp.bat
+++ b/build/exe/doliwamp/startdoliwamp.bat
@@ -10,11 +10,9 @@ NET START doliwampapache >> doliwamp.log 2>>&1
 echo NET START doliwampmysqld >> doliwamp.log 2>>&1
 NET START doliwampmysqld >> doliwamp.log 2>>&1

-REM You can also check logs into c:/dolibarr/logs if start fails
-
 echo Please wait...
 echo ---- End script >> doliwamp.log 2>>&1

 REM sleep is not a Windows commande
-REM sleep 2
-ping 127.0.0.1 -n 2 -w 1000 > nul
+REM sleep 1
+ping 1.1.1.1 -n 1 -w 1000 > nul
--- a/build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install
+++ b/build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install
@@ -13,6 +13,5 @@ echo

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

 pause
--- a/build/exe/doliwamp/stopdoliwamp.bat
+++ b/build/exe/doliwamp/stopdoliwamp.bat
@@ -16,5 +16,3 @@ echo ---- End script >> doliwamp.log 2>>&1
 REM sleep is not a Windows command
 REM sleep 1
 ping 1.1.1.1 -n 1 -w 1000 > nul
-
-REM pause
--- a/build/exe/doliwamp/uninstall_services.bat.install
+++ b/build/exe/doliwamp/uninstall_services.bat.install
@@ -3,19 +3,10 @@ REM --------------------------------------------------------
 REM This script install Apache and Mysql DoliWamp services
 REM --------------------------------------------------------

-cd "WAMPROOT"
-
 echo ---- Execute uninstall_services.bat >> doliwamp.log 2>>&1
 NET STOP doliwampapache
 .\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k uninstall -n doliwampapache
-
 NET STOP doliwampmysqld 
-REM Mysql 5.0-
 .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --remove doliwampmysqld
-REM Mysql 5.1+
-REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --remove doliwampmysqld
-
 REM wampmanager.exe -quit -id={doliwampserver}
 echo ---- End script >> doliwamp.log 2>>&1
-
-REM pause
--- a/build/generate_filecheck_xml.php
+++ b/build/generate_filecheck_xml.php
@@ -1,121 +0,0 @@
-#!/usr/bin/env php
-<?php
-/* Copyright (C) 2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *      \file       build/generate_filecheck_xml.php
- *		\ingroup    dev
- * 		\brief      This script create a xml checksum file
- */
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
-}
-
-require_once($path."../htdocs/master.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
-
-
-/*
- * Main
- */
-
-if (empty($argv[1])) 
-{
-    print "Usage: ".$script_file." release=x.y.z\n";
-    exit -1;
-}
-parse_str($argv[1]);
-
-if ($release != DOL_VERSION)
-{
-    print 'Error: release is not version declared into filefunc.in.php.'."\n";
-    exit -1;
-}
-
-//$outputfile=dirname(__FILE__).'/../htdocs/install/filelist-'.$release.'.xml';
-$outputdir=dirname(__FILE__).'/../htdocs/install';
-print 'Delete current files '.$outputdir.'/filelist*.xml'."\n";
-dol_delete_file($outputdir.'/filelist*.xml',0,1,1);
-
-$outputfile=$outputdir.'/filelist-'.$release.'.xml';
-$fp = fopen($outputfile,'w');
-fputs($fp, '<?xml version="1.0" encoding="UTF-8" ?>'."\n");
-fputs($fp, '<checksum_list version="'.$release.'">'."\n");
-
-fputs($fp, '<dolibarr_htdocs_dir>'."\n");
-
-$dir_iterator1 = new RecursiveDirectoryIterator(dirname(__FILE__).'/../htdocs/');
-$iterator1 = new RecursiveIteratorIterator($dir_iterator1);
-// need to ignore document custom etc
-$files = new RegexIterator($iterator1, '#^(?:[A-Z]:)?(?:/(?!(?:custom|documents|conf|install|nltechno))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
-$dir='';
-$needtoclose=0;
-foreach ($files as $file) {
-    $newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
-    if ($newdir!=$dir) {
-        if ($needtoclose)
-            fputs($fp, '</dir>'."\n");
-        fputs($fp, '<dir name="'.$newdir.'" >'."\n");
-        $dir = $newdir;
-        $needtoclose=1;
-    }
-    if (filetype($file)=="file") {
-        fputs($fp, '<md5file name="'.basename($file).'">'.md5_file($file).'</md5file>'."\n");
-    }
-}
-fputs($fp, '</dir>'."\n");
-fputs($fp, '</dolibarr_htdocs_dir>'."\n");
-
-
-fputs($fp, '<dolibarr_script_dir version="'.$release.'">'."\n");
-
-$dir_iterator2 = new RecursiveDirectoryIterator(dirname(__FILE__).'/../scripts/');
-$iterator2 = new RecursiveIteratorIterator($dir_iterator2);
-// need to ignore document custom etc
-$files = new RegexIterator($iterator2, '#^(?:[A-Z]:)?(?:/(?!(?:custom|documents|conf|install|nltechno))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
-$dir='';
-$needtoclose=0;
-foreach ($files as $file) {
-    $newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
-    if ($newdir!=$dir) {
-        if ($needtoclose)
-            fputs($fp, '</dir>'."\n");
-        fputs($fp, '<dir name="'.$newdir.'" >'."\n");
-        $dir = $newdir;
-        $needtoclose=1;
-    }
-    if (filetype($file)=="file") {
-        fputs($fp, '<md5file name="'.basename($file).'">'.md5_file($file).'</md5file>'."\n");
-    }
-}
-fputs($fp, '</dir>'."\n");
-fputs($fp, '</dolibarr_script_dir>'."\n");
-
-
-fputs($fp, '</checksum_list>'."\n");
-fclose($fp);
-
-print "File ".$outputfile." generated\n";
-
-exit(0);
--- a/build/launchpad/README
+++ b/build/launchpad/README
@@ -41,41 +41,40 @@ If you want to build/test package locally:
 # Push/declare Dolibarr sources to Launchpad
 #----------------------------------
 - From Launchpad project (https://launchpad.net/dolibarr), register a series: 
-    Call it 'trunk' or 'stable'
+    Call it 'trunk' or 'beta' or 'stable'
    Use branch (dev):
-    https://launchpad.net/~eldy/dolibarr/develop
-    https://launchpad.net/~eldy/dolibarr/stable
+    ~eldy/dolibarr/develop
+    ~eldy/dolibarr/beta
+    ~eldy/dolibarr/stable
    or 
-    Use URL pattern (stable):
-    For stable: http://www.dolibarr.org/files/lastbuild/package_debian-ubuntu/dolibarr_x.z.*.tar.gz
+    Use URL pattern (beta or stable):
+    http://www.dolibarr.org/files/lastbuild/package_debian-ubuntu/dolibarr_x.z.*.tar.gz
+    http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_x.y.*.tar.gz
    
 - For Dev, you can also add link serie to GIT HEAD.
- For stable, you can init from command line
-	cd bzr/dolibarr-stable
+- For beta and stable, you can init from command line
+	cd bzr/dolibarr-[beta|stable]
    bzr init
    bzr add
    bzr commit -m "Init"
-    bzr push lp:~yourlogin/dolibarr/stable
+    bzr push lp:~yourlogin/dolibarr/[beta|stable]

 - List of series are visible here: https://launchpad.net/dolibarr/+series

-# To update Dolibarr into launchpad (when remote repository for sources already exists)
+# To update Dolibarr into launchpad (when repository for sources already exists)
 #----------------------------------
-	# create local repository
 	cd bzr
-	bzr branch lp:~yourlogin/dolibarr/[develop|stable] dolibarr-[dev|stable]
-    cd dolibarr-[dev|stable]
-    # Update
-    bzr update
-	-- Update files here: Remove all (except .bzr dir) and overwrite --
+	bzr branch lp:~yourlogin/dolibarr/[dev|beta|stable]
+    cd dolibarr-[dev|beta|stable]
    bzr status
-	bzr add *
-    bzr commit -m "Upstream version x.y"
+	-- Update files here --
+    bzr commit -m "Description of change"
    bzr push

+
 # Init debian dir repository into launchpad (when repository for sources does not exist)
 #----------------------------------
-  Create debian directory and upload it onto bzr branch lp:~yourlogin/+junk/debian-[dev|stable]
+-  Create debian directory and upload it onto bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
    cd bzr
    mkdir debian
    cd debian
@@ -83,25 +82,25 @@ If you want to build/test package locally:
    bzr init
    bzr add
    bzr commit -m "Init control files"
-    bzr push lp:~yourlogin/+junk/debian-[dev|stable]    (put here any branch name or just bzr push if into a known branch)
+    bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable]    (put here any branch name)
 - or download it from launchpad bazaar:
    cd bzr
-    bzr branch lp:~yourlogin/+junk/debian-[dev|stable]
+    bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]

 # Get debian dir repository from launchpad (when repository for sources already exists)
 #----------------------------------
 	cd bzr
-	bzr branch lp:~yourlogin/+junk/debian-[dev|stable]
+	bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]

 # To update debian dir into launchpad (when repository for sources already exists)
 #----------------------------------
 	cd bzr
-	bzr branch lp:~yourlogin/+junk/debian-[dev|stable]
-    cd debian-[dev|stable]
+	bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
+    cd debian-[dev|beta|stable]
    bzr status
-	-- Update files here: Remove all (except .bzr dir) and overwrite. Restore version into the file changelog --
+	-- Update files here --
    bzr commit -m "Description of change"
-    bzr push lp:~yourlogin/+junk/debian-[dev|stable]
+    bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable]


 # Define a recipe into launchpad (a rule to build packages into a PPA)
@@ -114,7 +113,7 @@ If you want to build/test package locally:
 		lp:dolibarr
 		merge packaging lp:~yourlogin/+junk/debian-dev
    	For stable:
-	    # bzr-builder format 0.3 deb-version {debupstream}-2~{revno}
+	    # bzr-builder format 0.3 deb-version {debupstream}-0~{revno}
 		lp:dolibarr/stable
 		merge packaging lp:~yourlogin/+junk/debian-stable
 - Run command
@@ -124,10 +123,6 @@ If you want to build/test package locally:
 - Test package sources
    sudo pbuilder build <working-dir>/<project>_<version>.dsc

-List of recipes created
-https://code.launchpad.net/~eldy/+recipe/dolibarr-dev
-https://code.launchpad.net/~eldy/+recipe/dolibarr-stable
-
    
 # To get/download package from PPA:
 #----------------------------------
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -2,7 +2,7 @@
 #----------------------------------------------------------------------------
 # \file         build/makepack-dolibarr.pl
 # \brief        Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
-# \author       (c)2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+# \author       (c)2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
 #
 # This is list of constant you can set to have generated packages moved into a specific dir: 
 #DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild'
@@ -15,18 +15,12 @@

 use Cwd;

-
-# Change this to defined target for option 98 and 99
 $PROJECT="dolibarr";
-$PUBLISHSTABLE="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr";
-$PUBLISHBETARC="ldestailleur\@asso.dolibarr.org:/home/dolibarr/dolibarr.org/httpdocs/files";
+$RPMSUBVERSION="auto";	# auto use value found into BUILD

-
-#@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
-@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
+@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
 %REQUIREMENTPUBLISH=(
-"SF"=>"git ssh rsync",
-"ASSO"=>"git ssh rsync"
+"SF"=>"git ssh rsync"
 );
 %REQUIREMENTTARGET=(                            # Tool requirement for each package
 "TGZ"=>"tar",
@@ -46,14 +40,13 @@ $PUBLISHBETARC="ldestailleur\@asso.dolibarr.org:/home/dolibarr/dolibarr.org/http
 "makensis.exe"=>"NSIS"
 );

-$RPMSUBVERSION="auto";	# auto use value found into BUILD
 if (-d "/usr/src/redhat")   { $RPMDIR="/usr/src/redhat"; } # redhat
 if (-d "/usr/src/packages") { $RPMDIR="/usr/src/packages"; } # opensuse
 if (-d "/usr/src/RPM")      { $RPMDIR="/usr/src/RPM"; } # mandrake


 use vars qw/ $REVISION $VERSION /;
-$VERSION="4.0";
+$VERSION="3.3";



@@ -65,13 +58,7 @@ $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/;

 $SOURCE="$DIR/..";
 $DESTI="$SOURCE/build";
-if ($SOURCE !~ /^\//)
-{
-	print "Error: Launch the script $PROG.$Extension with its full path from /.\n";
-	print "$PROG.$Extension aborted.\n";
-	sleep 2;
-	exit 1;
-}
+$PUBLISH="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr";
 if (! $ENV{"DESTIBETARC"} || ! $ENV{"DESTISTABLE"})
 {
    print "Error: Missing environment variables.\n";
@@ -129,7 +116,7 @@ $BUILDROOT="$TEMP/buildroot";
 $result = open( IN, "<" . $SOURCE . "/htdocs/filefunc.inc.php" );
 if ( !$result ) { die "Error: Can't open descriptor file " . $SOURCE . "/htdocs/filefunc.inc.php\n"; }
 while (<IN>) {
-	if ( $_ =~ /define\('DOL_VERSION','([\d\.a-z\-]+)'\)/ ) { $PROJVERSION = $1; break; }
+	if ( $_ =~ /define\('DOL_VERSION','([\d\.]+)'\)/ ) { $PROJVERSION = $1; break; }
 }
 close IN;
 ($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
@@ -148,9 +135,9 @@ $FILENAMEEXEDOLIWAMP = "DoliWamp-$MAJOR.$MINOR.$BUILD";
 $ARCH='noarch';
 $newbuild = $BUILD;
 $newbuild =~ s/(dev|alpha)/0.1.a/gi;			# dev (fedora)
-$newbuild =~ s/beta(.?)/0.2.beta/gi;			# beta (fedora)    (we want beta1, beta2, betax to be same package name)
-$newbuild =~ s/rc(.?)/0.3.rc/gi;				# rc (fedora)      (we want rc1, rc2, rcx to be same package name)
-if ($newbuild !~ /-/) { $newbuild.='-0.4'; }	# finale (fedora)
+$newbuild =~ s/beta/0.2.beta1/gi;				# beta (fedora)
+$newbuild =~ s/rc./0.3.rc1/gi;					# rc (fedora)
+if ($newbuild !~ /-/) { $newbuild.='-0.3'; }	# finale (fedora)
 #$newbuild =~ s/(dev|alpha)/0/gi;				# dev
 #$newbuild =~ s/beta/1/gi;						# beta
 #$newbuild =~ s/rc./2/gi;						# rc
@@ -162,10 +149,10 @@ $FILENAMERPM=$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm";
 # For Deb
 $newbuild = $BUILD;
 $newbuild =~ s/(dev|alpha)/1/gi;                # dev
-$newbuild =~ s/beta(.?)/2/gi;                   # beta    			(we want beta1, beta2, betax to be same package name)
-$newbuild =~ s/rc(.?)/3/gi;                     # rc				(we want rc1, rc2, rcx to be same package name)
-if ($newbuild !~ /-/) { $newbuild.='-4'; }      # finale is same than rc. 
-# now newbuild is 0-1 or 0-4 for example. Note that for native package (see debian/source/format), we should not use a dash part but to get a better version management
+$newbuild =~ s/beta/2/gi;                       # beta
+$newbuild =~ s/rc./3/gi;                        # rc
+if ($newbuild !~ /-/) { $newbuild.='-3'; }      # finale is same than rc. 
+# now newbuild is 0-1 or 0-3 for example. Note that for native package (see debian/source/format), we should not use a dash part but to get a better version management
 $build = $newbuild;
 $build =~ s/-.*$//g;
 # now build is 0 for example
@@ -173,7 +160,6 @@ $build =~ s/-.*$//g;
 # now build is 0+nmu1 for example
 $FILENAMEDEBNATIVE="${PROJECT}_${MAJOR}.${MINOR}.${build}";
 $FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${newbuild}";
-$FILENAMEDEBSHORT="${PROJECT}_${MAJOR}.${MINOR}.${build}";


 my $copyalreadydone=0;
@@ -188,15 +174,15 @@ for (0..@ARGV-1) {
 }
 if ($ENV{"DESTIBETARC"} && $BUILD =~ /[a-z]/i)   { $DESTI = $ENV{"DESTIBETARC"}; }	# Force output dir if env DESTIBETARC is defined
 if ($ENV{"DESTISTABLE"} && $BUILD =~ /^[0-9]+$/) { $DESTI = $ENV{"DESTISTABLE"}; }	# Force output dir if env DESTISTABLE is defined
-if ($ENV{"PUBLISHBETARC"} && $BUILD =~ /[a-z]/i)   { $PUBLISHBETARC = $ENV{"PUBLISHBETARC"}; }	# Force target site for publishing if env PUBLISHBETARC is defined
-if ($ENV{"PUBLISHSTABLE"} && $BUILD =~ /^[0-9]+$/) { $PUBLISHSTABLE = $ENV{"PUBLISHSTABLE"}; }	# Force target site for publishing if env PUBLISHSTABLE is defined
+if ($ENV{"PUBLISHBETARC"} && $BUILD =~ /[a-z]/i)   { $PUBLISH = $ENV{"PUBLISHBETARC"}; }	# Force target site for publishing if env PUBLISHBETARC is defined
+if ($ENV{"PUBLISHSTABLE"} && $BUILD =~ /^[0-9]+$/) { $PUBLISH = $ENV{"PUBLISHSTABLE"}; }	# Force target site for publishing if env PUBLISHSTABLE is defined

 print "Makepack version $VERSION\n";
 print "Building/publishing package name: $PROJECT\n";
 print "Building/publishing package version: $MAJOR.$MINOR.$BUILD\n";
 print "Source directory (SOURCE): $SOURCE\n";
 print "Target directory (DESTI) : $DESTI\n";
-#print "Publishing target (PUBLISH): $PUBLISH\n";
+print "Publishing target (PUBLISH): $PUBLISH\n";


 # Choose package targets
@@ -204,33 +190,27 @@ print "Target directory (DESTI) : $DESTI\n";
 if ($target) {
 	if ($target eq "ALL") { 
 		foreach my $key (@LISTETARGET) {
-			if ($key ne 'SNAPSHOT' && $key ne 'SF' && $key ne 'ASSO') { $CHOOSEDTARGET{$key}=1; }
+	    	if ($key ne 'SNAPSHOT' && $key ne 'SF') { $CHOOSEDTARGET{$key}=1; }
 		}
 	}
-	if ($target ne "ALL" && $target ne "SF" && $target ne "ASSO") { $CHOOSEDTARGET{uc($target)}=1; }
+	if ($target ne "ALL" && $target ne "SF") { $CHOOSEDTARGET{uc($target)}=1; }
 	if ($target eq "SF") { $CHOOSEDPUBLISH{"SF"}=1; }
-	if ($target eq "ASSO") { $CHOOSEDPUBLISH{"ASSO"}=1; }
 }
 else {
    my $found=0;
    my $NUM_SCRIPT;
   	my $cpt=0;
    while (! $found) {
-		$cpt=0;
-		printf(" %2d - %-14s  (%s)\n",$cpt,"ALL (1..10)","Need ".join(",",values %REQUIREMENTTARGET));
-		$cpt++;
-		printf(" %2d - %-14s\n",$cpt,"Generate check file");
+    	printf(" %2d - %-12s    (%s)\n",$cpt,"ALL (1..9)","Need ".join(",",values %REQUIREMENTTARGET));
    	foreach my $target (@LISTETARGET) {
    		$cpt++;
-			printf(" %2d - %-14s  (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
+    		printf(" %2d - %-12s    (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
    	}
-		$cpt=98;
-		printf(" %2d - %-14s  (%s)\n",$cpt,"ASSO (publish)","Need ".$REQUIREMENTPUBLISH{"ASSO"});
    	$cpt=99;
-		printf(" %2d - %-14s  (%s)\n",$cpt,"SF (publish)","Need ".$REQUIREMENTPUBLISH{"SF"});
+    	printf(" %2d - %-12s    (%s)\n",$cpt,"SF (publish)","Need ".join(",",values %REQUIREMENTPUBLISH));
    
    	# Ask which target to build
-		print "Choose one target number or several separated with space (0 - ".$cpt."): ";
+    	print "Choose one package number or several separated with space (0 - ".$cpt."): ";
    	$NUM_SCRIPT=<STDIN>; 
    	chomp($NUM_SCRIPT);
    	if ($NUM_SCRIPT !~ /^[0-9\s]+$/)
@@ -244,33 +224,27 @@ else {
    	}
    }
    print "\n";
-	if ($NUM_SCRIPT eq "98") {
-		$CHOOSEDPUBLISH{"ASSO"}=1;
-	}
-	elsif ($NUM_SCRIPT eq "99") {
+    if ($NUM_SCRIPT eq "99") {
   		$CHOOSEDPUBLISH{"SF"}=1;
    }
-	elsif ($NUM_SCRIPT eq "0") {
-		$CHOOSEDTARGET{"-CHKSUM"}=1;
+    else {
+	    if ($NUM_SCRIPT eq "0") {
 	    	foreach my $key (@LISTETARGET) {
-			if ($key ne 'SNAPSHOT' && $key ne 'ASSO' && $key ne 'SF') { $CHOOSEDTARGET{$key}=1; }
+	    		if ($key ne 'SNAPSHOT' && $key ne 'SF') { $CHOOSEDTARGET{$key}=1; }
 	        }
 	    }
-	elsif ($NUM_SCRIPT eq "1") {
-		$CHOOSEDTARGET{"-CHKSUM"}=1
-	}
 	    else {
 	   		foreach my $num (split(/\s+/,$NUM_SCRIPT)) {
-			$CHOOSEDTARGET{$LISTETARGET[$num-2]}=1;
+	   			$CHOOSEDTARGET{$LISTETARGET[$num-1]}=1;
+	   		}
 	    }
    }
 }
-

 # Test if requirement is ok
 #--------------------------
 $atleastonerpm=0;
-foreach my $target (sort keys %CHOOSEDTARGET) {
+foreach my $target (keys %CHOOSEDTARGET) {
 	if ($target =~ /RPM/i)
 	{
 		if ($atleastonerpm && ($DESTI eq "$SOURCE/build"))
@@ -312,76 +286,40 @@ foreach my $target (sort keys %CHOOSEDTARGET) {

 print "\n";

-# Build xml check file
-#-----------------------
-if ($CHOOSEDTARGET{'-CHKSUM'})
-{
-   	print 'Create xml check file with md5 checksum with command php '.$SOURCE.'/build/generate_filecheck_xml.php release='.$MAJOR.'.'.$MINOR.'.'.$BUILD."\n";
-  	$ret=`php $SOURCE/build/generate_filecheck_xml.php release=$MAJOR.$MINOR.$BUILD`;
-  	print $ret."\n";
-}
-
-
-#print join(',',sort keys %CHOOSEDTARGET)."\n";
-
-# Check if there is at least one target to build
+# Check if there is at least on target to build
 #----------------------------------------------
 $nboftargetok=0;
 $nboftargetneedbuildroot=0;
 $nbofpublishneedtag=0;
-foreach my $target (sort keys %CHOOSEDTARGET) {
+foreach my $target (keys %CHOOSEDTARGET) {
    if ($CHOOSEDTARGET{$target} < 0) { next; }
-	if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP' && $target ne '-CHKSUM') 
+	if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP') 
 	{
 		$nboftargetneedbuildroot++;
 	}
 	$nboftargetok++;
 }
-foreach my $target (sort keys %CHOOSEDPUBLISH) {
+foreach my $target (keys %CHOOSEDPUBLISH) {
    if ($CHOOSEDPUBLISH{$target} < 0) { next; }
-	if ($target eq 'ASSO') { $nbofpublishneedtag++; }
-	if ($target eq 'SF') { $nbofpublishneedtag++; }
+	if ($target eq 'SF')
+	{
+		$nbofpublishneedtag++;
+	}
 	$nboftargetok++;
 }

 if ($nboftargetok) {

-	# Update GIT tag if required
-	#---------------------------
+    # Update CVS if required
+    #-----------------------
    if ($nbofpublishneedtag)
 	{
    	print "Go to directory $SOURCE\n";
   		$olddir=getcwd();
   		chdir("$SOURCE");
-		
-		# Test that the ChangeLog is ok
-		$TMPBUILDTOCHECKCHANGELOG=$BUILD;
-		$TMPBUILDTOCHECKCHANGELOG =~ s/\-rc\d*//;
-		$TMPBUILDTOCHECKCHANGELOG =~ s/\-beta\d*//;
-		print "Check if ChangeLog is ok for version $MAJOR.$MINOR\.$TMPBUILDTOCHECKCHANGELOG\n";
-		$ret=`grep "ChangeLog for $MAJOR.$MINOR\.$TMPBUILDTOCHECKCHANGELOG" "$SOURCE/ChangeLog" 2>&1`;
-		if (! $ret)
-		{
-			print "Error: The ChangeLogFile was not updated. Run the following command before building package for $MAJOR.$MINOR.$BUILD:\n";
-			if (! $BUILD || $BUILD eq '0-rc')	# For a major version
-			{
-				print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log `git rev-list --boundary '.$MAJOR.'.'.$MINOR.'..origin/develop | grep ^- | cut -c2- | head -n 1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
-			}
-			else			# For a maintenance release
-			{
-				print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
-			}
-			print "\n";
-			exit;
-		}
-		else
-		{
-			print "ChangeLog for $MAJOR.$MINOR\.$BUILD was found into '$SOURCE/ChangeLog'\n";
-		}
-			
    	print 'Run git tag -a -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
    	$ret=`git tag -a -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD" 2>&1`;
-		if ($ret =~ /(already exists|existe déjà)/)
+    	if ($ret =~ /already exists/)
    	{
    		print "WARNING: Tag ".$MAJOR.'.'.$MINOR.'.'.$BUILD." already exists. Overwrite (y/N) ? ";
 	    	$QUESTIONOVERWRITETAG=<STDIN>; 
@@ -390,15 +328,10 @@ if ($nboftargetok) {
 	    	{
 		    	print 'Run git tag -a -f -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
 		    	$ret=`git tag -a -f -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD"`;
-				print 'Run git push -f --tags'."\n";
-				$ret=`git push -f --tags`;
 	    	}
    	}
-		else
-		{
    	print 'Run git push --tags'."\n";
    	$ret=`git push --tags`;
-		}
    	chdir("$olddir");
 	}
 	
@@ -416,23 +349,24 @@ if ($nboftargetok) {
 	    	mkdir "$BUILDROOT/$PROJECT";
 	    	print "Copy $SOURCE into $BUILDROOT/$PROJECT\n";
 	    	$ret=`cp -pr "$SOURCE" "$BUILDROOT/$PROJECT"`;
-
 	    	#print "Copy $SOURCE/build/debian/apache/.htaccess into $BUILDROOT/$PROJECT/build/debian/apache/.htaccess\n";
 	    	#$ret=`cp -pr "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT/build/debian/apache/.htaccess"`;
 	    }
 	    print "Clean $BUILDROOT\n";
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/.buildpath`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/.editorconfig`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.externalToolBuilders`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/.git*`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/.git`;
+	    $ret=`rm -f  $BUILDROOT/$PROJECT/.gitmodules`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/.gitignore`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/.scrutinizer.yml`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.travis.yml`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.tx`;
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/build.xml`;
+	    $ret=`rm -f  $BUILDROOT/$PROJECT/quickbuild.xml`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/pom.xml`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/README.md`;
        
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/build/Doli*-*`;
@@ -460,24 +394,20 @@ if ($nboftargetok) {

        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/install/mssql`;

-		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/ansible`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/codesniffer`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/codetemplates`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/dbmodel`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/initdata`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/initdemo`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/iso-normes`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/ldap`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/mail`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/multitail`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpcheckstyle`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpunit`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/security`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/uml`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/vagrant`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/xdebug`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/dev/dolibarr_changes.txt`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/dev/README`;
@@ -493,38 +423,15 @@ if ($nboftargetok) {
        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot11.png`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`;

-		# Security to avoid to package data files 
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
-
-		# Removed known external modules to avoid any error when packaging from env where external modules are tested 
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom/*`;	# For custom we want to keep dir
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/allscreens*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ancotec*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/cabinetmed*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/calling*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/bootstrap*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/dolimed*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/dolimod*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/factory*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/lead*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/management*`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ndf*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/oscim*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/timesheet*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/webmail*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/accountingexport*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/allscreen*`;
-		# Removed other test files
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/eldy/*.new`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/api/explorer`;				# This is a dev tool
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
@@ -534,45 +441,27 @@ if ($nboftargetok) {
        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl`;    # Avoid errors into rpmlint
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/template`;  # Package not valid for most linux distributions (errors reported into compile.js). Package should be embed by modules to avoid problems.
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpmailer`;                # Package not valid for most linux distributions (errors reported into file LICENSE). Package should be embed by modules to avoid problems.
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/adapters`;		# Keep this removal in case we embed libraries
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/samples`;		# Keep this removal in case we embed libraries
-        #$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# _source must be kept into tarball
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# Keep this removal in case we embed libraries
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/adapters`;	# Keep this removal in case we embed libraries
   	    
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extensions/TableTools/swf`;	# Source of this flash is not available
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`;	    # Source of this flash is not available
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/select2/release.sh`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/doc`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/example`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/test`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/php-iban/docs`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/.gitattributes`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Classes/license.md`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PDF`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/PCLZip`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Examples`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/unitTests`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/license.md`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/license.txt`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-*`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-*`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/utils`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/savant`;
 	}

    # Build package for each target
    #------------------------------
-	foreach my $target (sort keys %CHOOSEDTARGET) 
+    foreach my $target (keys %CHOOSEDTARGET) 
    {
        if ($CHOOSEDTARGET{$target} < 0) { next; }
-		if ($target eq '-CHKSUM') { next; }
    
        print "\nBuild package for target $target\n";

@@ -603,11 +492,8 @@ if ($nboftargetok) {
    	if ($target eq 'TGZ') 
    	{
    		$NEWDESTI=$DESTI;
-			if ($NEWDESTI =~ /stable/)
-			{
    		mkdir($DESTI.'/standard');
 			if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; } 
-			}

    		print "Remove target $FILENAMETGZ.tgz...\n";
    		unlink("$NEWDESTI/$FILENAMETGZ.tgz");
@@ -618,28 +504,23 @@ if ($nboftargetok) {
    		$cmd="cp -pr \"$BUILDROOT/$PROJECT/\" \"$BUILDROOT/$FILENAMETGZ\"";
            $ret=`$cmd`;

-			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ/build/exe`;
-			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ/htdocs/includes/ckeditor/_source`;	# We can't remove it with exclude file, we need it for some tarball packages
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/build/exe`;

    		print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
-			$cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" $FILENAMETGZ";
-			print "$cmd\n";
+   		    $cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" $FILENAMETGZ";
   		    $ret=`$cmd`;

    		# Move to final dir
-			print "Move $BUILDROOT/$FILENAMETGZ.tgz to $NEWDESTI/$FILENAMETGZ.tgz\n";
-			$ret=`mv "$BUILDROOT/$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
+       		print "Move $FILENAMETGZ.tgz to $NEWDESTI/$FILENAMETGZ.tgz\n";
+       		$ret=`mv "$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
    		next;
    	}

    	if ($target eq 'XZ') 
    	{
    		$NEWDESTI=$DESTI;
-			if ($NEWDESTI =~ /stable/)
-			{
    		mkdir($DESTI.'/standard');
 			if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; } 
-			} 

    		print "Remove target $FILENAMEXZ.xz...\n";
    		unlink("$NEWDESTI/$FILENAMEXZ.xz");
@@ -650,9 +531,6 @@ if ($nboftargetok) {
    		$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEXZ\"";
            $ret=`$cmd`;

-			$ret=`rm -fr $BUILDROOT/$FILENAMEXZ/build/exe`;
-			$ret=`rm -fr $BUILDROOT/$FILENAMEXZ/htdocs/includes/ckeditor/_source`;	# We can't remove it with exclude file, we need it for some tarball packages
-			
    		print "Compress $FILENAMEXZ into $FILENAMEXZ.xz...\n";
 
            print "Go to directory $BUILDROOT\n";
@@ -672,11 +550,8 @@ if ($nboftargetok) {
    	if ($target eq 'ZIP') 
    	{
    		$NEWDESTI=$DESTI;
-			if ($NEWDESTI =~ /stable/)
-			{
    		mkdir($DESTI.'/standard');
 			if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; } 
-			} 

    		print "Remove target $FILENAMEZIP.zip...\n";
    		unlink("$NEWDESTI/$FILENAMEZIP.zip");
@@ -687,9 +562,6 @@ if ($nboftargetok) {
    		$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEZIP\"";
            $ret=`$cmd`;

-			$ret=`rm -fr $BUILDROOT/$FILENAMEZIP/build/exe`;
-			$ret=`rm -fr $BUILDROOT/$FILENAMEZIP/htdocs/includes/ckeditor/_source`;	# We can't remove it with exclude file, we need it for some tarball packages
-
    		print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
 
            print "Go to directory $BUILDROOT\n";
@@ -713,16 +585,16 @@ if ($nboftargetok) {
    		if ($target =~ /FEDO/i) { $subdir="package_rpm_redhat-fedora"; }
    		if ($target =~ /MAND/i) { $subdir="package_rpm_mandriva"; }
    		if ($target =~ /OPEN/i) { $subdir="package_rpm_opensuse"; }
-			if ($NEWDESTI =~ /stable/)
-			{
    		mkdir($DESTI.'/'.$subdir);
 			if (-d $DESTI.'/'.$subdir) { $NEWDESTI=$DESTI.'/'.$subdir; } 
-			} 

 			if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; }

            print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";

+            #print "Create directory $RPMDIR\n";
+            #$ret=`mkdir -p "$RPMDIR"`;
+
    		print "Remove target ".$FILENAMERPM."...\n";
    		unlink("$NEWDESTI/".$FILENAMERPM);
    		print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm...\n";
@@ -730,13 +602,13 @@ if ($nboftargetok) {

    		print "Create directory $BUILDROOT/$FILENAMETGZ2\n";
    		$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`;
-			
            print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n";
    		$cmd="cp -pr '$BUILDROOT/$PROJECT' '$BUILDROOT/$FILENAMETGZ2'";
            $ret=`$cmd`;

-			# Removed files we don't need
-			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/htdocs/includes/ckeditor/_source`;
+			# Set owners
+            #print "Set owners on files/dir\n";
+		    #$ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`;

            print "Set permissions on files/dir\n";
 		    $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
@@ -757,11 +629,6 @@ if ($nboftargetok) {
    		if ($target =~ /MAND/i) { $BUILDFICSRC="${FILENAME}_mandriva.spec"; }
    		if ($target =~ /OPEN/i) { $BUILDFICSRC="${FILENAME}_opensuse.spec"; }
    		
-			use Date::Language;
-			$lang=Date::Language->new('English');
-			$datestring = $lang->time2str("%a %b %e %Y", time);
-    		$changelogstring="* ".$datestring." Laurent Destailleur (eldy) $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n- Upstream release\n";
-
 			print "Generate file $BUILDROOT/$BUILDFIC from $SOURCE/build/rpm/${BUILDFICSRC}\n";
            open (SPECFROM,"<$SOURCE/build/rpm/${BUILDFICSRC}") || die "Error";
            open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error";
@@ -769,7 +636,6 @@ if ($nboftargetok) {
                $_ =~ s/__FILENAMETGZ__/$FILENAMETGZ/;
                $_ =~ s/__VERSION__/$MAJOR.$MINOR.$REL1/;
                $_ =~ s/__RELEASE__/$RPMSUBVERSION/;
-                $_ =~ s/__CHANGELOGSTRING__/$changelogstring/;
                print SPECTO $_;
            }
            close SPECFROM;
@@ -792,18 +658,15 @@ if ($nboftargetok) {
    		$ret=`$cmd`;
   		    print "Move $RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz into $NEWDESTI/".$FILENAMETGZ2.".tgz\n";
   		    $cmd="mv \"$RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz\" \"$NEWDESTI/".$FILENAMETGZ2.".tgz\"";
-			#$ret=`$cmd`;
+    		$ret=`$cmd`;
    		next;
    	}

    	if ($target eq 'DEB') 
    	{
    		$NEWDESTI=$DESTI;
-			if ($NEWDESTI =~ /stable/)
-			{
    		mkdir($DESTI.'/package_debian-ubuntu');
 			if (-d $DESTI.'/package_debian-ubuntu') { $NEWDESTI=$DESTI.'/package_debian-ubuntu'; } 
-			} 

            $olddir=getcwd();

@@ -815,8 +678,6 @@ if ($nboftargetok) {
    		unlink("$NEWDESTI/${FILENAMEDEB}.tar.gz");
    		print "Remove target ${FILENAMEDEB}.changes...\n";
    		unlink("$NEWDESTI/${FILENAMEDEB}.changes");
-			print "Remove target ${FILENAMEDEB}.debian.tar.gz...\n";
-			unlink("$NEWDESTI/${FILENAMEDEB}.debian.tar.gz");
    		print "Remove target ${FILENAMEDEBNATIVE}.orig.tar.gz...\n";
    		unlink("$NEWDESTI/${FILENAMEDEBNATIVE}.orig.tar.gz");

@@ -826,11 +687,11 @@ if ($nboftargetok) {
 			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp\n";
 			$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\"";
 			$ret=`$cmd`;
-			$cmd="cp -pr \"$BUILDROOT/$PROJECT/build/debian/apache/.htaccess\" \"$BUILDROOT/$PROJECT.tmp/build/debian/apache/.htaccess\"";
-			$ret=`$cmd`;
+			#$cmd="cp -pr \"$BUILDROOT/$PROJECT/build/debian/apache/.htaccess\" \"$BUILDROOT/$PROJECT.tmp/build/debian/apache/.htaccess\"";
+			#$ret=`$cmd`;

 			print "Remove other files\n";
-			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/README-FR.md`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/README-FR`;
            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/README`;
            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/README-FR`;
            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/aps`;
@@ -846,7 +707,7 @@ if ($nboftargetok) {
            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/copyright`;
            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.config`;
            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.desktop`;
-			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.docs`;
+            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.doc-base`;
            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.install`;
            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.lintian-overrides`;
            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.postrm`;
@@ -854,7 +715,6 @@ if ($nboftargetok) {
            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates`;
            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates.futur`;
            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/rules`;
-			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/README.Debian`;
            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/README.howto`;
            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/watch`;
            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/doap`;
@@ -865,30 +725,6 @@ if ($nboftargetok) {
            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/perl`;
            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/rpm`;
            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/zip`;
-			# Removed duplicate license files
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source/plugins/wsc/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/plugins/scayt/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/plugins/wsc/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/php-iban/LICENSE`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/flot/LICENSE.txt`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/datatables/extensions/ColReorder/License.txt`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/datatables/extensions/ColVis/License.txt`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/datatables/extensions/FixedColumns/License.txt`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/datatables/extensions/Responsive/License.txt`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/datatables/license.txt`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/select2/LICENSE`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/mike42/escpos-php/LICENSE.md`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/mobiledetect/mobiledetectlib/LICENSE.txt`;
-			
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/COPYING`;
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/COPYING`;
-			# Removed files we don't need
-			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source`;
-			
            # Rename upstream changelog to match debian rules
 			$ret=`mv $BUILDROOT/$PROJECT.tmp/ChangeLog $BUILDROOT/$PROJECT.tmp/changelog`;
 			
@@ -896,33 +732,25 @@ if ($nboftargetok) {
            print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n";
            $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
            print "Copy $SOURCE/build/debian/xxx to $BUILDROOT/$PROJECT.tmp/debian\n";
-			# Add files for dpkg-source (changelog)
-			#$ret=`cp -f  "$SOURCE/build/debian/changelog"      "$BUILDROOT/$PROJECT.tmp/debian"`;
-			open (SPECFROM,"<$SOURCE/build/debian/changelog") || die "Error";
-			open (SPECTO,">$BUILDROOT/$PROJECT.tmp/debian/changelog") || die "Error";
-			while (<SPECFROM>) {
-				$_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/;
-				print SPECTO $_;
-			}
-			close SPECFROM;
-			close SPECTO;
            # Add files for dpkg-source
+            $ret=`cp -f  "$SOURCE/build/debian/changelog"      "$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -f  "$SOURCE/build/debian/compat"         "$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -f  "$SOURCE/build/debian/control"        "$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -f  "$SOURCE/build/debian/copyright"      "$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.desktop"        	"$BUILDROOT/$PROJECT.tmp/debian"`;
-			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.docs"        		"$BUILDROOT/$PROJECT.tmp/debian"`;
+            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.doc-base"        	"$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.install" 	        "$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.lintian-overrides"  "$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.xpm"  		      	"$BUILDROOT/$PROJECT.tmp/debian"`;
+            $ret=`cp -f  "$SOURCE/build/debian/README.source"  "$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -f  "$SOURCE/build/debian/rules"          "$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -f  "$SOURCE/build/debian/watch"          "$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -fr "$SOURCE/build/debian/patches"        "$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -fr "$SOURCE/build/debian/po"             "$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -fr "$SOURCE/build/debian/source"         "$BUILDROOT/$PROJECT.tmp/debian"`;
-			$ret=`cp -fr "$SOURCE/build/debian/apache"         "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
-			$ret=`cp -f  "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
-			$ret=`cp -fr "$SOURCE/build/debian/lighttpd"       "$BUILDROOT/$PROJECT.tmp/debian/lighttpd"`;
+            #$ret=`cp -fr "$SOURCE/build/debian/apache"         "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
+            #$ret=`cp -f  "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
+            #$ret=`cp -fr "$SOURCE/build/debian/lighttpd"       "$BUILDROOT/$PROJECT.tmp/debian/lighttpd"`;
            # Add files also required to build binary package
            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.config"         "$BUILDROOT/$PROJECT.tmp/debian"`;
            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.postinst"       "$BUILDROOT/$PROJECT.tmp/debian"`;
@@ -949,11 +777,8 @@ if ($nboftargetok) {
            $ret=`chmod 755 $BUILDROOT/$PROJECT.tmp/debian/rules`;
            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/translation/autotranslator.class.php`;
            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/modMyModule.class.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_api_class.class.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_card.php`;
            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_class.class.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_list.php`;
-			$ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_script.php`;
+            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_page.php`;
            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_webservice_server.php`;
            $cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
            $ret=`$cmd`;
@@ -994,7 +819,6 @@ if ($nboftargetok) {
            $ret=`mv $BUILDROOT/*_all.deb "$NEWDESTI/"`;
            $ret=`mv $BUILDROOT/*.dsc "$NEWDESTI/"`;
            $ret=`mv $BUILDROOT/*.orig.tar.gz "$NEWDESTI/"`;
-			$ret=`mv $BUILDROOT/*.debian.tar.gz "$NEWDESTI/"`;
            $ret=`mv $BUILDROOT/*.changes "$NEWDESTI/"`;
        	next;
        }
@@ -1002,11 +826,8 @@ if ($nboftargetok) {
    	if ($target eq 'APS') 
    	{
 			$NEWDESTI=$DESTI;
-			if ($NEWDESTI =~ /stable/)
-			{
    		mkdir($DESTI.'/package_aps');
 			if (-d $DESTI.'/package_aps') { $NEWDESTI=$DESTI.'/package_aps'; } 
-			} 
 			
            $newbuild = $BUILD;
            $newbuild =~ s/(dev|alpha)/0/gi;                # dev
@@ -1058,6 +879,8 @@ if ($nboftargetok) {
            close SPECFROM;
            close SPECTO;
            print "Version set to $MAJOR.$MINOR.$newbuild\n";
+            #$cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure\"";
+            #$ret=`$cmd`;
            $cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure.php\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure.php\"";
            $ret=`$cmd`;
            $cmd="cp -pr \"$BUILDROOT/$PROJECT/doc/images\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/images\"";
@@ -1088,25 +911,16 @@ if ($nboftargetok) {
    	if ($target eq 'EXEDOLIWAMP')
    	{
    		$NEWDESTI=$DESTI;
-			if ($NEWDESTI =~ /stable/)
-			{
    		mkdir($DESTI.'/package_windows');
 			if (-d $DESTI.'/package_windows') { $NEWDESTI=$DESTI.'/package_windows'; } 
-			} 
    		
-     		print "Remove target $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe...\n";
+     		print "Remove target $FILENAMEEXEDOLIWAMP.exe...\n";
    		unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe";
 
- 			print "Check that in your Wine setup, you create a Z: drive that point to your / directory.\n";
-
 			$SOURCEBACK=$SOURCE;
 			$SOURCEBACK =~ s/\//\\/g;
-
-    		print "Prepare file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss from \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
-    		$ret=`cat "$SOURCE/build/exe/doliwamp/doliwamp.iss" | sed -e 's/__FILENAMEEXEDOLIWAMP__/$FILENAMEEXEDOLIWAMP/g' > "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
-
-    		print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"\n";
-    		$cmd= "ISCC.exe \"Z:$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"";
+    		print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
+    		$cmd= "ISCC.exe \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"";
 			print "$cmd\n";
 			$ret= `$cmd`;
 			#print "$ret\n";
@@ -1116,74 +930,37 @@ if ($nboftargetok) {
    		rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe");
            print "Move $SOURCE/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
            $ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`;
-            
-            print "Remove tmp file $SOURCE/build/exe/doliwamp/doliwamp.tmp.iss\n";
-            $ret=`rm "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
-            
    		next;
    	}
    }

-	# Publish package for each target
-	#--------------------------------
-	foreach my $target (sort keys %CHOOSEDPUBLISH) 
+    # Build package for each target
+    #------------------------------
+    foreach my $target (keys %CHOOSEDPUBLISH) 
    {
        if ($CHOOSEDPUBLISH{$target} < 0) { next; }
    
-		print "\nList of files to publish (BUILD=$BUILD)\n";
-		%filestoscansf=(
+		print "\nList of files to publish\n";
+    	%filestoscan=(
    		"$DESTI/package_rpm_generic/$FILENAMERPM"=>'Dolibarr installer for Fedora-Redhat-Mandriva-Opensuse (DoliRpm)',
    		"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)',
-			"$DESTI/package_debian-ubuntu/${FILENAMEDEBSHORT}.orig.tar.gz"=>'none',
    		"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)',
    		"$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
    		"$DESTI/standard/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM'
    	);
-		%filestoscanstableasso=(
-			"$DESTI/package_rpm_generic/$FILENAMERPM"=>'package_rpm_generic',
-			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'package_debian-ubuntu',
-			"$DESTI/package_debian-ubuntu/${FILENAMEDEBSHORT}.orig.tar.gz"=>'package_debian-ubuntu',
-			"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'package_windows',
-			"$DESTI/standard/$FILENAMETGZ.tgz"=>'standard',
-			"$DESTI/standard/$FILENAMETGZ.zip"=>'standard'
-		);
-		if ($target eq 'ASSO' && $BUILD =~ /[a-z]/i)   { 	# Not stable
-			%filestoscansf=(
-				"$DESTI/$FILENAMERPM"=>'Dolibarr installer for Fedora-Redhat-Mandriva-Opensuse (DoliRpm)',
-				"$DESTI/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)',
-				"$DESTI/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)',
-				"$DESTI/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
-				"$DESTI/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM'
-			);
-			%filestoscanstableasso=(
-				"$DESTI/$FILENAMERPM"=>'',
-				"$DESTI/${FILENAMEDEB}_all.deb"=>'',
-				"$DESTI/$FILENAMEEXEDOLIWAMP.exe"=>'',
-				"$DESTI/$FILENAMETGZ.tgz"=>'',
-				"$DESTI/$FILENAMETGZ.zip"=>''
-			);
-		}
-
-		use POSIX qw/strftime/;
-		foreach my $file (sort keys %filestoscansf)
+    	foreach my $file (sort keys %filestoscan)
    	{
    		$found=0;
    		my $filesize = -s $file;
-			my $filedate = (stat $file)[9];
    		print $file." ".($filesize?"(found)":"(not found)");
    		print ($filesize?" - ".$filesize:"");
-			print ($filedate?" - ".strftime("%Y-%m-%d %H:%M:%S",localtime($filedate)):"");
    		print "\n";
    	}

-		if ($target eq 'SF' || $target eq 'ASSO') 
+    	if ($target eq 'SF') 
    	{
    		print "\n";
    		
-			if ($target eq 'SF') { $PUBLISH = $PUBLISHSTABLE; }
-			if ($target eq 'ASSO' && $BUILD =~ /[a-z]/i)   { $PUBLISH = $PUBLISHBETARC.'/lastbuild'; }
-			if ($target eq 'ASSO' && $BUILD =~ /^[0-9]+$/) { $PUBLISH = $PUBLISHBETARC.'/stable'; }
-			
    		$NEWPUBLISH=$PUBLISH;
    		print "Publish to target $NEWPUBLISH. Click enter or CTRL+C...\n";

@@ -1194,8 +971,6 @@ if ($nboftargetok) {
 			print "Create empty dir /tmp/emptydir. We need it to create target dir using rsync.\n";
            $ret=`mkdir -p "/tmp/emptydir/"`;
            
-			%filestoscan=%filestoscansf;
-			
 	    	foreach my $file (sort keys %filestoscan)
 	    	{
 	    		$found=0;
@@ -1203,25 +978,9 @@ if ($nboftargetok) {
 	    		if (! $filesize) { next; }

 				print "\n";
+	    		print "Publish file ".$file." to ".$filestoscan{$file}."\n";
 	    		
-	    		if ($target eq 'SF' && $filestoscan{$file} ne 'none') { 
 	    		$destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD;
-	    		}
-	    		elsif ($target eq 'ASSO' and $NEWPUBLISH =~ /stable/) {
-	    			$destFolder="$NEWPUBLISH/$filestoscanstableasso{$file}";
-	    		} 
-	    		elsif ($target eq 'ASSO' and $NEWPUBLISH !~ /stable/) {
-	    			$destFolder="$NEWPUBLISH";
-	    		} 
-	    		else	# No more used
-	    		{
-	    			$dirnameonly=$file;
-	    			$dirnameonly =~ s/.*\/([^\/]+)\/[^\/]+$/$1/;  
-	    			$filenameonly=$file;
-	    			$filenameonly =~ s/.*\/[^\/]+\/([^\/])+$/$1/;  
-	    			$destFolder="$NEWPUBLISH/$dirnameonly";
-	    		}
-	    		print "Publish file ".$file." to ".$destFolder."\n";

 				# mkdir	   
 				#my $ssh = Net::SSH::Perl->new("frs.sourceforge.net");
@@ -1236,23 +995,23 @@ if ($nboftargetok) {
 				#$command="ssh eldy,dolibarr\@frs.sourceforge.net mkdir -p \"$destFolder\"";
 				#print "$command\n";	
 				#my $ret=`$command 2>&1`;
-
 				$command="rsync -s -e 'ssh' --recursive /tmp/emptydir/ \"".$destFolder."\"";
 				print "$command\n";	
 				my $ret=`$command 2>&1`;

-				$command="rsync -s -e 'ssh' \"$file\" \"".$destFolder."\"";
+				$command="rsync -s $OPTIONUPDATEDIST -e 'ssh' \"$file\" \"".$destFolder."\"";
 				print "$command\n";	
-				my $ret2=`$command 2>&1`;
-				print "$ret2\n";
+				my $ret=`$command 2>&1`;
+				print "$ret\n";
+	    		
 	    	}
+
    	}
    }    
 }

 print "\n----- Summary -----\n";
-foreach my $target (sort keys %CHOOSEDTARGET) {
-	if ($target eq '-CHKSUM') { print "Checksum was generated"; next; }
+foreach my $target (keys %CHOOSEDTARGET) {
    if ($CHOOSEDTARGET{$target} < 0) {
        print "Package $target not built (bad requirement).\n";
    } else {
--- a/build/makepack-dolibarrlang.pl
+++ b/build/makepack-dolibarrlang.pl
@@ -0,0 +1,300 @@
+#!/usr/bin/perl
+#----------------------------------------------------------------------------
+# \file         build/makepack-dolibarrlang.pl
+# \brief        Package builder (tgz, zip, rpm, deb, exe)
+# \author       (c)2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+#----------------------------------------------------------------------------
+
+use Cwd;
+
+$PROJECT = "dolibarr";
+
+@LISTETARGET       = ("TGZ");    # Possible packages
+%REQUIREMENTTARGET = (           # Tool requirement for each package
+	"TGZ" => "tar",
+	"ZIP" => "7z",
+	"EXE" => "makensis.exe"
+);
+%ALTERNATEPATH = (
+	"7z"           => "7-ZIP",
+	"makensis.exe" => "NSIS"
+);
+
+use vars qw/ $REVISION $VERSION /;
+$REVISION = '1.10';
+$VERSION  = "1.0 (build $REVISION)";
+
+#------------------------------------------------------------------------------
+# MAIN
+#------------------------------------------------------------------------------
+( $DIR  = $0 ) =~ s/([^\/\\]+)$//;
+( $PROG = $1 ) =~ s/\.([^\.]*)$//;
+$Extension = $1;
+$DIR ||= '.';
+$DIR =~ s/([^\/\\])[\\\/]+$/$1/;
+
+# Detect OS type
+# --------------
+if ( "$^O" =~ /linux/i || ( -d "/etc" && -d "/var" && "$^O" !~ /cygwin/i ) ) {
+	$OS = 'linux';
+	$CR = '';
+}
+elsif ( -d "/etc" && -d "/Users" ) { $OS = 'macosx'; $CR = ''; }
+elsif ( "$^O" =~ /cygwin/i || "$^O" =~ /win32/i ) {
+	$OS = 'windows';
+	$CR = "\r";
+}
+if ( !$OS ) {
+	print "makepack-dolbarrlang.pl was not able to detect your OS.\n";
+	print "Can't continue.\n";
+	print "makepack-dolibarrlang.pl aborted.\n";
+	sleep 2;
+	exit 1;
+}
+
+# Define buildroot
+# ----------------
+if ( $OS =~ /linux/ ) {
+	$TEMP = $ENV{"TEMP"} || $ENV{"TMP"} || "/tmp";
+}
+if ( $OS =~ /macos/ ) {
+	$TEMP = $ENV{"TEMP"} || $ENV{"TMP"} || "/tmp";
+}
+if ( $OS =~ /windows/ ) {
+	$TEMP = $ENV{"TEMP"} || $ENV{"TMP"} || "c:/temp";
+	$PROGPATH = $ENV{"ProgramFiles"};
+}
+if ( !$TEMP || !-d $TEMP ) {
+	print "Error: A temporary directory can not be find.\n";
+	print "Check that TEMP or TMP environment variable is set correctly.\n";
+	print "makepack-dolibarrlang.pl aborted.\n";
+	sleep 2;
+	exit 2;
+}
+$BUILDROOT = "$TEMP/dolibarr-buildroot";
+
+my $copyalreadydone = 0;
+my $batch           = 0;
+
+print "Makepack langs version $VERSION\n";
+print "Enter language code to package (en_US, fr_FR, ...) : ";
+$PROJECT = <STDIN>;
+chomp($PROJECT);
+
+# Ask and set version $MAJOR and $MINOR
+print "Enter value for version: ";
+$PROJVERSION = <STDIN>;
+chomp($PROJVERSION);
+( $MAJOR, $MINOR ) = split( /\./, $PROJVERSION, 2 );
+if ( $MINOR eq '' ) {
+	print "Enter value for minor version: ";
+	$MINOR = <STDIN>;
+	chomp($MINOR);
+}
+
+$FILENAME    = "$PROJECT";
+$FILENAMETGZ = "lang_$PROJECT-$MAJOR.$MINOR";
+if ( -d "/usr/src/redhat" ) {
+
+	# redhat
+	$RPMDIR = "/usr/src/redhat";
+}
+if ( -d "/usr/src/RPM" ) {
+
+	# mandrake
+	$RPMDIR = "/usr/src/RPM";
+}
+
+$SOURCE = "$DIR/../../dolibarr";
+$DESTI  = "$SOURCE/build";
+
+# Choose package targets
+#-----------------------
+$target = "ZIP";    # Les langs sont au format zip
+if ($target) {
+	$CHOOSEDTARGET{ uc($target) } = 1;
+}
+else {
+	my $found = 0;
+	my $NUM_SCRIPT;
+	while ( !$found ) {
+		my $cpt = 0;
+		printf( " %d - %3s    (%s)\n",
+			$cpt, "All", "Need " . join( ",", values %REQUIREMENTTARGET ) );
+		foreach my $target (@LISTETARGET) {
+			$cpt++;
+			printf( " %d - %3s    (%s)\n",
+				$cpt, $target, "Need " . $REQUIREMENTTARGET{$target} );
+		}
+
+		# Are asked to select the file to move
+		print "Choose one package number or several separated with space: ";
+		$NUM_SCRIPT = <STDIN>;
+		chomp($NUM_SCRIPT);
+		if ( $NUM_SCRIPT =~ s/-//g ) {
+
+			# Do not do copy
+			$copyalreadydone = 1;
+		}
+		if ( $NUM_SCRIPT !~ /^[0-$cpt\s]+$/ ) {
+			print "This is not a valid package number list.\n";
+			$found = 0;
+		}
+		else {
+			$found = 1;
+		}
+	}
+	print "\n";
+	if ($NUM_SCRIPT) {
+		foreach my $num ( split( /\s+/, $NUM_SCRIPT ) ) {
+			$CHOOSEDTARGET{ $LISTETARGET[ $num - 1 ] } = 1;
+		}
+	}
+	else {
+		foreach my $key (@LISTETARGET) {
+			$CHOOSEDTARGET{$key} = 1;
+		}
+	}
+}
+
+# Test if requirement is ok
+#--------------------------
+foreach my $target ( keys %CHOOSEDTARGET ) {
+	foreach my $req ( split( /[,\s]/, $REQUIREMENTTARGET{$target} ) ) {
+
+		# Test
+		print "Test requirement for target $target: Search '$req'... ";
+		$ret         = `"$req" 2>&1`;
+		$coderetour  = $?;
+		$coderetour2 = $coderetour >> 8;
+		if (
+			$coderetour != 0
+			&& (   ( $coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i )
+				|| ( $coderetour2 == 127 && $OS !~ /windows/ ) )
+			&& $PROGPATH
+		  )
+		{
+
+			# Not found error, we try in PROGPATH
+			$ret         = `"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`;
+			$coderetour  = $?;
+			$coderetour2 = $coderetour >> 8;
+			$REQUIREMENTTARGET{$target} = "$PROGPATH/$ALTERNATEPATH{$req}/$req";
+		}
+
+		if (
+			$coderetour != 0
+			&& (   ( $coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i )
+				|| ( $coderetour2 == 127 && $OS !~ /windows/ ) )
+		  )
+		{
+
+			# Not found error
+			print
+"Not found\nCan't build target $target. Requirement '$req' not found in PATH\n";
+			$CHOOSEDTARGET{$target} = -1;
+			last;
+		}
+		else {
+
+			# Pas erreur ou erreur autre que programme absent
+			print " Found " . $REQUIREMENTTARGET{$target} . "\n";
+		}
+	}
+}
+
+print "\n";
+
+# Check if there is at least on target to build
+#----------------------------------------------
+$nboftargetok = 0;
+foreach my $target ( keys %CHOOSEDTARGET ) {
+	if ( $CHOOSEDTARGET{$target} < 0 ) { next; }
+	$nboftargetok++;
+}
+
+if ($nboftargetok) {
+
+	# Update buildroot
+	#-----------------
+	if ( !$copyalreadydone ) {
+		print "Delete directory $BUILDROOT\n";
+		$ret = `rm -fr "$BUILDROOT"`;
+		mkdir "$BUILDROOT";
+		mkdir "$BUILDROOT/htdocs";
+		mkdir "$BUILDROOT/htdocs/langs";
+		mkdir "$BUILDROOT/htdocs/langs/$PROJECT";
+
+		print "Copy $SOURCE into $BUILDROOT\n";
+		mkdir "$BUILDROOT";
+		$ret =
+		  `cp -pr "$SOURCE/htdocs/langs/$PROJECT" "$BUILDROOT/htdocs/langs"`;
+	}
+	print "Clean $BUILDROOT\n";
+	$ret =
+`rm -fr $BUILDROOT/htdocs/langs/$PROJECT/Thumbs.db $BUILDROOT/htdocs/langs/$PROJECT/*/Thumbs.db $BUILDROOT/htdocs/langs/$PROJECT/*/*/Thumbs.db $BUILDROOT/htdocs/langs/$PROJECT/*/*/*/Thumbs.db`;
+	$ret =
+`rm -fr $BUILDROOT/htdocs/langs/$PROJECT/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/*/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/*/*/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/*/*/*/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/*/*/*/*/CVS*`;
+
+	# Build package for each target
+	#------------------------------
+	foreach my $target ( keys %CHOOSEDTARGET ) 
+	{
+		if ( $CHOOSEDTARGET{$target} < 0 ) { next; }
+
+		print "\nBuild package for target $target\n";
+
+		if ( $target eq 'TGZ' ) 
+		{
+			unlink $FILENAMETGZ . tgz;
+
+			#    		unlink $BUILDROOT/$FILENAMETGZ.tgz;
+			print "Compress $BUILDROOT/htdocs into $FILENAMETGZ.tgz...\n";
+			$cmd =
+"tar --exclude-vcs --exclude-from \"$DESTI/tgz/tar.exclude\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" htdocs";
+			$ret = `$cmd`;
+
+#        	$cmd="tar --exclude-vcs --exclude-from \"$DESTI/tgz/tar.exclude\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" htdocs\n";
+#        	$ret=`$cmd`;
+			if ( $OS =~ /windows/i ) {
+				print "Move $FILENAMETGZ.tgz to $DESTI/$FILENAMETGZ.tgz\n";
+				$ret = `mv "$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
+
+   #        		$ret=`mv "$BUILDROOT/$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
+			}
+			next;
+		}
+
+		if ( $target eq 'ZIP' ) 
+		{
+			unlink $FILENAMEZIP . zip;
+			print "Compress $FILENAMETGZ into $FILENAMEZIP.zip...\n";
+			chdir("$BUILDROOT");
+
+#print "cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*\n";
+#$ret=`cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
+			$ret =
+			  `7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
+			print "Move $FILENAMEZIP.zip to $DESTI\n";
+			rename( "$BUILDROOT/$FILENAMEZIP.zip", "$DESTI/$FILENAMEZIP.zip" );
+			next;
+		}
+	}
+}
+
+print "\n----- Summary -----\n";
+foreach my $target ( keys %CHOOSEDTARGET ) {
+	if ( $CHOOSEDTARGET{$target} < 0 ) {
+		print "Package $target not built (bad requirement).\n";
+	}
+	else {
+		print "Package $target built succeessfully in $DESTI\n";
+	}
+}
+
+if ( !$btach ) {
+	print "\nPress key to finish...";
+	my $WAITKEY = <STDIN>;
+}
+
+0;
--- a/build/makepack-dolibarrmodule.pl
+++ b/build/makepack-dolibarrmodule.pl
@@ -2,15 +2,13 @@
 #----------------------------------------------------------------------------
 # \file         build/makepack-dolibarrmodule.pl
 # \brief        Package builder (tgz, zip, rpm, deb, exe)
-# \author       (c)2005-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+# \author       (c)2005-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
 #----------------------------------------------------------------------------

 use Cwd;
-$OWNER="ldestailleur";
-$GROUP="ldestailleur";


-@LISTETARGET=("ZIP");   # Possible packages
+@LISTETARGET=("TGZ");   # Possible packages
 %REQUIREMENTTARGET=(    # Tool requirement for each package
 "TGZ"=>"tar",
 "ZIP"=>"7z"
@@ -20,8 +18,8 @@ $GROUP="ldestailleur";


 use vars qw/ $REVISION $VERSION /;
-$REVISION='1.0';
-$VERSION="3.5 (build $REVISION)";
+$REVISION='1.20';
+$VERSION="1.0 (build $REVISION)";



@@ -37,9 +35,9 @@ if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='
 elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
 elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
 if (! $OS) {
-    print "$PROG.$Extension was not able to detect your OS.\n";
+    print "makepack-dolbarrmodule.pl was not able to detect your OS.\n";
 	print "Can't continue.\n";
-	print "$PROG.$Extension aborted.\n";
+	print "makepack-dolibarrmodule.pl aborted.\n";
    sleep 2;
 	exit 1;
 }
@@ -59,7 +57,7 @@ if ($OS =~ /windows/) {
 if (! $TEMP || ! -d $TEMP) {
    print "Error: A temporary directory can not be find.\n";
    print "Check that TEMP or TMP environment variable is set correctly.\n";
-	print "$PROG.$Extension aborted.\n";
+	print "makepack-dolibarrmodule.pl aborted.\n";
    sleep 2;
    exit 2;
 } 
@@ -88,6 +86,18 @@ print "Source directory: $SOURCE\n";
 print "Target directory: $NEWDESTI\n";


+# Ask and set version $MAJOR, $MINOR and $BUILD
+print "Enter value for version: ";
+$PROJVERSION=<STDIN>;
+chomp($PROJVERSION);
+($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
+if ($MINOR eq '')
+{
+    print "Enter value for minor version: ";
+    $MINOR=<STDIN>;
+    chomp($MINOR);
+}
+
 # Ask module
 print "Enter name for your module (mymodule, mywonderfulmondule, ... or 'all') : ";
 $PROJECTINPUT=<STDIN>;
@@ -118,8 +128,6 @@ else
 # Loop on each projects
 foreach my $PROJECT (@PROJECTLIST) {
 	
-	$PROJECTLC=lc($PROJECT);
-	
 	if (! -f "makepack-".$PROJECT.".conf")
 	{
 	    print "Error: can't open conf file makepack-".$PROJECT.".conf\n";
@@ -131,28 +139,9 @@ foreach my $PROJECT (@PROJECTLIST) {
 	    exit 2;
 	}
 	
-	# Get version $MAJOR, $MINOR and $BUILD
-	print "Version detected for module ".$PROJECT.": ";
-	$result=open(IN,"<".$SOURCE."/htdocs/".$PROJECTLC."/core/modules/mod".$PROJECT.".class.php");
-	if (! $result) { die "Error: Can't open descriptor file ".$SOURCE."/htdocs/".$PROJECTLC."/core/modules/mod".$PROJECT.".class.php for reading.\n"; }
-    while(<IN>)
-    {
-    	if ($_ =~ /this->version\s*=\s*'([\d\.]+)'/) { $PROJVERSION=$1; break; }
-    }
-    close IN;
-	print $PROJVERSION."\n";
-
-	($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
-	if ($MINOR eq '')
-	{
-	    print "Enter value for minor version for module ".$PROJECT.": ";
-	    $MINOR=<STDIN>;
-	    chomp($MINOR);
-	}
-		
-	$FILENAME="$PROJECTLC";
-	$FILENAMETGZ="module_$PROJECTLC-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
-	$FILENAMEZIP="module_$PROJECTLC-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
+	$FILENAME="$PROJECT";
+	$FILENAMETGZ="module_$PROJECT-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
+	$FILENAMEZIP="module_$PROJECT-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
 	if (-d "/usr/src/redhat") {
 	    # redhat
 	    $RPMDIR="/usr/src/redhat";
@@ -239,66 +228,54 @@ foreach my $PROJECT (@PROJECTLIST) {
 		    	$ret=`rm -fr "$BUILDROOT"`;
 	
 		    	mkdir "$BUILDROOT";
-		    	mkdir "$BUILDROOT/$PROJECTLC";
+		    	mkdir "$BUILDROOT/$PROJECT";
 		    	
 				$result=open(IN,"<makepack-".$PROJECT.".conf");
 				if (! $result) { die "Error: Can't open conf file makepack-".$PROJECT.".conf for reading.\n"; }
 			    while(<IN>)
 			    {
-			    	$entry=$_;
+			    	if ($_ =~ /^#/) { next; }	# Do not process comments
 					
-			    	if ($entry =~ /^#/) { next; }	# Do not process comments
-					
-					$entry =~ s/\n//;
-
-			    	if ($entry =~ /^!(.*)$/)		# Exclude so remove file/dir
+					$_ =~ s/\n//;
+			    	$_ =~ /^(.*)\/[^\/]+/;
+			    	print "Create directory $BUILDROOT/$PROJECT/$1\n";
+			    	$ret=`mkdir -p "$BUILDROOT/$PROJECT/$1"`;
+			    	if ($_ !~ /version\-/)
 			    	{
-			    		print "Remove $BUILDROOT/$PROJECTLC/$1\n";
-			    		$ret=`rm -fr "$BUILDROOT/$PROJECTLC/"$1`;
-		    		    if ($? != 0) { die "Failed to delete a file to exclude declared into makepack-".$PROJECT.".conf file (Fails on line ".$entry.")\n"; }
-		    		    next; 
+			    	    print "Copy $SOURCE/$_ into $BUILDROOT/$PROJECT/$_\n";
+		    		    $ret=`cp -pr "$SOURCE/$_" "$BUILDROOT/$PROJECT/$_"`;
 			    	}
-					
-					$entry =~ /^(.*)\/[^\/]+/;
-			    	print "Create directory $BUILDROOT/$PROJECTLC/$1\n";
-			    	$ret=`mkdir -p "$BUILDROOT/$PROJECTLC/$1"`;
-			    	if ($entry !~ /version\-/)
-			    	{
-			    	    print "Copy $SOURCE/$entry into $BUILDROOT/$PROJECTLC/$entry\n";
-		    		    $ret=`cp -pr "$SOURCE/$entry" "$BUILDROOT/$PROJECTLC/$entry"`;
-		    		    if ($? != 0) { die "Failed to make copy of a file declared into makepack-".$PROJECT.".conf file (Fails on line ".$entry.")\n"; } 
-			    	}
-			    	
 				}	
 				close IN;
 				
 				@timearray=localtime(time());
 				$fulldate=($timearray[5]+1900).'-'.($timearray[4]+1).'-'.$timearray[3].' '.$timearray[2].':'.$timearray[1];
-				open(VF,">$BUILDROOT/$PROJECTLC/build/version-".$PROJECTLC.".txt");
+				open(VF,">$BUILDROOT/$PROJECT/build/version-".$PROJECT.".txt");
 		
-				print "Create version file $BUILDROOT/$PROJECTLC/build/version-".$PROJECTLC.".txt with date ".$fulldate."\n";
-				$ret=`mkdir -p "$BUILDROOT/$PROJECTLC/build"`;
+				print "Create version file $BUILDROOT/$PROJECT/build/version-".$PROJECT.".txt with date ".$fulldate."\n";
+				$ret=`mkdir -p "$BUILDROOT/$PROJECT/build"`;
 				print VF "Version: ".$MAJOR.".".$MINOR.($BUILD ne ''?".$BUILD":"")."\n";
 				print VF "Build  : ".$fulldate."\n";
 				close VF;
 		    }
 		    print "Clean $BUILDROOT\n";
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/.cache`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/.project`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/.settings`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/index.php`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/build/html`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/documents`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/document`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/conf/conf.php.mysql`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/conf/conf.php.old`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/conf/conf.php.postgres`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/conf/conf*sav*`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/custom`;
-	        $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/custom2`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/test`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/Thumbs.db $BUILDROOT/$PROJECTLC/*/Thumbs.db $BUILDROOT/$PROJECTLC/*/*/Thumbs.db $BUILDROOT/$PROJECTLC/*/*/*/Thumbs.db $BUILDROOT/$PROJECTLC/*/*/*/*/Thumbs.db`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/CVS* $BUILDROOT/$PROJECTLC/*/CVS* $BUILDROOT/$PROJECTLC/*/*/CVS* $BUILDROOT/$PROJECTLC/*/*/*/CVS* $BUILDROOT/$PROJECTLC/*/*/*/*/CVS* $BUILDROOT/$PROJECTLC/*/*/*/*/*/CVS*`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/index.php`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`;
+	        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`;
+	        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS*`;
 		}    
 	    
 	    # Build package for each target
@@ -336,9 +313,9 @@ foreach my $PROJECT (@PROJECTLIST) {
 	    		unlink "$NEWDESTI/$FILENAMEZIP.zip";
 	    		print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
 	
-	            print "Go to directory $BUILDROOT/$PROJECTLC\n";
+	            print "Go to directory $BUILDROOT/$PROJECT\n";
 	     		$olddir=getcwd();
-	     		chdir("$BUILDROOT/$PROJECTLC");
+	     		chdir("$BUILDROOT/$PROJECT");
 	    		$cmd= "7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip *";
 				print $cmd."\n";
 				$ret= `$cmd`;
@@ -346,7 +323,6 @@ foreach my $PROJECT (@PROJECTLIST) {
 	
 	            print "Move $FILENAMEZIP.zip to $NEWDESTI/$FILENAMEZIP.zip\n";
 	            $ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$NEWDESTI/$FILENAMEZIP.zip"`;
-	            $ret=`chown $OWNER.$GROUP "$NEWDESTI/$FILENAMEZIP.zip"`;
 	    		next;
 	    	}
 	    
--- a/build/makepack-dolibarrtheme.pl
+++ b/build/makepack-dolibarrtheme.pl
@@ -41,9 +41,9 @@ if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='
 elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
 elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
 if (! $OS) {
-    print "$PROG.$Extension was not able to detect your OS.\n";
+    print "makepack-dolbarrtheme.pl was not able to detect your OS.\n";
 	print "Can't continue.\n";
-	print "$PROG.$Extension aborted.\n";
+	print "makepack-dolibarrtheme.pl aborted.\n";
    sleep 2;
 	exit 1;
 }
--- a/build/makepack-howto.txt
+++ b/build/makepack-howto.txt
@@ -8,21 +8,22 @@ This files describe steps made by Dolibarr packaging team to make a
 beta version of Dolibarr, step by step.

 - Check all files are commited.
- Update version/info in ChangeLog. 
-To generate a changelog of a major new version x.y.0 (from develop repo), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
-To generate a changelog of a major new version x.y.0 (from x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
-To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
+- Update version/info in /ChangeLog
 - Update version number with x.y.z-w in htdocs/filefunc.inc.php
+- Update version number with x.y.z-w in build/makepack-dolibarr.pl
+- Update version number with x.y.z-w in build/debian/changelog
+- Update version number with x.y.z-w in build/exe/doliwamp/doliwamp.iss
+- Update version number with x.y.z-w in build/rpm/*.spec
+- Update version number with x.y.z   in build/doxygen/dolibarr-doxygen.doxyfile
+- Update version number with x.y.z   in build/perl/virtualmin/dolibarr.pl
 - Commit all changes.
+- Add a Tag (x.y.betaz_YYYYMMDD) and push it: git push --tags
+- Create a branch (x.y).

 - Run makepack-dolibarr.pl to generate all packages.
+- Move build files into www.dolibarr.org web site (/home/dolibarr/wwwroot/files).

- Create a branch (x.y), if version seems stable enough.
-
- Move build files into www.dolibarr.org web site
-  (/home/dolibarr/wwwroot/files/lastbuild).
-
- Post a news on dolibarr.org/dolibarr.fr + social networks
+- Post a news on dolibarr.org/dolibarr.fr
 - Send mail on mailings-list


@@ -31,23 +32,23 @@ This files describe steps made by Dolibarr packaging team to make a
 complete release of Dolibarr, step by step.

 - Check all files are commited.
- Update version/info in ChangeLog. 
-To generate a changelog of a major new version x.y.0 (from develop repo), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
-To generate a changelog of a major new version x.y.0 (from x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
-To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
+- Update version/info in ChangeLog
 - Update version number with x.y.z in htdocs/filefunc.inc.php
+- Update version number with x.y.z in build/makepack-dolibarr.pl
+- Update version number with x.y.z in build/debian/changelog
+- Update version number with x.y.z in build/exe/doliwamp/doliwamp.iss
+- Update version number with x.y.z in build/rpm/*.spec
+- Update PAD files.
 - Commit all changes.
+- Add a Tag (x.y.z)

- Run makepack-dolibarr.pl to generate all packages.
-
+- Build Dolibarr and DoliWamp packages with makepack-dolibarr.pl
 - Check content of built packages.
- Move build files into www.dolibarr.org web site
-  (/home/dolibarr/wwwroot/files/stable).
+- Move build files (tgz+exe+deb+rpm...), ChangeLog and PAD files
+  into www.dolibarr.org web site (/home/dolibarr/wwwroot/files).
+- Edit symbolic links in directory "/home/dolibarr/wwwroot/files" on server to
+  point to new files (used by PAD descriptor).
+- Upload files dolibarr.*.tgz and doliwamp.*.exe on sourceforge.

- Run makepack-dolibarr.pl again with option to publish files on 
-  sourceforge. This will also add official tag.
- Edit symbolic links in directory "/home/dolibarr/wwwroot/files/stable/xxx"
-  on server to point to new files (used by some web sites).
-
- Post a news on dolibarr.org/dolibarr.fr + social networks
 - Send mail on mailings-list
+- Send news on OpenSource web sites (if major beta or release)
--- a/build/obs/README
+++ b/build/obs/README
@@ -11,10 +11,9 @@ a package onto OBS
 #----------------------------------
 https://build.opensuse.org

-Packaging rules: http://en.opensuse.org/Portal:Packaging

 Add attributes:
-OBS:Screenshots         URL of screenshot http://www.dolibarr.org/images/dolibarr_screenshot1.png
+OBS:Screenshots         URL of screenshot
 OBS:QualityCategory     Development|Testing|Stable|Private
 OBS:Maintained          1

@@ -24,29 +23,13 @@ To submit a snapshot for building, we should have a service file with content
  <service name="download_src_package">
    <param name="host">www.dolibarr.org</param>
    <param name="protocol">http</param>
-    <param name="path">/files/stable/package_rpm_generic/dolibarr-x.y.z-3.src.rpm</param>
+    <param name="path">/files/stable/package_rpm_generic/dolibarr-3.3.2-3.src.rpm</param>
  </service>
 </services>

-How to have such a service file created automatically ?
+How to have such a service ?
+Try to make "Add file" and select Remote URL and enter http://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-3.3.2-3.src.rpm

-Go into project you want to update. It mught be:
- openSUSE Build Service > Projects > Application:ERP:Dolibarr > dolibarr
- or your private project
-
-Once logged, click on "Add file" in section "Source Files", then select mode "Upload From: Remote URL"
-Keep empty for "Filename", choose "Remote URL" and enter into last field, URL that should looks like this:
-http://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-x.y.v-0.3.src.rpm
-
-Then add into Advanded - Attributes
-OBS:Screenshots http://www.dolibarr.org/images/dolibarr_screenshot1.png
-OBS:QualityCategory Stable|Testing|Development|Private
-
-
-# Move project into official directory
- Enter a bug to ask to be a maintener of a category or to add a new one.
-For example: https://bugzilla.novell.com/show_bug.cgi?id=848083 to be a maintener of category
-https://build.opensuse.org/project/show/Application:ERP
- Once done, go into project, category, subproject and enter a subproject for your application.
-Fo example: Dolibarr
- Then go onto project into your home and ask a publish to the category/you project your created. 
+Then add into advanded - attributes
+OBS:Screenshots http://www.dolibarr.org/images/phocagallery/dolibarr_screenshot1.png
+OBS:QualityCategory Testing
--- a/build/pad/DoliWamp.pml
+++ b/build/pad/DoliWamp.pml
@@ -4,10 +4,10 @@
 	<CompanyName />
 	<Program_Info>
 		<Program_Name>DoliWamp</Program_Name>
-		<Program_Version>3.5.0</Program_Version>
-		<Program_Release_Month>01</Program_Release_Month>
-		<Program_Release_Day>01</Program_Release_Day>
-		<Program_Release_Year>2014</Program_Release_Year>
+		<Program_Version>3.3.0</Program_Version>
+		<Program_Release_Month>08</Program_Release_Month>
+		<Program_Release_Day>10</Program_Release_Day>
+		<Program_Release_Year>2012</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />
@@ -41,7 +41,7 @@
 			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM for Windows</Char_Desc_45>
 			<Char_Desc_80>DoliWamp, the easy to use Dolibarr for Windows to manage your company,foundation</Char_Desc_80>
 			<Char_Desc_250>DoliWamp is the Dolibarr ERP/CRM for Windows, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs.</Char_Desc_250>
-			<Char_Desc_450>DoliWamp is the Dolibarr ERP/CRM autoinstaller for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. Dolibarr ERP/CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations.</Char_Desc_450>
+			<Char_Desc_450>DoliWamp is the Dolibarr ERP/CRM autoinstaller for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. Dolibarr ERP/CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations.</Char_Desc_450>
 			<Char_Desc_2000>DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. 

 DoliWamp is the auto-installer for Windows users with no technical knowledge to install Dolibarr ERP/CRM and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file.</Char_Desc_2000>
--- a/build/pad/Dolibarr.pml
+++ b/build/pad/Dolibarr.pml
@@ -4,10 +4,10 @@
 	<CompanyName />
 	<Program_Info>
 		<Program_Name>Dolibarr</Program_Name>
-		<Program_Version>3.5.0</Program_Version>
-		<Program_Release_Month>01</Program_Release_Month>
-		<Program_Release_Day>01</Program_Release_Day>
-		<Program_Release_Year>2014</Program_Release_Year>
+		<Program_Version>3.3.0</Program_Version>
+		<Program_Release_Month>08</Program_Release_Month>
+		<Program_Release_Day>10</Program_Release_Day>
+		<Program_Release_Year>2012</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />
--- a/build/pad/pad_dolibarr.xml
+++ b/build/pad/pad_dolibarr.xml
@@ -34,7 +34,7 @@
 	</Company_Info>
 	<Program_Info>
 		<Program_Name>Dolibarr</Program_Name>
-		<Program_Version>3.5</Program_Version>
+		<Program_Version>3.3.5</Program_Version>
 		<Program_Release_Month>01</Program_Release_Month>
 		<Program_Release_Day>01</Program_Release_Day>
 		<Program_Release_Year>2014</Program_Release_Year>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Laurent Destailleur	ab2517d538	Fix: Removed tables of external modules	2014-08-06 10:36:44 +02:00
Laurent Destailleur	9fc440df7b	Fix phpunit to be compatible with new version of phpunit	2014-05-02 00:08:34 +02:00