Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/commande/card.php
	test/phpunit/ExportTest.php
This commit is contained in:
Laurent Destailleur
2021-02-02 16:17:53 +01:00
parent 217989d0e2 c7a4baf7c5
commit 2e7de1d137
7 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/phpunit/ExportTest.php
View File

@@ -279,15 +279,14 @@ class ExportTest extends PHPUnit\Framework\TestCase
$expectedresult=1;
$this->assertEquals($expectedresult, $result, 'Error in TSV export');
$model='excel2007new';
$model='excel2007';
// Build export file
/* ko on php 7.4 on travis (zip not available) */
print "Process build_file for model = ".$model."\n";
$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
$expectedresult=1;
$this->assertEquals($expectedresult, $result, 'Error in Excel2007new export');
$this->assertEquals($expectedresult, $result, 'Error in Excel2007 export');
return true;
}