mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-02-08 00:52:01 +01:00
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts: test/phpunit/PdfDocTest.php
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
?>
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user