diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php index 40ae5097d2f..1120046702f 100644 --- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php +++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php @@ -1,7 +1,7 @@ - * Copyright (C) 2015 Charlie Benke - * Copyright (C) 2018 Laurent Destailleur +/* Copyright (C) 2010-2012 Regis Houssin + * Copyright (C) 2015-2018 Charlene Benke + * Copyright (C) 2018 Laurent Destailleur * * 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 @@ -191,10 +191,11 @@ class pdf_beluga extends ModelePDFProjects // Complete object by loading several other informations $task = new Task($this->db); - $tasksarray = $task->getTasksArray(0,0,$object->id); + $tasksarray = array(); + $tasksarray = $task->getTasksArray(0, 0, $object->id); - if (! $object->id > 0) // Special case when used with object = specimen, we may return all lines - { + // Special case when used with object = specimen, we may return all lines + if (! $object->id > 0) { $tasksarray=array_slice($tasksarray, 0, min(5, count($tasksarray))); } diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php index 9bd93777df1..9d417e9ed94 100644 --- a/htdocs/core/modules/rapport/pdf_paiement.class.php +++ b/htdocs/core/modules/rapport/pdf_paiement.class.php @@ -1,7 +1,7 @@ * Copyright (C) 2006-2014 Laurent Destailleur - * Copyright (C) 2015 Charles-Fr BENKE + * Copyright (C) 2015-2018 Charlene BENKE * * 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 @@ -346,7 +346,7 @@ class pdf_paiement */ function _pagehead(&$pdf, $page, $showaddress, $outputlangs) { - global $langs; + global $langs, $conf; // Do not add the BACKGROUND as this is a report //pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);