lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	test/phpunit/PdfDocTest.php
This commit is contained in:
Laurent Destailleur 2013-09-09 19:55:07 +02:00
commit 7670ed5ae0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/phpunit/PdfDocTest.php
View File

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