doxygen fix
This commit is contained in:
parent
945eede4a5
commit
9454f897ef
@ -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 = '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.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.= ' 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.= ' p.weight, p.weight_units, p.volume, p.volume_units,';
|
||||||
$sql.= ' d.date_start, d.date_end,';
|
$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';
|
$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
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -16,7 +16,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/core/class/fiscalyear.php
|
* \file htdocs/core/class/fiscalyear.class.php
|
||||||
* \ingroup fiscal year
|
* \ingroup fiscal year
|
||||||
* \brief File of class to manage fiscal years
|
* \brief File of class to manage fiscal years
|
||||||
*/
|
*/
|
||||||
@ -32,12 +32,12 @@ class Fiscalyear extends CommonObject
|
|||||||
* @var string ID to identify managed object
|
* @var string ID to identify managed object
|
||||||
*/
|
*/
|
||||||
public $element='fiscalyear';
|
public $element='fiscalyear';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string Name of table without prefix where object is stored
|
* @var string Name of table without prefix where object is stored
|
||||||
*/
|
*/
|
||||||
public $table_element='accounting_fiscalyear';
|
public $table_element='accounting_fiscalyear';
|
||||||
|
|
||||||
public $table_element_line = '';
|
public $table_element_line = '';
|
||||||
public $fk_element = '';
|
public $fk_element = '';
|
||||||
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
|
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
|
* @var string proper name for given parameter
|
||||||
*/
|
*/
|
||||||
public $label;
|
public $label;
|
||||||
|
|
||||||
var $date_start;
|
var $date_start;
|
||||||
var $date_end;
|
var $date_end;
|
||||||
var $datec;
|
var $datec;
|
||||||
|
|||||||
@ -16,7 +16,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file core/lib/assets.lib.php
|
* \file htdocs/core/lib/asset.lib.php
|
||||||
* \ingroup asset
|
* \ingroup asset
|
||||||
* \brief Library files with common functions for Assets
|
* \brief Library files with common functions for Assets
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -22,9 +22,8 @@
|
|||||||
/**
|
/**
|
||||||
* \defgroup produit Module product variants
|
* \defgroup produit Module product variants
|
||||||
* \brief Module to manage product combinations based on product attributes
|
* \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
|
* \ingroup produit
|
||||||
* \brief File to describe module to manage catalog of predefined products
|
|
||||||
*/
|
*/
|
||||||
include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
|
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
|
$this->rights = array(); // Permission array used by this module
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user