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

Merge pull request #9886 from frederic34/catchblockempty

Browse Source 
fill empty catch with log
This commit is contained in:
Laurent Destailleur 2018-10-30 12:16:41 +01:00 committed by GitHub
commit 5935a420a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 338 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
View File

@ -2,6 +2,7 @@
/* Copyright (C) 2010-2012 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2010-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2018 Ferran Marcet <fmarcet@2byte.es> * Copyright (C) 2018 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -354,6 +355,7 @@ class doc_generic_contract_odt extends ModelePDFContract
catch(Exception $e) catch(Exception $e)
{ {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
// After construction $odfHandler->contentXml contains content and // After construction $odfHandler->contentXml contains content and
@ -369,6 +371,7 @@ class doc_generic_contract_odt extends ModelePDFContract
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
foreach($tmparray as $key=>$value) foreach($tmparray as $key=>$value)
@ -386,6 +389,7 @@ class doc_generic_contract_odt extends ModelePDFContract
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
@ -419,9 +423,11 @@ class doc_generic_contract_odt extends ModelePDFContract
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
catch(SegmentException $e) catch(SegmentException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
$listlines->merge(); $listlines->merge();
@ -445,6 +451,7 @@ class doc_generic_contract_odt extends ModelePDFContract
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }

13
htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
View File

@ -4,7 +4,7 @@
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2016 Charlie Benke <charlie@patas-monkey.com> * Copyright (C) 2016 Charlie Benke <charlie@patas-monkey.com>
* Copyright (C) 2018 Philippe Grand <philippe.grand@atoo-net.com> * Copyright (C) 2018 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -347,6 +347,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
catch(Exception $e) catch(Exception $e)
{ {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
// After construction $odfHandler->contentXml contains content and // After construction $odfHandler->contentXml contains content and
@ -362,6 +363,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
// Make substitutions into odt of user info // Make substitutions into odt of user info
@ -383,6 +385,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
// Make substitutions into odt of mysoc // Make substitutions into odt of mysoc
@ -404,6 +407,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
// Make substitutions into odt of thirdparty // Make substitutions into odt of thirdparty
@ -423,6 +427,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
// Replace tags of object + external modules // Replace tags of object + external modules
@ -446,6 +451,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
// Replace tags of lines // Replace tags of lines
@ -478,9 +484,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
catch(SegmentException $e) catch(SegmentException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
$listlines->merge(); $listlines->merge();
@ -504,6 +512,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
@ -517,6 +526,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
$odfHandler->exportAsAttachedPDF($file); $odfHandler->exportAsAttachedPDF($file);
} catch (Exception $e) { } catch (Exception $e) {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
} }
@ -525,6 +535,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
$odfHandler->saveToDisk($file); $odfHandler->saveToDisk($file);
} catch (Exception $e) { } catch (Exception $e) {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
} }

9
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@ -3,6 +3,7 @@
* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2016 Charlie Benke <charlie@patas-monkey.com> * Copyright (C) 2016 Charlie Benke <charlie@patas-monkey.com>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -358,6 +359,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
catch (Exception $e) catch (Exception $e)
{ {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
// After construction $odfHandler->contentXml contains content and // After construction $odfHandler->contentXml contains content and
@ -373,6 +375,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
// Define substitution array // Define substitution array
@ -412,6 +415,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
// Replace tags of lines // Replace tags of lines
@ -444,9 +448,11 @@ class doc_generic_invoice_odt extends ModelePDFFactures
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
catch(SegmentException $e) catch(SegmentException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
$listlines->merge(); $listlines->merge();
@ -470,6 +476,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
@ -483,6 +490,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
$odfHandler->exportAsAttachedPDF($file); $odfHandler->exportAsAttachedPDF($file);
}catch (Exception $e){ }catch (Exception $e){
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
} }
@ -491,6 +499,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
$odfHandler->saveToDisk($file); $odfHandler->saveToDisk($file);
} catch (Exception $e) { } catch (Exception $e) {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
} }

9
htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2010-2012 Laurent Destailleur <eldy@products.sourceforge.net> /* Copyright (C) 2010-2012 Laurent Destailleur <eldy@products.sourceforge.net>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -368,6 +369,7 @@ class doc_generic_product_odt extends ModelePDFProduct
catch (Exception $e) catch (Exception $e)
{ {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
// After construction $odfHandler->contentXml contains content and // After construction $odfHandler->contentXml contains content and
@ -384,6 +386,7 @@ class doc_generic_product_odt extends ModelePDFProduct
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
// Define substitution array // Define substitution array
@ -420,6 +423,7 @@ class doc_generic_product_odt extends ModelePDFProduct
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
// Replace tags of lines // Replace tags of lines
@ -442,9 +446,11 @@ class doc_generic_product_odt extends ModelePDFProduct
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
catch (SegmentException $e) catch (SegmentException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
$listlines->merge(); $listlines->merge();
@ -468,6 +474,7 @@ class doc_generic_product_odt extends ModelePDFProduct
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
@ -481,6 +488,7 @@ class doc_generic_product_odt extends ModelePDFProduct
$odfHandler->exportAsAttachedPDF($file); $odfHandler->exportAsAttachedPDF($file);
} catch (Exception $e) { } catch (Exception $e) {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
} }
@ -489,6 +497,7 @@ class doc_generic_product_odt extends ModelePDFProduct
$odfHandler->saveToDisk($file); $odfHandler->saveToDisk($file);
} catch (Exception $e) { } catch (Exception $e) {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
} }

38
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
View File

@ -3,6 +3,7 @@
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Florian Henry <florian.henry@ope-concept.pro> * Copyright (C) 2013 Florian Henry <florian.henry@ope-concept.pro>
* Copyright (C) 2016 Charlie Benke <charlie@patas-monkey.com> * Copyright (C) 2016 Charlie Benke <charlie@patas-monkey.com>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -596,10 +597,9 @@ class doc_generic_project_odt extends ModelePDFProjects
'DELIMITER_RIGHT' => '}' 'DELIMITER_RIGHT' => '}'
) )
); );
} } catch (Exception $e) {
catch(Exception $e)
{
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
// After construction $odfHandler->contentXml contains content and // After construction $odfHandler->contentXml contains content and
@ -643,6 +643,7 @@ class doc_generic_project_odt extends ModelePDFProjects
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
@ -672,9 +673,11 @@ class doc_generic_project_odt extends ModelePDFProjects
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
catch(SegmentException $e) catch(SegmentException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
@ -721,9 +724,11 @@ class doc_generic_project_odt extends ModelePDFProjects
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
catch(SegmentException $e) catch(SegmentException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
$listlinestaskres->merge(); $listlinestaskres->merge();
@ -768,9 +773,11 @@ class doc_generic_project_odt extends ModelePDFProjects
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
catch(SegmentException $e) catch(SegmentException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
$listlinestasktime->merge(); $listlinestasktime->merge();
@ -806,9 +813,11 @@ class doc_generic_project_odt extends ModelePDFProjects
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
catch(SegmentException $e) catch(SegmentException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
$listlinestasktime->merge(); $listlinestasktime->merge();
@ -837,9 +846,11 @@ class doc_generic_project_odt extends ModelePDFProjects
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
catch (SegmentException $e) catch (SegmentException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
$listtasksfiles->merge(); $listtasksfiles->merge();
@ -881,9 +892,11 @@ class doc_generic_project_odt extends ModelePDFProjects
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
catch(SegmentException $e) catch(SegmentException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
$listlines->merge(); $listlines->merge();
@ -938,9 +951,11 @@ class doc_generic_project_odt extends ModelePDFProjects
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
catch(SegmentException $e) catch(SegmentException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
$listlines->merge(); $listlines->merge();
@ -1064,7 +1079,7 @@ class doc_generic_project_odt extends ModelePDFProjects
'table' => 'actioncomm', 'table' => 'actioncomm',
'disableamount' => 1, 'disableamount' => 1,
'test' => $conf->agenda->enabled && $user->rights->agenda->allactions->lire 'test' => $conf->agenda->enabled && $user->rights->agenda->allactions->lire
) ),
); );
//Insert reference //Insert reference
@ -1137,9 +1152,11 @@ class doc_generic_project_odt extends ModelePDFProjects
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
catch(SegmentException $e) catch(SegmentException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
$listlines->merge(); $listlines->merge();
@ -1148,9 +1165,7 @@ class doc_generic_project_odt extends ModelePDFProjects
} }
$odfHandler->mergeSegment($listlines); $odfHandler->mergeSegment($listlines);
} }
} } catch(OdfException $e) {
catch(OdfException $e)
{
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($this->error, LOG_WARNING); dol_syslog($this->error, LOG_WARNING);
return -1; return -1;
@ -1162,9 +1177,8 @@ class doc_generic_project_odt extends ModelePDFProjects
{ {
try { try {
$odfHandler->setVars($key, $value, true, 'UTF-8'); $odfHandler->setVars($key, $value, true, 'UTF-8');
} } catch (OdfException $e) {
catch(OdfException $e) dol_syslog($e->getMessage(), LOG_INFO);
{
} }
} }
@ -1181,12 +1195,12 @@ class doc_generic_project_odt extends ModelePDFProjects
$this->error=$e->getMessage(); $this->error=$e->getMessage();
return -1; return -1;
} }
} } else {
else {
try { try {
$odfHandler->saveToDisk($file); $odfHandler->saveToDisk($file);
} catch (Exception $e){ } catch (Exception $e){
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
} }

41
htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
View File

@ -3,6 +3,7 @@
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Florian Henry <florian.henry@ope-concept.pro> * Copyright (C) 2013 Florian Henry <florian.henry@ope-concept.pro>
* Copyright (C) 2016 Charlie Benke <charlie@patas-monkey.com> * Copyright (C) 2016 Charlie Benke <charlie@patas-monkey.com>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -560,9 +561,8 @@ class doc_generic_task_odt extends ModelePDFTask
{ {
$odfHandler->setVars($key, $value, true, 'UTF-8'); $odfHandler->setVars($key, $value, true, 'UTF-8');
} }
} } catch (OdfException $e) {
catch(OdfException $e) dol_syslog($e->getMessage(), LOG_INFO);
{
} }
} }
@ -577,15 +577,12 @@ class doc_generic_task_odt extends ModelePDFTask
complete_substitutions_array($tmparray, $outputlangs, $object); complete_substitutions_array($tmparray, $outputlangs, $object);
foreach($tmparray as $key => $val) foreach($tmparray as $key => $val)
{ {
try try {
{
$odfHandler->setVars($key, $val, true, 'UTF-8'); $odfHandler->setVars($key, $val, true, 'UTF-8');
} } catch (OdfException $e) {
catch(OdfException $e) dol_syslog($e->getMessage(), LOG_INFO);
{ } catch(SegmentException $e) {
} dol_syslog($e->getMessage(), LOG_INFO);
catch(SegmentException $e)
{
} }
} }
@ -623,15 +620,13 @@ class doc_generic_task_odt extends ModelePDFTask
foreach($tmparray as $key => $val) foreach($tmparray as $key => $val)
{ {
try try {
{
$listlinestaskres->setVars($key, $val, true, 'UTF-8'); $listlinestaskres->setVars($key, $val, true, 'UTF-8');
} catch (OdfException $e) {
dol_syslog($e->getMessage(), LOG_INFO);
} }
catch(OdfException $e) catch (SegmentException $e) {
{ dol_syslog($e->getMessage(), LOG_INFO);
}
catch(SegmentException $e)
{
} }
} }
$listlinestaskres->merge(); $listlinestaskres->merge();
@ -677,9 +672,11 @@ class doc_generic_task_odt extends ModelePDFTask
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
catch(SegmentException $e) catch(SegmentException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
$listlinestasktime->merge(); $listlinestasktime->merge();
@ -710,9 +707,11 @@ class doc_generic_task_odt extends ModelePDFTask
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
catch(SegmentException $e) catch(SegmentException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
$listtasksfiles->merge(); $listtasksfiles->merge();
@ -752,9 +751,11 @@ class doc_generic_task_odt extends ModelePDFTask
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
catch(SegmentException $e) catch(SegmentException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
$listlines->merge(); $listlines->merge();
@ -810,9 +811,11 @@ class doc_generic_task_odt extends ModelePDFTask
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
catch(SegmentException $e) catch(SegmentException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
$listlines->merge(); $listlines->merge();
@ -839,6 +842,7 @@ class doc_generic_task_odt extends ModelePDFTask
$odfHandler->exportAsAttachedPDF($file); $odfHandler->exportAsAttachedPDF($file);
} catch (Exception $e) { } catch (Exception $e) {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
} }
@ -847,6 +851,7 @@ class doc_generic_task_odt extends ModelePDFTask
$odfHandler->saveToDisk($file); $odfHandler->saveToDisk($file);
} catch (Exception $e) { } catch (Exception $e) {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
} }

9
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
View File

@ -2,6 +2,7 @@
/* Copyright (C) 2010-2012 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2010-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2016 Charlie Benke <charlie@patas-monkey.com> * Copyright (C) 2016 Charlie Benke <charlie@patas-monkey.com>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -381,6 +382,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
catch(Exception $e) catch(Exception $e)
{ {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
// After construction $odfHandler->contentXml contains content and // After construction $odfHandler->contentXml contains content and
@ -397,6 +399,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
// Define substitution array // Define substitution array
@ -433,6 +436,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
// Replace tags of lines // Replace tags of lines
@ -465,9 +469,11 @@ class doc_generic_proposal_odt extends ModelePDFPropales
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
catch(SegmentException $e) catch(SegmentException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
$listlines->merge(); $listlines->merge();
@ -491,6 +497,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
@ -504,6 +511,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
$odfHandler->exportAsAttachedPDF($file); $odfHandler->exportAsAttachedPDF($file);
} catch (Exception $e) { } catch (Exception $e) {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
} }
@ -512,6 +520,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
$odfHandler->saveToDisk($file); $odfHandler->saveToDisk($file);
} catch (Exception $e) { } catch (Exception $e) {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
} }

9
htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
View File

@ -1,6 +1,8 @@
<?php <?php
/* Copyright (C) 2010-2011 Laurent Destailleur <ely@users.sourceforge.net> /* Copyright (C) 2010-2011 Laurent Destailleur <ely@users.sourceforge.net>
* Copyright (C) 2016 Charlie Benke <charlie@patas-monkey.com> * Copyright (C) 2016 Charlie Benke <charlie@patas-monkey.com>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or * the Free Software Foundation; either version 3 of the License, or
@ -276,6 +278,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
catch(Exception $e) catch(Exception $e)
{ {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
//print $odfHandler->__toString()."\n"; //print $odfHandler->__toString()."\n";
@ -323,9 +326,11 @@ class doc_generic_odt extends ModeleThirdPartyDoc
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
catch(SegmentException $e) catch(SegmentException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
$listlines->merge(); $listlines->merge();
@ -370,6 +375,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
catch (OdfException $e) catch (OdfException $e)
{ {
// setVars failed, probably because key not found // setVars failed, probably because key not found
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
@ -382,6 +388,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
@ -395,6 +402,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
$odfHandler->exportAsAttachedPDF($file); $odfHandler->exportAsAttachedPDF($file);
} catch (Exception $e) { } catch (Exception $e) {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
} }
@ -413,6 +421,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
$odfHandler->saveToDisk($file); $odfHandler->saveToDisk($file);
}catch (Exception $e){ }catch (Exception $e){
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
} }

9
htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2010-2012 Laurent Destailleur <eldy@stocks.sourceforge.net> /* Copyright (C) 2010-2012 Laurent Destailleur <eldy@stocks.sourceforge.net>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -368,6 +369,7 @@ class doc_generic_stock_odt extends ModelePDFStock
catch(Exception $e) catch(Exception $e)
{ {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
// After construction $odfHandler->contentXml contains content and // After construction $odfHandler->contentXml contains content and
@ -384,6 +386,7 @@ class doc_generic_stock_odt extends ModelePDFStock
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
// Define substitution array // Define substitution array
@ -420,6 +423,7 @@ class doc_generic_stock_odt extends ModelePDFStock
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
// Replace tags of lines // Replace tags of lines
@ -442,9 +446,11 @@ class doc_generic_stock_odt extends ModelePDFStock
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
catch(SegmentException $e) catch(SegmentException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
$listlines->merge(); $listlines->merge();
@ -468,6 +474,7 @@ class doc_generic_stock_odt extends ModelePDFStock
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
@ -481,6 +488,7 @@ class doc_generic_stock_odt extends ModelePDFStock
$odfHandler->exportAsAttachedPDF($file); $odfHandler->exportAsAttachedPDF($file);
} catch (Exception $e) { } catch (Exception $e) {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
} }
@ -489,6 +497,7 @@ class doc_generic_stock_odt extends ModelePDFStock
$odfHandler->saveToDisk($file); $odfHandler->saveToDisk($file);
} catch (Exception $e) { } catch (Exception $e) {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
} }

9
htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
View File

@ -2,6 +2,7 @@
/* Copyright (C) 2010-2012 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2010-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2016 Charlie Benke <charlie@patas-monkey.com> * Copyright (C) 2016 Charlie Benke <charlie@patas-monkey.com>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -377,6 +378,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
catch (Exception $e) catch (Exception $e)
{ {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
// After construction $odfHandler->contentXml contains content and // After construction $odfHandler->contentXml contains content and
@ -392,6 +394,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
// Define substitution array // Define substitution array
@ -424,6 +427,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
// Replace tags of lines // Replace tags of lines
@ -456,9 +460,11 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
catch(SegmentException $e) catch(SegmentException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
$listlines->merge(); $listlines->merge();
@ -482,6 +488,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_INFO);
} }
} }
@ -495,6 +502,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
$odfHandler->exportAsAttachedPDF($file); $odfHandler->exportAsAttachedPDF($file);
} catch (Exception $e) { } catch (Exception $e) {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
} }
@ -503,6 +511,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
$odfHandler->saveToDisk($file); $odfHandler->saveToDisk($file);
} catch (Exception $e) { } catch (Exception $e) {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_INFO);
return -1; return -1;
} }
} }

6
htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2010-2012 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2010-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -343,6 +344,7 @@ class doc_generic_user_odt extends ModelePDFUser
catch(Exception $e) catch(Exception $e)
{ {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_WARNING);
return -1; return -1;
} }
@ -377,6 +379,7 @@ class doc_generic_user_odt extends ModelePDFUser
} }
catch(OdfException $e) catch(OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_WARNING);
} }
} }
@ -389,6 +392,7 @@ class doc_generic_user_odt extends ModelePDFUser
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_WARNING);
} }
} }
@ -402,6 +406,7 @@ class doc_generic_user_odt extends ModelePDFUser
$odfHandler->exportAsAttachedPDF($file); $odfHandler->exportAsAttachedPDF($file);
} catch (Exception $e) { } catch (Exception $e) {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_WARNING);
return -1; return -1;
} }
} }
@ -410,6 +415,7 @@ class doc_generic_user_odt extends ModelePDFUser
$odfHandler->saveToDisk($file); $odfHandler->saveToDisk($file);
} catch (Exception $e) { } catch (Exception $e) {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_WARNING);
return -1; return -1;
} }
} }

13
htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2010-2012 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2010-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -361,10 +362,9 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
'DELIMITER_RIGHT' => '}' 'DELIMITER_RIGHT' => '}'
) )
); );
} } catch (Exception $e) {
catch(Exception $e)
{
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_WARNING);
return -1; return -1;
} }
// After construction $odfHandler->contentXml contains content and // After construction $odfHandler->contentXml contains content and
@ -380,6 +380,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_WARNING);
} }
// Make substitutions into odt // Make substitutions into odt
@ -416,6 +417,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_WARNING);
} }
} }
// Replace tags of lines // Replace tags of lines
@ -452,9 +454,11 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_WARNING);
} }
catch (SegmentException $e) catch (SegmentException $e)
{ {
dol_syslog($e->getMessage(), LOG_WARNING);
} }
} }
$listlines->merge(); $listlines->merge();
@ -478,6 +482,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
} }
catch (OdfException $e) catch (OdfException $e)
{ {
dol_syslog($e->getMessage(), LOG_WARNING);
} }
} }
@ -491,6 +496,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
$odfHandler->exportAsAttachedPDF($file); $odfHandler->exportAsAttachedPDF($file);
} catch (Exception $e) { } catch (Exception $e) {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_WARNING);
return -1; return -1;
} }
} }
@ -499,6 +505,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
$odfHandler->saveToDisk($file); $odfHandler->saveToDisk($file);
} catch (Exception $e) { } catch (Exception $e) {
$this->error=$e->getMessage(); $this->error=$e->getMessage();
dol_syslog($e->getMessage(), LOG_WARNING);
return -1; return -1;
} }
} }