From 9f2f8ca7e09ff812acbf039dd1fafba1f1faa828 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 25 May 2018 09:31:16 +0200 Subject: [PATCH] Fix scrutinizer --- .../doc/doc_generic_order_odt.modules.php | 1 + .../doc/doc_generic_contract_odt.modules.php | 1 + .../doc/doc_generic_invoice_odt.modules.php | 1 + .../doc/doc_generic_product_odt.modules.php | 1 + .../doc/doc_generic_project_odt.modules.php | 1 + .../doc/doc_generic_proposal_odt.modules.php | 1 + .../doc/doc_generic_stock_odt.modules.php | 1 + ...s_stock.class.php => modules_movement.php} | 47 ++----------------- htdocs/core/modules/stock/modules_stock.php | 1 + 9 files changed, 13 insertions(+), 42 deletions(-) rename htdocs/core/modules/stock/{modules_stock.class.php => modules_movement.php} (51%) diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php index a7268ee0ea3..4c8b4ba2dc5 100644 --- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php +++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php @@ -285,6 +285,7 @@ class doc_generic_order_odt extends ModelePDFCommandes } // Recipient name + $contactobject=null; if (! empty($usecontact)) { // On peut utiliser le nom de la societe du contact diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php index 99eb9feb2ea..cd96e880d27 100644 --- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php +++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php @@ -276,6 +276,7 @@ class doc_generic_contract_odt extends ModelePDFContract } // Recipient name + $contactobject=null; if (! empty($usecontact)) { // On peut utiliser le nom de la societe du contact diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php index 79741886119..21c25913543 100644 --- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -286,6 +286,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures } // Recipient name + $contactobject=null; if (! empty($usecontact)) { // On peut utiliser le nom de la societe du contact diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php index f63d62149eb..c447639cfe1 100644 --- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php +++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php @@ -302,6 +302,7 @@ class doc_generic_product_odt extends ModelePDFProduct } // Recipient name + $contactobject=null; if (! empty($usecontact)) { // On peut utiliser le nom de la societe du contact diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php index 35cbed4acf4..c804d6b1af8 100644 --- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php +++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php @@ -526,6 +526,7 @@ class doc_generic_project_odt extends ModelePDFProjects } // Recipient name + $contactobject=null; if (! empty($usecontact)) { // if we have a PROJECTLEADER contact and we dont use it as recipient we store the contact object for later use diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php index 589d2d006c2..24477a67cc5 100644 --- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php +++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php @@ -316,6 +316,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales } // Recipient name + $contactobject=null; if (! empty($usecontact)) { // On peut utiliser le nom de la societe du contact diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php index d7ceffaaf72..4b4a902cb96 100644 --- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php +++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php @@ -302,6 +302,7 @@ class doc_generic_stock_odt extends ModelePDFStock } // Recipient name + $contactobject=null; if (! empty($usecontact)) { // On peut utiliser le nom de la societe du contact diff --git a/htdocs/core/modules/stock/modules_stock.class.php b/htdocs/core/modules/stock/modules_movement.php similarity index 51% rename from htdocs/core/modules/stock/modules_stock.class.php rename to htdocs/core/modules/stock/modules_movement.php index 283ae75b6a3..806f500dab7 100644 --- a/htdocs/core/modules/stock/modules_stock.class.php +++ b/htdocs/core/modules/stock/modules_movement.php @@ -1,8 +1,5 @@ - * Copyright (C) 2004-2010 Laurent Destailleur - * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2012 Regis Houssin +/* 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 @@ -19,53 +16,19 @@ * or see http://www.gnu.org/ */ - /** - * \class ModeleStock - * \brief Parent class for warehouse generators - */ - -/** - * \file htdocs/core/modules/stock/modules_stock.php + * \file htdocs/core/modules/stock/modules_movement.php * \ingroup stock - * \brief File with parent class for generating warehouse to PDF and File of class to manage warehouse mouvement + * \brief File with parent class for generating warehouse to PDF and File of class to manage warehouse movement */ - require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; - -/** - * Parent class to manage warehouse document templates - */ -abstract class ModelePDFStock extends CommonDocGenerator -{ - var $error=''; - - - /** - * Return list of active generation modules - * - * @param DoliDB $db Database handler - * @param integer $maxfilenamelength Max length of value to show - * @return array List of templates - */ - static function liste_modeles($db,$maxfilenamelength=0) - { - global $conf; - - $type='stock'; - $liste=array(); - - include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; - $liste=getListOfModels($db,$type,$maxfilenamelength); - return $liste; - } -} +require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; /** * Parent class to manage warehouse mouvement document templates */ -abstract class ModelePDFMouvement extends CommonDocGenerator +abstract class ModelePDFMovement extends CommonDocGenerator { var $error=''; diff --git a/htdocs/core/modules/stock/modules_stock.php b/htdocs/core/modules/stock/modules_stock.php index 16c33b94e07..a0740b50f54 100644 --- a/htdocs/core/modules/stock/modules_stock.php +++ b/htdocs/core/modules/stock/modules_stock.php @@ -25,6 +25,7 @@ abstract class ModelePDFStock extends CommonDocGenerator { var $error=''; + /** * Return list of active generation modules *