Merge tag 'develop' of https://github.com/Dolibarr/dolibarr into take…

…pos-sort-product

.github/CONTRIBUTING.md

@@ -115,12 +115,14 @@ Also, some code changes need a prior approbation:
 
 Once a PR has been submitted, you may need to wait for its integration. It is common that the project leader let the PR open for a long delay to allow every developer discuss about the PR.
 
+If the label of PR start with "WIP" (Work In Progress), it will not be analyzed (until you change the label of PR).
+
 If your PR has errors reported by the Continuous Integration Platform, it means your PR is not valid and nothing will be done with it. It will be kept open to allow developers to fix this, or it may be closed several month later. Don't expect anything on your PR if you have such errors, you MUST first fix the Continuous Integration error to have it taken into consideration. 
 
 If the PR is valid, and is kept open for a long time, a tag will also be added on the PR to describe the status of your PR and why the PR is kept open. By putting your mouse on the tag, you will get a full explanation of the tag/status that explain why your PR has not been integrated yet.
-In most cases, it give you information of things you have to do to have the PR taken into consideration (for example a change is requested, a conflict is expected to be solved, some questions were asked). If you have a yellow, red flag of purple flag, don't expect to have your PR validated. You must first provide the answer the flag ask you. The majority of PR are waiting a developer action.
+In most cases, it gives you information of things you have to do to have the PR taken into consideration (for example a change is requested, a conflict is expected to be solved, some questions were asked). If you have a yellow, red flag of purple flag, don't expect to have your PR validated. You must first provide the answer the flag ask you. The majority of PR are waiting an action of the developer/author.
 
-Around 95% of submitted PR are reviewed and tagged. Even if this is one of the most important ratio of answered PR in Open Source world, don't expect the core team to reach the 100%. With the increasing popularity of Dolibarr, this ratio will probably decrease in future.
+Statistics on Dolibarr project shows that around 95% of submitted PR are reviewed and tagged. This is one of the most important ratio of answered PR in Open Source world. Don't expect the core team to reach the 100%. With the increasing popularity of Dolibarr, this ratio will probably decrease in future.
 
 
 ### Resources

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/custom.md

@@ -0,0 +1,10 @@
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/feature_request.md

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

.gitignore

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

.scrutinizer.yml

@@ -1,4 +1,13 @@
 # .scrutinizer.yml
+#build:
+#    - php-scrutinizer-run
+build:
+    nodes:
+        analysis:
+            tests:
+                override:
+                    - php-scrutinizer-run
+
 imports:
     - javascript
     - php
@@ -29,6 +38,7 @@ tools:
                 - doc/*
                 - test/*
                 - htdocs/includes/*
+                - htdocs/core/class/lessc.class.php
             paths:
                 - htdocs/
                 - scripts/

.stickler.yml

@@ -8,3 +8,7 @@ linters:
 
 fixers:
     enable: true
+
+files:
+    ignore:
+        - 'htdocs/includes/*'