diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php index a84a2b2e5b1..b0adb2e2ad1 100644 --- a/htdocs/accountancy/bookkeeping/card.php +++ b/htdocs/accountancy/bookkeeping/card.php @@ -626,7 +626,7 @@ if ($action == 'create') } else { - print 'subledger_account).'">'; + print 'subledger_account).'">'; } print ''; print 'label_operation). '">'; @@ -683,7 +683,7 @@ if ($action == 'create') } else { - print ''; + print ''; } print ''; print ''; diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index 55c9c7386c3..4fc30bb0c30 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -512,7 +512,7 @@ if (! empty($conf->global->ACCOUNTING_REEXPORT)) { } else { $newcardbutton =''.img_picto($langs->trans("Disabled"), 'switch_off').' '; } -$newcardbutton.= $langs->trans("IncludeDocsAlreadyExported"); +$newcardbutton.= ''.$langs->trans("IncludeDocsAlreadyExported").''; $newcardbutton.= dolGetButtonTitle($buttonLabel, $langs->trans("ExportFilteredList").' ('.$listofformat[$conf->global->ACCOUNTING_EXPORT_MODELCSV].')', 'fa fa-file-export paddingleft', $_SERVER["PHP_SELF"].'?action=export_file'.($param?'&'.$param:'')); @@ -583,7 +583,7 @@ if (! empty($arrayfields['t.subledger_account']['checked'])) } else { - print ''; + print ''; } print ''; print '
'; @@ -596,7 +596,7 @@ if (! empty($arrayfields['t.subledger_account']['checked'])) } else { - print ''; + print ''; } print '
'; print ''; diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index 6b5d63bce0f..cfe49764c74 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -298,8 +298,6 @@ if ($result) { $paymentstatic->ref = $links[$key]['url_id']; $tabpay[$obj->rowid]["lib"] .= ' ' . $paymentstatic->getNomUrl(2, '', ''); // TODO Do not include list of invoice in tooltip, the dol_string_nohtmltag is ko with this $tabpay[$obj->rowid]["paymentid"] = $paymentstatic->id; - - } elseif ($links[$key]['type'] == 'payment_supplier') { $paymentsupplierstatic->id = $links[$key]['url_id']; $paymentsupplierstatic->ref = $links[$key]['url_id']; @@ -473,11 +471,12 @@ if ($result) { dol_print_error($db); } -/* -var_dump($tabpay); + +/*var_dump($tabpay); +var_dump($tabcompany); var_dump($tabbq); var_dump($tabtp); -*/ +var_dump($tabtype);*/ // Write bookkeeping if (! $error && $action == 'writebookkeeping') { @@ -593,15 +592,15 @@ if (! $error && $action == 'writebookkeeping') { $bookkeeping->date_create = $now; if ($tabtype[$key] == 'payment') { // If payment is payment of customer invoice, we get ref of invoice - $bookkeeping->subledger_account = $tabcompany[$key]['code_compta']; - $bookkeeping->subledger_label = $tabcompany[$key]['name']; + $bookkeeping->subledger_account = $k; // For payment, the subledger account is stored as $key of $tabtp + $bookkeeping->subledger_label = $tabcompany[$key]['name']; // $tabcompany is defined only if we are sure there is 1 thirdparty for the bank transaction $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER; $accountingaccount->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER, true); $bookkeeping->label_compte = $accountingaccount->label; - } elseif ($tabtype[$key] == 'payment_supplier') { // If payment is payment of supplier invoice, we get ref of invoice - $bookkeeping->subledger_account = $tabcompany[$key]['code_compta']; - $bookkeeping->subledger_label = $tabcompany[$key]['name']; + } elseif ($tabtype[$key] == 'payment_supplier') { // If payment is payment of supplier invoice, we get ref of invoice + $bookkeeping->subledger_account = $k; // For payment, the subledger account is stored as $key of $tabtp + $bookkeeping->subledger_label = $tabcompany[$key]['name']; // $tabcompany is defined only if we are sure there is 1 thirdparty for the bank transaction $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER; $accountingaccount->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER, true); diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php index 2d911b5c6bb..67f1e2909fc 100644 --- a/htdocs/compta/bank/various_payment/card.php +++ b/htdocs/compta/bank/various_payment/card.php @@ -382,7 +382,7 @@ if ($action == 'create') } else { - print ''; + print ''; } print ''; }