Commit c30077bdc63be026ac85d474763813ba2284ba82

Authored by Darkjeff
1 parent b1c43b84
Exists in 3.5 and in 1 other branch 3.6

bug sales journal

libellé comptable identique par facture, maintenant le libellé
correspond au compte comptable, a tester mais doit fonctionner
Showing 1 changed file with 6 additions and 2 deletions   Show diff stats
accountingex/journal/sellsjournal.php
... ... @@ -154,8 +154,9 @@ if ($result) {
154 154 if (!empty($conf->global->ACCOUNTINGEX_GROUPBYACCOUNT)) {
155 155 $compte = new AccountingAccount($db);
156 156 $resultcompte=$compte->fetch($obj->fk_compte);
  157 +
157 158 if ($resultcompte) {
158   - $tabfac[$obj->rowid]["description"] = $compte->label;
  159 + $tabfac[$obj->rowid]["description"] = $compte->label;
159 160 }
160 161 } else {
161 162 $tabfac[$obj->rowid]["description"][$obj->fdid]= $obj->description;
... ... @@ -524,12 +525,15 @@ if ($action == 'export_csv') {
524 525 }
525 526 } else {
526 527 if ($mt) {
  528 + $compte = new AccountingAccount($db);
  529 + $compte->fetch(null, $k) ;
527 530 print "<tr " . $bc[$var] . ">";
528 531 // print "<td>".$conf->global->COMPTA_JOURNAL_SELL."</td>";
529 532 print "<td>" . $date . "</td>";
530 533 print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
531 534 print "<td>" . length_accountg($k) . "</td>";
532   - print "<td>" . html_entity_decode(dol_trunc($invoicestatic->description)) . "</td>";
  535 + print "<td>" . html_entity_decode(dol_trunc($compte->label)) . "</td>";
  536 + //print "<td>" . html_entity_decode(dol_trunc($invoicestatic->description)) . "</td>";
533 537 print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
534 538 print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
535 539 print "</tr>";
... ...