Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge remote-tracking branch 'upstream/develop' into camelCaps

Browse Source
This commit is contained in:
Frédéric FRANCE
2018-08-21 20:57:58 +02:00
parent d68f176e7e db3c17668e
commit 6b6daf178f
216 changed files with 1840 additions and 818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,8 +36,16 @@ class ImportCsv extends ModeleImports
var $db;
var $datatoimport;
var $error='';
var $errors=array();
/**
* @var string Error code (or message)
*/
public $error='';
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();
var $id; // Id of driver
var $label; // Label of driver

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

@@ -36,8 +36,16 @@ class ImportXlsx extends ModeleImports
var $db;
var $datatoimport;
var $error='';
var $errors=array();
/**
* @var string Error code (or message)
*/
public $error='';
/**
*
* @var string[] Error codes (or messages)
*/
public $errors = array ();
var $id; // Id of driver
var $label; // Label of driver