Merge pull request #12457 from aspangaro/10.0_p20191116

#12450 Fix accountancy write social contribution in bookkeeping (Need for FEC format)
This commit is contained in:
Laurent Destailleur 2019-11-16 23:31:21 +01:00 committed by GitHub
commit d86eb5cdb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -632,7 +632,9 @@ if (! $error && $action == 'writebookkeeping') {
$bookkeeping->subledger_account = '';
$bookkeeping->subledger_label = '';
$bookkeeping->numero_compte = $k;
$bookkeeping->label_compte = $objmid->labelc;
$accountingaccount->fetch(null, $k, true);
$bookkeeping->label_compte = $accountingaccount->label;
} elseif ($tabtype[$key] == 'payment_vat') {
$bookkeeping->subledger_account = '';
$bookkeeping->subledger_label = '';