Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1
This commit is contained in:
commit
123b45aa4b
@ -40,6 +40,7 @@ function checkElementExist($id, $table)
|
||||
if ($num > 0) return true;
|
||||
else return false;
|
||||
}
|
||||
else return true; // for security
|
||||
}
|
||||
|
||||
/**
|
||||
@ -56,6 +57,9 @@ function checkLinkedElements($sourcetype, $targettype)
|
||||
$elements=array();
|
||||
$deleted=0;
|
||||
|
||||
$sourcetable=$sourcetype;
|
||||
$targettable=$targettype;
|
||||
|
||||
if ($sourcetype == 'shipping') $sourcetable = 'expedition';
|
||||
else if ($targettype == 'shipping') $targettable = 'expedition';
|
||||
if ($sourcetype == 'delivery') $sourcetable = 'livraison';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user