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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2021-02-02 15:37:40 +01:00
commit 217989d0e2
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/generate_filelist_xml.php
View File

@ -105,8 +105,8 @@ if (empty($includecustom)) {
} }
} }
print "Release : ".$release."\n";
print "Working on files into : ".DOL_DOCUMENT_ROOT."\n"; print "Working on files into : ".DOL_DOCUMENT_ROOT."\n";
print "Release : ".$release."\n";
print "Include custom in signature : ".$includecustom."\n"; print "Include custom in signature : ".$includecustom."\n";
print "Include constants in signature : "; print "Include constants in signature : ";
foreach ($includeconstants as $countrycode => $tmp) { foreach ($includeconstants as $countrycode => $tmp) {

8
htdocs/core/modules/export/export_excel2007new.modules.php → htdocs/core/modules/export/export_excel2007.modules.php
View File

@ -17,7 +17,7 @@
*/ */
/** /**
* \file htdocs/core/modules/export/export_excel2007new.modules.php * \file htdocs/core/modules/export/export_excel2007.modules.php
* \ingroup export * \ingroup export
* \brief File of class to generate export file with Excel format * \brief File of class to generate export file with Excel format
*/ */
@ -32,7 +32,7 @@ use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
/** /**
* Class to build export files with Excel format * Class to build export files with Excel format
*/ */
class ExportExcel2007new extends ModeleExports class ExportExcel2007 extends ModeleExports
{ {
/** /**
* @var string ID * @var string ID
@ -79,7 +79,7 @@ class ExportExcel2007new extends ModeleExports
global $conf, $langs; global $conf, $langs;
$this->db = $db; $this->db = $db;
$this->id = 'excel2007new'; // Same value then xxx in file name export_xxx.modules.php $this->id = 'excel2007'; // Same value then xxx in file name export_xxx.modules.php
$this->label = 'Excel 2007'; // Label of driver $this->label = 'Excel 2007'; // Label of driver
$this->desc = $langs->trans('Excel2007FormatDesc'); $this->desc = $langs->trans('Excel2007FormatDesc');
$this->extension = 'xlsx'; // Extension for generated file by this driver $this->extension = 'xlsx'; // Extension for generated file by this driver
@ -199,7 +199,7 @@ class ExportExcel2007new extends ModeleExports
require_once DOL_DOCUMENT_ROOT.'/includes/Psr/autoloader.php'; require_once DOL_DOCUMENT_ROOT.'/includes/Psr/autoloader.php';
require_once PHPEXCELNEW_PATH.'Spreadsheet.php'; require_once PHPEXCELNEW_PATH.'Spreadsheet.php';
if ($this->id == 'excel2007new') if ($this->id == 'excel2007')
{ {
if (!class_exists('ZipArchive')) // For Excel2007, PHPSpreadSheet may need ZipArchive if (!class_exists('ZipArchive')) // For Excel2007, PHPSpreadSheet may need ZipArchive
{ {

2
htdocs/install/upgrade2.php
View File

@ -4205,6 +4205,8 @@ function migrate_delete_old_files($db, $langs, $conf)
'/core/modules/mailings/kiwi.modules.php', '/core/modules/mailings/kiwi.modules.php',
'/core/modules/facture/pdf_crabe.modules.php', '/core/modules/facture/pdf_crabe.modules.php',
'/core/modules/facture/pdf_oursin.modules.php', '/core/modules/facture/pdf_oursin.modules.php',
'/core/modules/export/export_excel.modules.php',
'/core/modules/export/export_excel2007new.modules.php',
'/api/class/api_generic.class.php', '/api/class/api_generic.class.php',
'/categories/class/api_category.class.php', '/categories/class/api_category.class.php',