Update societe.class.php

This commit is contained in:
Laurent Destailleur 2020-06-06 21:45:53 +02:00 committed by GitHub
parent bb192195f1
commit 38d95aa5cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1678,9 +1678,9 @@ class Societe extends CommonObject
} }
} }
foreach ($this->childtablesoncascade as $tabletodelete) if (!$error)
{ {
if (!$error) foreach ($this->childtablesoncascade as $tabletodelete)
{ {
$deleteFromObject=explode(':', $tabletodelete); $deleteFromObject=explode(':', $tabletodelete);
if (count($deleteFromObject)>=2) { if (count($deleteFromObject)>=2) {
@ -1693,10 +1693,12 @@ class Societe extends CommonObject
if ($result < 0) { if ($result < 0) {
$error++; $error++;
$this->errors[] = $child_object->error; $this->errors[] = $child_object->error;
break;
} }
} else { } else {
$error++; $error++;
$this->errors[] = 'Cannot find child class file ' .$filepath; $this->errors[] = 'Cannot include child class file ' .$filepath;
break;
} }
} else { } else {
$sql = "DELETE FROM " . MAIN_DB_PREFIX . $tabletodelete; $sql = "DELETE FROM " . MAIN_DB_PREFIX . $tabletodelete;
@ -1704,6 +1706,7 @@ class Societe extends CommonObject
if (!$this->db->query($sql)) { if (!$this->db->query($sql)) {
$error++; $error++;
$this->errors[] = $this->db->lasterror(); $this->errors[] = $this->db->lasterror();
break;
} }
} }
} }