Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 10:08:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0

Browse Source
This commit is contained in:
Laurent Destailleur
2020-06-15 16:10:27 +02:00
parent 7b64e8643f 40e16672e3
commit b7d835eceb
7 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/commonobject.class.php
View File

@@ -8422,7 +8422,11 @@ abstract class CommonObject
$error++;
$this->errors[] = $this->error;
} else {
$result = $this->delete($user);
if (get_class($this) == 'Contact') { // TODO special code because delete() for contact has not been standardized like other delete.
$result = $this->delete();
} else {
$result = $this->delete($user);
}
if ($result < 0) {
$error++;
$this->errors[] = $this->error;