Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts: htdocs/compta/paiement/class/paiement.class.php
This commit is contained in:
commit
b54c18730b
@ -517,8 +517,10 @@ class Paiement extends CommonObject
|
||||
{
|
||||
$accline = new AccountLine($this->db);
|
||||
|
||||
$result = $accline->fetch($bank_line_id);
|
||||
if ($result == 0) $accline->rowid = $bank_line_id; // If not found, we set artificially rowid to allow delete of llx_bank_url
|
||||
$result=$accline->fetch($bank_line_id);
|
||||
if ($result == 0) {
|
||||
$accline->id = $accline->rowid = $bank_line_id; // If not found, we set artificially rowid to allow delete of llx_bank_url
|
||||
}
|
||||
|
||||
// Delete bank account url lines linked to payment
|
||||
$result = $accline->delete_urls($user);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user