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

Fix select and update done check

Browse Source
This commit is contained in:
Maxime Kohlhaas 2016-11-13 09:32:43 +01:00
parent 5f704fe5e5
commit 1dcecf4873
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -589,10 +589,12 @@ class ImportCsv extends ModeleImports
if($resql->num_rows == 1) { if($resql->num_rows == 1) {
$lastinsertid = $res->rowid; $lastinsertid = $res->rowid;
$last_insert_id_array[$tablename] = $lastinsertid; $last_insert_id_array[$tablename] = $lastinsertid;
} else { } else if($resql->num_rows > 1) {
$this->errors[$error]['lib']=$langs->trans('MultipleRecordFoundWithTheseFilters', implode($filter, ', ')); $this->errors[$error]['lib']=$langs->trans('MultipleRecordFoundWithTheseFilters', implode($filters, ', '));
$this->errors[$error]['type']='SQL'; $this->errors[$error]['type']='SQL';
$error++; $error++;
} else {
// No record found with filters, insert will be tried below
} }
} }
else else
@ -623,10 +625,9 @@ class ImportCsv extends ModeleImports
// Run update request // Run update request
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if($resql) { if($resql) {
if($this->db->db->affected_rows > 0) { // No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
$updatedone = true; $updatedone = true;
} }
}
else else
{ {
//print 'E'; //print 'E';