Merge remote-tracking branch 'upstream/develop' into 14a22

This commit is contained in:
Alexandre SPANGARO
2021-03-16 03:26:28 +01:00
674 changed files with 18715 additions and 9254 deletions

View File

@@ -279,14 +279,14 @@ class ExportTest extends PHPUnit\Framework\TestCase
$expectedresult=1;
$this->assertEquals($expectedresult, $result, 'Error in TSV export');
$model='excel2007';
$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 Excel2007 export');
$this->assertEquals($expectedresult, $result, 'Error in Excel2007 export');
return true;
}