Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	test/phpunit/PdfDocTest.php

test/phpunit/PdfDocTest.php

@@ -129,11 +129,11 @@ class PdfDocTest extends PHPUnit_Framework_TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
-		$localproduct=new Product($this->savdb);	
+		$localproduct=new Product($this->savdb);
 		$localproduct->fetch(0,'PIDRESS');
 		$product_id=$localproduct->id;
 		if ($product_id <= 0) { print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die(); }
-		
+
 		$localobject=new Facture($this->savdb);
 		$localobject->initAsSpecimen();
 		$localobject->lines=array();
@@ -168,4 +168,4 @@ class PdfDocTest extends PHPUnit_Framework_TestCase
     	$this->assertEquals($result,10.4);
     }
 }
-?>
\ No newline at end of file
+?>