lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

precise label comment

Browse Source
This commit is contained in:
Philippe GRAND 2018-09-01 14:13:05 +02:00
parent 7b47c79bc3
commit bd473059ae
9 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/core/modules/export/export_csv.modules.php
View File

@ -34,12 +34,12 @@ class ExportCsv extends ModeleExports
* @var int ID * @var int ID
*/ */
public $id; public $id;
/** /**
* @var string proper name for given parameter * @var string export files label
*/ */
public $label; public $label;
var $extension; var $extension;
var $version; var $version;
@ -265,7 +265,7 @@ class ExportCsv extends ModeleExports
$array = $array['options']; $array = $array['options'];
$newvalue = $array[$newvalue]; $newvalue = $array[$newvalue];
} }
fwrite($this->handle,$newvalue.$this->separator); fwrite($this->handle,$newvalue.$this->separator);
$this->col++; $this->col++;
} }
@ -310,14 +310,14 @@ class ExportCsv extends ModeleExports
{ {
global $conf; global $conf;
$addquote=0; $addquote=0;
// Rule Dolibarr: No HTML // Rule Dolibarr: No HTML
//print $charset.' '.$newvalue."\n"; //print $charset.' '.$newvalue."\n";
//$newvalue=dol_string_nohtmltag($newvalue,0,$charset); //$newvalue=dol_string_nohtmltag($newvalue,0,$charset);
$newvalue=dol_htmlcleanlastbr($newvalue); $newvalue=dol_htmlcleanlastbr($newvalue);
//print $charset.' '.$newvalue."\n"; //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) // 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; $oldvalue=$newvalue;
$newvalue=str_replace("\r",'',$newvalue); $newvalue=str_replace("\r",'',$newvalue);
@ -328,7 +328,7 @@ class ExportCsv extends ModeleExports
$newvalue=$oldvalue; $newvalue=$oldvalue;
$addquote=1; $addquote=1;
} }
// Rule 2 CSV: If value contains ", we must escape with ", and add " // Rule 2 CSV: If value contains ", we must escape with ", and add "
if (preg_match('/"/',$newvalue)) if (preg_match('/"/',$newvalue))
{ {

12
htdocs/core/modules/export/export_excel.modules.php
View File

@ -36,12 +36,12 @@ class ExportExcel extends ModeleExports
* @var int ID * @var int ID
*/ */
public $id; public $id;
/** /**
* @var string proper name for given parameter * @var string Export Excel label
*/ */
public $label; public $label;
var $extension; var $extension;
var $version; var $version;
@ -73,7 +73,7 @@ class ExportExcel extends ModeleExports
$this->version='1.30'; // Driver version $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) $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 (empty($this->disabled))
{ {
// If driver use an external library, put its name here // If driver use an external library, put its name here
@ -337,14 +337,14 @@ class ExportExcel extends ModeleExports
$newvalue=$this->excel_clean($newvalue); $newvalue=$this->excel_clean($newvalue);
$typefield=isset($array_types[$code])?$array_types[$code]:''; $typefield=isset($array_types[$code])?$array_types[$code]:'';
if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7)) if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
{ {
$array = unserialize($typefield); $array = unserialize($typefield);
$array = $array['options']; $array = $array['options'];
$newvalue = $array[$newvalue]; $newvalue = $array[$newvalue];
} }
// Traduction newvalue // Traduction newvalue
if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) if (preg_match('/^\((.*)\)$/i',$newvalue,$reg))
{ {

10
htdocs/core/modules/export/export_excel2007.modules.php
View File

@ -37,12 +37,12 @@ class ExportExcel2007 extends ExportExcel
* @var int ID * @var int ID
*/ */
public $id; public $id;
/** /**
* @var string proper name for given parameter * @var string label
*/ */
public $label; public $label;
var $extension; var $extension;
var $version; var $version;
@ -73,7 +73,7 @@ class ExportExcel2007 extends ExportExcel
$this->version='1.30'; // Driver version $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) $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 (empty($this->disabled))
{ {
// If driver use an external library, put its name here // 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->version_lib='1.8.0'; // No way to get info from library
} }
} }
$this->row=0; $this->row=0;
} }

10
htdocs/core/modules/export/export_tsv.modules.php
View File

@ -35,12 +35,12 @@ class ExportTsv extends ModeleExports
* @var int ID * @var int ID
*/ */
public $id; public $id;
/** /**
* @var string proper name for given parameter * @var string label
*/ */
public $label; public $label;
var $extension; var $extension;
var $version; var $version;
@ -234,14 +234,14 @@ class ExportTsv extends ModeleExports
if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]); if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
$newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output); $newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output);
if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7)) if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
{ {
$array = unserialize($typefield); $array = unserialize($typefield);
$array = $array['options']; $array = $array['options'];
$newvalue = $array[$newvalue]; $newvalue = $array[$newvalue];
} }
fwrite($this->handle,$newvalue.$this->separator); fwrite($this->handle,$newvalue.$this->separator);
$this->col++; $this->col++;
} }

10
htdocs/core/modules/import/import_csv.modules.php
View File

@ -37,14 +37,14 @@ class ImportCsv extends ModeleImports
* @var DoliDB Database handler. * @var DoliDB Database handler.
*/ */
public $db; public $db;
var $datatoimport; var $datatoimport;
/** /**
* @var string Error code (or message) * @var string Error code (or message)
*/ */
public $error=''; public $error='';
/** /**
* @var string[] Error codes (or messages) * @var string[] Error codes (or messages)
*/ */
@ -54,12 +54,12 @@ class ImportCsv extends ModeleImports
* @var int ID * @var int ID
*/ */
public $id; public $id;
/** /**
* @var string proper name for given parameter * @var string label
*/ */
public $label; public $label;
var $extension; // Extension of files imported by driver var $extension; // Extension of files imported by driver
var $version; // Version of driver var $version; // Version of driver

10
htdocs/core/modules/import/import_xlsx.modules.php
View File

@ -37,14 +37,14 @@ class ImportXlsx extends ModeleImports
* @var DoliDB Database handler. * @var DoliDB Database handler.
*/ */
public $db; public $db;
var $datatoimport; var $datatoimport;
/** /**
* @var string Error code (or message) * @var string Error code (or message)
*/ */
public $error=''; public $error='';
/** /**
* @var string[] Error codes (or messages) * @var string[] Error codes (or messages)
*/ */
@ -54,12 +54,12 @@ class ImportXlsx extends ModeleImports
* @var int ID * @var int ID
*/ */
public $id; public $id;
/** /**
* @var string proper name for given parameter * @var string label
*/ */
public $label; public $label;
var $extension; // Extension of files imported by driver var $extension; // Extension of files imported by driver
var $version; // Version of driver var $version; // Version of driver

2
htdocs/core/modules/import/modules_import.php
View File

@ -45,7 +45,7 @@ class ModeleImports
public $id; public $id;
/** /**
* @var string proper name for given parameter * @var string label
*/ */
public $label; public $label;

2
htdocs/ecm/class/ecmdirectory.class.php
View File

@ -45,7 +45,7 @@ class EcmDirectory // extends CommonObject
public $id; public $id;
/** /**
* @var string proper name for given parameter * @var string ECM directories label
*/ */
public $label; public $label;

4
htdocs/livraison/class/livraison.class.php
View File

@ -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 class LivraisonLigne extends CommonObjectLine
{ {
@ -1079,7 +1079,7 @@ class LivraisonLigne extends CommonObjectLine
var $origin_id; var $origin_id;
/** /**
* @var string proper name for given parameter * @var string delivery note lines label
*/ */
public $label; public $label;