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

Standardize and update code

Browse Source
This commit is contained in:
Philippe GRAND 2018-09-20 15:01:03 +02:00
parent b7a4311802
commit 7eda9c846c
5 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/core/modules/holiday/mod_holiday_immaculate.php
View File

@ -41,7 +41,17 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
*/ */
public $error = ''; public $error = '';
public $nom = 'Immaculate'; /**
* @var string Nom du modele
* @deprecated
* @see name
*/
public $nom='Immaculate';
/**
* @var string model name
*/
public $name='Immaculate';
public $code_auto=1; public $code_auto=1;

10
htdocs/core/modules/holiday/mod_holiday_madonna.php
View File

@ -42,8 +42,18 @@ class mod_holiday_madonna extends ModelNumRefHolidays
*/ */
public $error=''; public $error='';
/**
* @var string Nom du modele
* @deprecated
* @see name
*/
public $nom='Madonna'; public $nom='Madonna';
/**
* @var string model name
*/
public $name='Madonna';
public $code_auto=1; public $code_auto=1;

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

@ -38,7 +38,7 @@ class ImportCsv extends ModeleImports
*/ */
public $db; public $db;
var $datatoimport; public $datatoimport;
/** /**
* @var string Error code (or message) * @var string Error code (or message)
@ -69,17 +69,21 @@ class ImportCsv extends ModeleImports
public $version = 'dolibarr'; public $version = 'dolibarr';
public $label_lib; // Label of external lib used by driver public $label_lib; // Label of external lib used by driver
public $version_lib; // Version of external lib used by driver public $version_lib; // Version of external lib used by driver
public $separator; public $separator;
public $file; // Path of file public $file; // Path of file
public $handle; // Handle fichier public $handle; // Handle fichier
public $cacheconvert=array(); // Array to cache list of value found after a convertion public $cacheconvert=array(); // Array to cache list of value found after a convertion
public $cachefieldtable=array(); // Array to cache list of value found into fields@tables public $cachefieldtable=array(); // Array to cache list of value found into fields@tables
public $nbinsert = 0; // # of insert done during the import public $nbinsert = 0; // # of insert done during the import
public $nbupdate = 0; // # of update done during the import public $nbupdate = 0; // # of update done during the import
@ -91,7 +95,7 @@ class ImportCsv extends ModeleImports
*/ */
function __construct($db,$datatoimport) function __construct($db,$datatoimport)
{ {
global $conf,$langs; global $conf, $langs;
$this->db = $db; $this->db = $db;
$this->separator=(GETPOST('separator')?GETPOST('separator'):(empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE)?',':$conf->global->IMPORT_CSV_SEPARATOR_TO_USE)); $this->separator=(GETPOST('separator')?GETPOST('separator'):(empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE)?',':$conf->global->IMPORT_CSV_SEPARATOR_TO_USE));

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

@ -69,18 +69,23 @@ class ImportXlsx extends ModeleImports
public $version = 'dolibarr'; public $version = 'dolibarr';
public $label_lib; // Label of external lib used by driver public $label_lib; // Label of external lib used by driver
public $version_lib; // Version of external lib used by driver public $version_lib; // Version of external lib used by driver
public $separator; public $separator;
public $file; // Path of file public $file; // Path of file
public $handle; // Handle fichier public $handle; // Handle fichier
public $cacheconvert=array(); // Array to cache list of value found after a convertion public $cacheconvert=array(); // Array to cache list of value found after a convertion
public $cachefieldtable=array(); // Array to cache list of value found into fields@tables public $cachefieldtable=array(); // Array to cache list of value found into fields@tables
public $workbook; // temporary import file public $workbook; // temporary import file
public $record; // current record public $record; // current record
public $headers; public $headers;

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

@ -37,7 +37,10 @@ class ModeleImports
public $datatoimport; public $datatoimport;
public $error=''; /**
* @var string Error code (or message)
*/
public $error='';
/** /**
* @var int id of driver * @var int id of driver
@ -58,14 +61,18 @@ class ModeleImports
public $version = 'dolibarr'; public $version = 'dolibarr';
public $label_lib; // Label of external lib used by driver public $label_lib; // Label of external lib used by driver
public $version_lib; // Version of external lib used by driver public $version_lib; // Version of external lib used by driver
// Array of all drivers // Array of all drivers
public $driverlabel=array(); public $driverlabel=array();
public $driverdesc=array(); public $driverdesc=array();
public $driverversion=array(); public $driverversion=array();
public $liblabel=array(); public $liblabel=array();
public $libversion=array(); public $libversion=array();