Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
This commit is contained in:
commit
d5dc88d66b
@ -202,7 +202,6 @@ class BankCateg // extends CommonObject
|
|||||||
// Delete link between tag and bank account
|
// Delete link between tag and bank account
|
||||||
if (! $error)
|
if (! $error)
|
||||||
{
|
{
|
||||||
//$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class"; // No more used
|
|
||||||
$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_account";
|
$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_account";
|
||||||
$sql.= " WHERE fk_categorie = ".$this->id;
|
$sql.= " WHERE fk_categorie = ".$this->id;
|
||||||
|
|
||||||
@ -214,6 +213,20 @@ class BankCateg // extends CommonObject
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Delete link between tag and bank lines
|
||||||
|
if (! $error)
|
||||||
|
{
|
||||||
|
$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class";
|
||||||
|
$sql.= " WHERE fk_categ = ".$this->id;
|
||||||
|
|
||||||
|
$resql = $this->db->query($sql);
|
||||||
|
if (!$resql)
|
||||||
|
{
|
||||||
|
$error++;
|
||||||
|
$this->errors[] = "Error ".$this->db->lasterror();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Delete bank categ
|
// Delete bank categ
|
||||||
if (! $error)
|
if (! $error)
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user