diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php index 3f16b398f75..edcdacef6e0 100644 --- a/htdocs/core/modules/export/export_csv.modules.php +++ b/htdocs/core/modules/export/export_csv.modules.php @@ -34,12 +34,12 @@ class ExportCsv extends ModeleExports * @var int ID */ public $id; - + /** - * @var string proper name for given parameter + * @var string export files label */ public $label; - + var $extension; var $version; @@ -265,7 +265,7 @@ class ExportCsv extends ModeleExports $array = $array['options']; $newvalue = $array[$newvalue]; } - + fwrite($this->handle,$newvalue.$this->separator); $this->col++; } @@ -310,14 +310,14 @@ class ExportCsv extends ModeleExports { global $conf; $addquote=0; - + // Rule Dolibarr: No HTML //print $charset.' '.$newvalue."\n"; //$newvalue=dol_string_nohtmltag($newvalue,0,$charset); $newvalue=dol_htmlcleanlastbr($newvalue); //print $charset.' '.$newvalue."\n"; - + // Rule 1 CSV: No CR, LF in cells (except if USE_STRICT_CSV_RULES is on, we can keep record as it is but we must add quotes) $oldvalue=$newvalue; $newvalue=str_replace("\r",'',$newvalue); @@ -328,7 +328,7 @@ class ExportCsv extends ModeleExports $newvalue=$oldvalue; $addquote=1; } - + // Rule 2 CSV: If value contains ", we must escape with ", and add " if (preg_match('/"/',$newvalue)) { diff --git a/htdocs/core/modules/export/export_excel.modules.php b/htdocs/core/modules/export/export_excel.modules.php index 216f45b0148..c4fe3c5bbbf 100644 --- a/htdocs/core/modules/export/export_excel.modules.php +++ b/htdocs/core/modules/export/export_excel.modules.php @@ -36,12 +36,12 @@ class ExportExcel extends ModeleExports * @var int ID */ public $id; - + /** - * @var string proper name for given parameter + * @var string Export Excel label */ public $label; - + var $extension; var $version; @@ -73,7 +73,7 @@ class ExportExcel extends ModeleExports $this->version='1.30'; // Driver version $this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0); // A condition to disable module (used for native debian packages) - + if (empty($this->disabled)) { // If driver use an external library, put its name here @@ -337,14 +337,14 @@ class ExportExcel extends ModeleExports $newvalue=$this->excel_clean($newvalue); $typefield=isset($array_types[$code])?$array_types[$code]:''; - + if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7)) { $array = unserialize($typefield); $array = $array['options']; $newvalue = $array[$newvalue]; } - + // Traduction newvalue if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) { diff --git a/htdocs/core/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php index 578f2323857..9a7dc5df1b1 100644 --- a/htdocs/core/modules/export/export_excel2007.modules.php +++ b/htdocs/core/modules/export/export_excel2007.modules.php @@ -37,12 +37,12 @@ class ExportExcel2007 extends ExportExcel * @var int ID */ public $id; - + /** - * @var string proper name for given parameter + * @var string label */ public $label; - + var $extension; var $version; @@ -73,7 +73,7 @@ class ExportExcel2007 extends ExportExcel $this->version='1.30'; // Driver version $this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0); // A condition to disable module (used for native debian packages) - + if (empty($this->disabled)) { // If driver use an external library, put its name here @@ -93,7 +93,7 @@ class ExportExcel2007 extends ExportExcel $this->version_lib='1.8.0'; // No way to get info from library } } - + $this->row=0; } diff --git a/htdocs/core/modules/export/export_tsv.modules.php b/htdocs/core/modules/export/export_tsv.modules.php index ff5aa403015..a9d46817cd7 100644 --- a/htdocs/core/modules/export/export_tsv.modules.php +++ b/htdocs/core/modules/export/export_tsv.modules.php @@ -35,12 +35,12 @@ class ExportTsv extends ModeleExports * @var int ID */ public $id; - + /** - * @var string proper name for given parameter + * @var string label */ public $label; - + var $extension; var $version; @@ -234,14 +234,14 @@ class ExportTsv extends ModeleExports if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]); $newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output); - + if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7)) { $array = unserialize($typefield); $array = $array['options']; $newvalue = $array[$newvalue]; } - + fwrite($this->handle,$newvalue.$this->separator); $this->col++; } diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php index dd9e6622cd8..07d1875c5e3 100644 --- a/htdocs/core/modules/import/import_csv.modules.php +++ b/htdocs/core/modules/import/import_csv.modules.php @@ -37,14 +37,14 @@ class ImportCsv extends ModeleImports * @var DoliDB Database handler. */ public $db; - + var $datatoimport; /** * @var string Error code (or message) */ public $error=''; - + /** * @var string[] Error codes (or messages) */ @@ -54,12 +54,12 @@ class ImportCsv extends ModeleImports * @var int ID */ public $id; - + /** - * @var string proper name for given parameter + * @var string label */ public $label; - + var $extension; // Extension of files imported by driver var $version; // Version of driver diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php index c95fec3965c..ae8d55c3f4e 100644 --- a/htdocs/core/modules/import/import_xlsx.modules.php +++ b/htdocs/core/modules/import/import_xlsx.modules.php @@ -37,14 +37,14 @@ class ImportXlsx extends ModeleImports * @var DoliDB Database handler. */ public $db; - + var $datatoimport; /** * @var string Error code (or message) */ public $error=''; - + /** * @var string[] Error codes (or messages) */ @@ -54,12 +54,12 @@ class ImportXlsx extends ModeleImports * @var int ID */ public $id; - + /** - * @var string proper name for given parameter + * @var string label */ public $label; - + var $extension; // Extension of files imported by driver var $version; // Version of driver diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php index 7f38007d2d0..98c667afac9 100644 --- a/htdocs/core/modules/import/modules_import.php +++ b/htdocs/core/modules/import/modules_import.php @@ -45,7 +45,7 @@ class ModeleImports public $id; /** - * @var string proper name for given parameter + * @var string label */ public $label; diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php index b9d99614a60..509d6cd19eb 100644 --- a/htdocs/ecm/class/ecmdirectory.class.php +++ b/htdocs/ecm/class/ecmdirectory.class.php @@ -45,7 +45,7 @@ class EcmDirectory // extends CommonObject public $id; /** - * @var string proper name for given parameter + * @var string ECM directories label */ public $label; diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index f97d1dd7be1..aa091665905 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -1061,7 +1061,7 @@ class Livraison extends CommonObject /** - * Classe de gestion des lignes de bons de livraison + * Management class of delivery note lines */ class LivraisonLigne extends CommonObjectLine { @@ -1079,7 +1079,7 @@ class LivraisonLigne extends CommonObjectLine var $origin_id; /** - * @var string proper name for given parameter + * @var string delivery note lines label */ public $label;