Merge branch '7.0' of [email protected]:Dolibarr/dolibarr.git into 8.0

Conflicts: .travis.yml
PMickael · Sep 2, 2018 · 76d6aff · 76d6aff
2 parents df26ae7 + f216da7
commit 76d6aff
Show file tree

Hide file tree

Showing 71 changed files with 203 additions and 65 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -58,18 +58,17 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
-  - php: hhvm
   - php: nightly
   # We exclude some combinations not usefull to save Travis CPU
   exclude:
   - php: '5.5'
-    env: DB=mysql
+    env: DB=mariadb
   - php: '5.6'
-    env: DB=mysql
+    env: DB=mariadb
   - php: '7.0'
-    env: DB=mysql
+    env: DB=mariadb
   - php: '7.1'
-    env: DB=mysql
+    env: DB=mariadb
   - php: '5.5'
     env: DB=postgresql
   - php: '5.6'

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
@@ -1110,8 +1110,9 @@ function select_thirdparty_list($selected='',$htmlname='socid',$filter='',$showe
 			if (count($scrit) > 1) $sql.=")";
 			if (! empty($conf->barcode->enabled))
 			{
-				$sql .= " OR s.barcode LIKE '".$this->db->escape($filterkey)."%'";
+				$sql .= " OR s.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
 			}
+			$sql.= " OR s.code_client LIKE '".$this->db->escape($prefix.$filterkey)."%' OR s.code_fournisseur LIKE '".$this->db->escape($prefix.$filterkey)."%'";
 			$sql.=")";
 		}
 		$sql.=$this->db->order("nom","ASC");

diff --git a/test/phpunit/AccountingAccountTest.php b/test/phpunit/AccountingAccountTest.php
@@ -59,6 +59,8 @@ class AccountingAccountTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
+    	parent::__construct();
+
         //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;

diff --git a/test/phpunit/ActionCommTest.php b/test/phpunit/ActionCommTest.php
@@ -59,7 +59,9 @@ class ActionCommTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
@@ -61,7 +61,9 @@ class AdherentTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

diff --git a/test/phpunit/AdminLibTest.php b/test/phpunit/AdminLibTest.php
@@ -59,7 +59,9 @@ class AdminLibTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

diff --git a/test/phpunit/BankAccountTest.php b/test/phpunit/BankAccountTest.php
@@ -61,7 +61,9 @@ class BankAccountTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

diff --git 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;

diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php
@@ -89,7 +89,9 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

diff --git a/test/phpunit/CMailFileTest.php b/test/phpunit/CMailFileTest.php
@@ -59,7 +59,9 @@ class CMailFileTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -103,7 +105,7 @@ protected function setUp()
         $db=$this->savdb;
 
         $conf->global->MAIN_DISABLE_ALL_MAILS=1;    // If I comment/remove this lien, unit test still works alone but failed when ran from AllTest. Don't know why.
-        
+
         print __METHOD__."\n";
     }
     /**

diff --git a/test/phpunit/CategorieTest.php b/test/phpunit/CategorieTest.php
@@ -60,7 +60,9 @@ class CategorieTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

diff --git 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;
@@ -117,7 +119,7 @@ protected function tearDown()
 
     /**
      * testChargeSocialesCreate
-     * 
+     *
      * @return	void
      */
     public function testChargeSocialesCreate()
@@ -139,10 +141,10 @@ public function testChargeSocialesCreate()
 
     /**
      * testChargeSocialesFetch
-     * 
+     *
      * @param	int		$id		Id of social contribution
      * @return	void
-     * 
+     *
      * @depends	testChargeSocialesCreate
      * The depends says test is run only if previous is ok
      */
@@ -164,10 +166,10 @@ public function testChargeSocialesFetch($id)
 
     /**
      * testChargeSocialesValid
-     * 
+     *
      * @param	Object		$localobject	Social contribution
      * @return	void
-     * 
+     *
      * @depends	testChargeSocialesFetch
      * The depends says test is run only if previous is ok
      */
@@ -188,10 +190,10 @@ public function testChargeSocialesValid($localobject)
 
     /**
      * testChargeSocialesOther
-     * 
+     *
      * @param	Object	$localobject		Social contribution
      * @return	void
-     * 
+     *
      * @depends testChargeSocialesValid
      * The depends says test is run only if previous is ok
      */
@@ -216,10 +218,10 @@ public function testChargeSocialesOther($localobject)
 
     /**
      * testChargeSocialesDelete
-     * 
+     *
      * @param	int		$id			Social contribution
      * @return 	void
-     * 
+     *
      * @depends	testChargeSocialesOther
      * The depends says test is run only if previous is ok
      */

diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
@@ -72,7 +72,9 @@ class CodingPhpTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

diff --git 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;

diff --git a/test/phpunit/CommandeFournisseurTest.php b/test/phpunit/CommandeFournisseurTest.php
@@ -61,7 +61,9 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

diff --git a/test/phpunit/CommandeTest.php b/test/phpunit/CommandeTest.php
@@ -59,7 +59,9 @@ class CommandeTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

diff --git a/test/phpunit/CommonObjectTest.php b/test/phpunit/CommonObjectTest.php
@@ -60,7 +60,9 @@ class CommonObjectTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

diff --git 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;

diff --git a/test/phpunit/CompanyLibTest.php b/test/phpunit/CompanyLibTest.php
@@ -59,7 +59,9 @@ class CompanyLibTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

diff --git 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;
@@ -207,7 +209,7 @@ public function testContactUpdate($localobject)
 		$localobject->email='[email protected]';
 		$localobject->jabberid='New im id';
 		$localobject->default_lang='es_ES';
-		
+
 		$result=$localobject->update($localobject->id,$user);
     	print __METHOD__." id=".$localobject->id." result=".$result."\n";
     	$this->assertLessThan($result, 0, 'Contact::update error');

diff --git 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;

diff --git a/test/phpunit/CoreTest.php b/test/phpunit/CoreTest.php
@@ -62,7 +62,9 @@ class CoreTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

diff --git 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;

diff --git 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;

diff --git 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;

diff --git 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;

diff --git a/test/phpunit/ExpenseReportTest.php b/test/phpunit/ExpenseReportTest.php
@@ -60,7 +60,9 @@ class ExpenseReportTest extends PHPUnit_Framework_TestCase
      */
     function __construct()
     {
-        //$this->sharedFixture
+    	parent::__construct();
+
+    	//$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -151,7 +153,7 @@ public function testExpenseReportCreate()
         $localobject2->initAsSpecimen();        // Init a speciment with lines
         $localobject2->status = 0;
         $localobject2->fk_statut = 0;
-        
+
         $result=$localobject2->create($user);
         print __METHOD__." result=".$result."\n";
         $this->assertGreaterThanOrEqual(0, $result);

diff --git 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;

diff --git a/test/phpunit/FactureFournisseurTest.php b/test/phpunit/FactureFournisseurTest.php
@@ -61,6 +61,8 @@ class FactureFournisseurTest extends PHPUnit_Framework_TestCase
 	 */
 	function __construct()
 	{
+		parent::__construct();
+
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
 		$this->savconf=$conf;