From 9454f897efe12cd0e561d71a62a7ad7ec585229f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 1 Sep 2018 09:40:50 +0200 Subject: [PATCH] doxygen fix --- htdocs/comm/propal/class/propal.class.php | 3 +-- htdocs/core/class/fiscalyear.class.php | 8 ++++---- htdocs/core/lib/asset.lib.php | 2 +- htdocs/core/modules/modVariants.class.php | 4 +--- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 955ee29845e..92ac850282e 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -1574,7 +1574,7 @@ class Propal extends CommonObject $sql = 'SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,'; $sql.= ' d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,'; $sql.= ' d.fk_unit,'; - $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tobach as product_batch,'; + $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tobatch as product_batch,'; $sql.= ' p.weight, p.weight_units, p.volume, p.volume_units,'; $sql.= ' d.date_start, d.date_end,'; $sql.= ' d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc'; @@ -4238,4 +4238,3 @@ class PropaleLigne extends CommonObjectLine } } - diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php index 8e6f389200b..1235dfb7729 100644 --- a/htdocs/core/class/fiscalyear.class.php +++ b/htdocs/core/class/fiscalyear.class.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/core/class/fiscalyear.php + * \file htdocs/core/class/fiscalyear.class.php * \ingroup fiscal year * \brief File of class to manage fiscal years */ @@ -32,12 +32,12 @@ class Fiscalyear extends CommonObject * @var string ID to identify managed object */ public $element='fiscalyear'; - + /** * @var string Name of table without prefix where object is stored */ public $table_element='accounting_fiscalyear'; - + public $table_element_line = ''; public $fk_element = ''; public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe @@ -48,7 +48,7 @@ class Fiscalyear extends CommonObject * @var string proper name for given parameter */ public $label; - + var $date_start; var $date_end; var $datec; diff --git a/htdocs/core/lib/asset.lib.php b/htdocs/core/lib/asset.lib.php index 0345fe31394..7a4fd80158c 100644 --- a/htdocs/core/lib/asset.lib.php +++ b/htdocs/core/lib/asset.lib.php @@ -16,7 +16,7 @@ */ /** - * \file core/lib/assets.lib.php + * \file htdocs/core/lib/asset.lib.php * \ingroup asset * \brief Library files with common functions for Assets */ diff --git a/htdocs/core/modules/modVariants.class.php b/htdocs/core/modules/modVariants.class.php index 19c50d8843e..faac67da78c 100644 --- a/htdocs/core/modules/modVariants.class.php +++ b/htdocs/core/modules/modVariants.class.php @@ -22,9 +22,8 @@ /** * \defgroup produit Module product variants * \brief Module to manage product combinations based on product attributes - * \file htdocs/core/modules/modAttributes.class.php + * \file htdocs/core/modules/modVariants.class.php * \ingroup produit - * \brief File to describe module to manage catalog of predefined products */ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; @@ -110,4 +109,3 @@ class modVariants extends DolibarrModules $this->rights = array(); // Permission array used by this module } } -