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

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

Browse Source
This commit is contained in:
Florian HENRY 2020-12-24 00:49:14 +01:00
commit c438bf1a12
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/product/class/product.class.php
View File

@ -1241,6 +1241,16 @@ class Product extends CommonObject
} }
} }
// Remove extrafields
if (!$error)
{
$result = $this->deleteExtraFields();
if ($result < 0) {
$error++;
dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
}
}
// Delete product // Delete product
if (!$error) { if (!$error) {
$sqlz = "DELETE FROM ".MAIN_DB_PREFIX."product"; $sqlz = "DELETE FROM ".MAIN_DB_PREFIX."product";
@ -1268,16 +1278,6 @@ class Product extends CommonObject
} }
} }
// Remove extrafields
if (!$error)
{
$result = $this->deleteExtraFields();
if ($result < 0) {
$error++;
dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
}
}
if (!$error) { if (!$error) {
$this->db->commit(); $this->db->commit();
return 1; return 1;