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

Conflicts: .travis.yml
2018-09-02 15:46:09 +02:00
parent df26ae764e f216da78d5
commit 76d6affb27
71 changed files with 203 additions and 65 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;