From ac522ee88d5cafafd548686daef76ba3c0798708 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 21 Jan 2019 11:56:54 +0100 Subject: [PATCH 1/2] Fix travis postgresql --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fe15c954fc4..9539d08b231 100644 --- a/.travis.yml +++ b/.travis.yml @@ -319,7 +319,7 @@ script: - | echo "Upgrading Dolibarr" # Ensure we catch errors. Set this to +e if you want to go to the end to see log files. - set -e + set +e cd htdocs/install php upgrade.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360.log php upgrade2.php 3.5.0 3.6.0 > $TRAVIS_BUILD_DIR/upgrade350360-2.log From 0cba7e1613c003cf31db00d32d7f14e79de0950d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 21 Jan 2019 14:30:50 +0100 Subject: [PATCH 2/2] FIX Hide path into exported filename --- htdocs/core/modules/export/export_excel.modules.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/modules/export/export_excel.modules.php b/htdocs/core/modules/export/export_excel.modules.php index 1982fffb07e..5dc574a150f 100644 --- a/htdocs/core/modules/export/export_excel.modules.php +++ b/htdocs/core/modules/export/export_excel.modules.php @@ -236,11 +236,11 @@ class ExportExcel extends ModeleExports } $this->workbook = new PHPExcel(); - $this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION); + $this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - '.DOL_APPLICATION_TITLE.' '.DOL_VERSION); //$this->workbook->getProperties()->setLastModifiedBy('Dolibarr '.DOL_VERSION); - $this->workbook->getProperties()->setTitle($outputlangs->trans("Export").' - '.$file); - $this->workbook->getProperties()->setSubject($outputlangs->trans("Export").' - '.$file); - $this->workbook->getProperties()->setDescription($outputlangs->trans("Export").' - '.$file); + $this->workbook->getProperties()->setTitle(basename($file)); + $this->workbook->getProperties()->setSubject(basename($file)); + $this->workbook->getProperties()->setDescription(DOL_APPLICATION_TITLE.' '.DOL_VERSION); $this->workbook->setActiveSheetIndex(0); $this->workbook->getActiveSheet()->setTitle($outputlangs->trans("Sheet"));