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

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

Browse Source 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
This commit is contained in:
Laurent Destailleur 2020-06-20 12:25:08 +02:00
commit b54c18730b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/compta/paiement/class/paiement.class.php
View File

@ -517,8 +517,10 @@ class Paiement extends CommonObject
{ {
$accline = new AccountLine($this->db); $accline = new AccountLine($this->db);
$result = $accline->fetch($bank_line_id); $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 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 // Delete bank account url lines linked to payment
$result = $accline->delete_urls($user); $result = $accline->delete_urls($user);