Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #5843 best way fixing

Browse Source
This commit is contained in:
Juanjo Menent 2016-10-07 22:21:50 +02:00
parent b7b18e3355
commit 298e5cee61
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
htdocs/categories/class/categorie.class.php
View File

@ -558,6 +558,7 @@ class Categorie extends CommonObject
global $user,$langs,$conf;
$error=0;
$trigger=true;
if ($this->id == -1) return -2;
@ -598,12 +599,16 @@ class Categorie extends CommonObject
{
$cat = new Categorie($this->db);
$cat->id=$objparent->fk_parent;
$result=$cat->add_type($obj, $type);
if ($result < 0)
{
$this->error=$cat->error;
$error++;
}
if (! $cat->containsObject($type,$obj->id)) {
$result=$cat->add_type($obj, $type);
if ($result < 0) {
$this->error=$cat->error;
$error++;
}
} else {
$trigger=false;
}
}
}
}
@ -624,10 +629,13 @@ class Categorie extends CommonObject
$this->linkto=$obj;
// Call trigger
$result=$this->call_trigger('CATEGORY_LINK',$user);
if ($result < 0) { $error++; }
// End call triggers
if ($trigger) {
$result = $this->call_trigger('CATEGORY_LINK', $user);
if ($result < 0) {
$error++;
}
// End call triggers
}
if (! $error)
{
$this->db->commit();