diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php index d7138af84a8..83fc444f258 100644 --- a/htdocs/core/modules/product/modules_product.class.php +++ b/htdocs/core/modules/product/modules_product.class.php @@ -21,18 +21,13 @@ /** - * \class ModeleProductCode - * \brief Parent class for product code generators - */ - -/** - * \file htdocs/core/modules/contract/modules_contract.php + * \file htdocs/core/modules/product/modules_product.class.php * \ingroup contract - * \brief File with parent class for generating contracts to PDF and File of class to manage contract numbering + * \brief File with parent class for generating products to PDF and File of class to manage product numbering */ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; - + /** * Parent class to manage intervention document templates */ diff --git a/htdocs/core/modules/product/modules_product.php b/htdocs/core/modules/product/modules_product.php deleted file mode 100644 index afe07e39503..00000000000 --- a/htdocs/core/modules/product/modules_product.php +++ /dev/null @@ -1,52 +0,0 @@ - - * Copyright (C) 2004-2010 Laurent Destailleur - * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2016 Charlie 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * or see http://www.gnu.org/ - */ - -require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; - -/** - * \class ModeleProduct - * \brief Parent class for product models of doc generators - */ -abstract class ModeleProduct 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='product'; - $liste=array(); - - include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; - $liste=getListOfModels($db,$type,$maxfilenamelength); - - return $liste; - } -} diff --git a/htdocs/product/card.php b/htdocs/product/card.php index addc827700e..84ba11bf624 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -46,7 +46,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php'; if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; if (! empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';