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

Merge branch 'NEW_BankEntries_TaxSalarySocial_DisplayUser' of github.com:atm-lena/dolibarr into develop_NEW_BankEntries_TaxSalarySocial_DisplayUser

Browse Source
This commit is contained in:
atm-lena 2021-02-11 11:14:24 +01:00
commit a1356718c0
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/compta/sociales/class/paymentsocialcontribution.class.php
View File

@ -568,6 +568,7 @@ class PaymentSocialContribution extends CommonObject
$result = $acc->add_url_line($bank_line_id, $socialcontrib->id, DOL_URL_ROOT.'/compta/charges.php?id=', $socialcontrib->type_label.(($socialcontrib->lib && $socialcontrib->lib != $socialcontrib->type_label) ? ' ('.$socialcontrib->lib.')' : ''), 'sc'); $result = $acc->add_url_line($bank_line_id, $socialcontrib->id, DOL_URL_ROOT.'/compta/charges.php?id=', $socialcontrib->type_label.(($socialcontrib->lib && $socialcontrib->lib != $socialcontrib->type_label) ? ' ('.$socialcontrib->lib.')' : ''), 'sc');
if ($result <= 0) dol_print_error($this->db); if ($result <= 0) dol_print_error($this->db);
if($socialcontrib->fk_user) {
$fuser = new User($this->db); $fuser = new User($this->db);
$fuser->fetch($socialcontrib->fk_user); $fuser->fetch($socialcontrib->fk_user);
@ -580,13 +581,13 @@ class PaymentSocialContribution extends CommonObject
'user' 'user'
); );
if ($result <= 0) if ($result <= 0) {
{
$this->error = $acc->error; $this->error = $acc->error;
$error++; $error++;
} }
} }
} }
}
} else { } else {
$this->error = $acc->error; $this->error = $acc->error;
$error++; $error++;