Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0

Conflicts: test/phpunit/PricesTest.php test/phpunit/RestAPIUserTest.php test/phpunit/WebservicesInvoicesTest.php
2018-09-02 14:15:17 +02:00
parent 97b1589fb5 e41b55af13
commit 02bedc49d3
60 changed files with 245 additions and 127 deletions
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # 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)
+![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/5.0.svg) ![Downloads per day](https://img.shields.io/sourceforge/dm/dolibarr.svg)

 Dolibarr ERP & CRM is a modern software package to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda, ...).

--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -61,6 +61,8 @@ class AdherentTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/AdminLibTest.php
+++ b/test/phpunit/AdminLibTest.php
@@ -59,6 +59,8 @@ class AdminLibTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/BankAccountTest.php
+++ b/test/phpunit/BankAccountTest.php
@@ -61,6 +61,8 @@ class BankAccountTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/BonPrelevementTest.php
+++ b/test/phpunit/BonPrelevementTest.php
@@ -62,6 +62,8 @@ class BonPrelevementTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/BuildDocTest.php
+++ b/test/phpunit/BuildDocTest.php
@@ -89,6 +89,8 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/CMailFileTest.php
+++ b/test/phpunit/CMailFileTest.php
@@ -59,6 +59,8 @@ class CMailFileTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/CategorieTest.php
+++ b/test/phpunit/CategorieTest.php
@@ -60,6 +60,8 @@ class CategorieTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/ChargeSocialesTest.php
+++ b/test/phpunit/ChargeSocialesTest.php
@@ -60,6 +60,8 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/CommandeFournisseurTest.php
+++ b/test/phpunit/CommandeFournisseurTest.php
@@ -61,6 +61,8 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/CommandeTest.php
+++ b/test/phpunit/CommandeTest.php
@@ -59,6 +59,8 @@ class CommandeTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/CommonObjectTest.php
+++ b/test/phpunit/CommonObjectTest.php
@@ -60,6 +60,8 @@ class CommonObjectTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/CompanyBankAccountTest.php
+++ b/test/phpunit/CompanyBankAccountTest.php
@@ -60,6 +60,8 @@ class CompanyBankAccountTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/ContactTest.php
+++ b/test/phpunit/ContactTest.php
@@ -68,6 +68,8 @@ class ContactTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/ContratTest.php
+++ b/test/phpunit/ContratTest.php
@@ -60,6 +60,8 @@ class ContratTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/CoreTest.php
+++ b/test/phpunit/CoreTest.php
@@ -62,6 +62,8 @@ class CoreTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/DateLibTest.php
+++ b/test/phpunit/DateLibTest.php
@@ -60,6 +60,8 @@ class DateLibTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/DateLibTzFranceTest.php
+++ b/test/phpunit/DateLibTzFranceTest.php
@@ -60,6 +60,8 @@ class DateLibTzFranceTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/DiscountTest.php
+++ b/test/phpunit/DiscountTest.php
@@ -60,6 +60,8 @@ class DiscountTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/EntrepotTest.php
+++ b/test/phpunit/EntrepotTest.php
@@ -60,6 +60,8 @@ class EntrepotTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
@@ -64,6 +64,8 @@ class ExportTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/FactureFournisseurTest.php
+++ b/test/phpunit/FactureFournisseurTest.php
@@ -60,6 +60,8 @@ class FactureFournisseurTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/FactureRecTest.php
+++ b/test/phpunit/FactureRecTest.php
@@ -61,6 +61,8 @@ class FactureRecTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -59,6 +59,8 @@ class FactureTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/FactureTestRounding.php
+++ b/test/phpunit/FactureTestRounding.php
@@ -60,6 +60,8 @@ class FactureTestRounding extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/FichinterTest.php
+++ b/test/phpunit/FichinterTest.php
@@ -60,6 +60,8 @@ class FichinterTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -61,6 +61,8 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/FormAdminTest.php
+++ b/test/phpunit/FormAdminTest.php
@@ -60,6 +60,8 @@ class FormAdminTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/Functions2LibTest.php
+++ b/test/phpunit/Functions2LibTest.php
@@ -63,6 +63,8 @@ class Functions2LibTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -63,6 +63,8 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/HolidayTest.php
+++ b/test/phpunit/HolidayTest.php
@@ -62,6 +62,8 @@ class HolidayTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/ImagesLibTest.php
+++ b/test/phpunit/ImagesLibTest.php
@@ -61,6 +61,8 @@ class ImagesLibTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/ImportTest.php
+++ b/test/phpunit/ImportTest.php
@@ -62,6 +62,8 @@ class ImportTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/JsonLibTest.php
+++ b/test/phpunit/JsonLibTest.php
@@ -62,6 +62,8 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -72,6 +72,8 @@ class LangTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/MarginsLibTest.php
+++ b/test/phpunit/MarginsLibTest.php
@@ -60,6 +60,8 @@ class MarginsLibTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/ModulesTest.php
+++ b/test/phpunit/ModulesTest.php
@@ -59,6 +59,8 @@ class ModulesTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/MouvementStockTest.php
+++ b/test/phpunit/MouvementStockTest.php
@@ -62,6 +62,8 @@ class MouvementStockTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -59,6 +59,8 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/PaypalTest.php
+++ b/test/phpunit/PaypalTest.php
@@ -61,6 +61,8 @@ class PaypalTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/PdfDocTest.php
+++ b/test/phpunit/PdfDocTest.php
@@ -63,6 +63,8 @@ class PdfDocTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/PgsqlTest.php
+++ b/test/phpunit/PgsqlTest.php
@@ -62,6 +62,8 @@ class PgsqlTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/PricesTest.php
+++ b/test/phpunit/PricesTest.php
@@ -67,6 +67,8 @@ class PricesTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/ProductTest.php
+++ b/test/phpunit/ProductTest.php
@@ -60,6 +60,8 @@ class ProductTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/ProjectTest.php
+++ b/test/phpunit/ProjectTest.php
@@ -61,6 +61,8 @@ class ProjectTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/PropalTest.php
+++ b/test/phpunit/PropalTest.php
@@ -60,6 +60,8 @@ class PropalTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/RestAPIUserTest.php
+++ b/test/phpunit/RestAPIUserTest.php
@@ -64,6 +64,8 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/ScriptsTest.php
+++ b/test/phpunit/ScriptsTest.php
@@ -72,6 +72,8 @@ class ScriptsTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -72,6 +72,8 @@ class SecurityTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -60,6 +60,8 @@ class SocieteTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/SqlTest.php
+++ b/test/phpunit/SqlTest.php
@@ -72,6 +72,8 @@ class SqlTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/UserGroupTest.php
+++ b/test/phpunit/UserGroupTest.php
@@ -59,6 +59,8 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -59,6 +59,8 @@ class UserTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -67,6 +67,8 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;
--- a/test/phpunit/WebservicesOrdersTest.php
+++ b/test/phpunit/WebservicesOrdersTest.php
@@ -61,6 +61,8 @@ class WebservicesOrdersTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/WebservicesOtherTest.php
+++ b/test/phpunit/WebservicesOtherTest.php
@@ -61,6 +61,8 @@ class WebservicesOtherTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -68,6 +68,8 @@ class WebservicesProductsTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@@ -68,6 +68,8 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/WebservicesUserTest.php
+++ b/test/phpunit/WebservicesUserTest.php
@@ -61,6 +61,8 @@ class WebservicesUserTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
--- a/test/phpunit/XCalLibTest.php
+++ b/test/phpunit/XCalLibTest.php
@@ -59,6 +59,8 @@ class XCalLibTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
+    	parent::__construct();
+
    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;