Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts: .travis.yml htdocs/langs/en_US/commercial.lang
2018-09-02 15:48:26 +02:00
parent 63217de5e0 76d6affb27
commit 3d3edb19d8
81 changed files with 230 additions and 77 deletions
--- a/test/phpunit/CodingSqlTest.php
+++ b/test/phpunit/CodingSqlTest.php
@@ -72,7 +72,9 @@ class CodingSqlTest extends PHPUnit_Framework_TestCase
     */
    function __construct()
    {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
        global $conf,$user,$langs,$db;
        $this->savconf=$conf;
        $this->savuser=$user;