Overview
Comment: | Fix export of analytical codes in simple list |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk | stable |
Files: | files | file ages | folders |
SHA3-256: |
1e9aa618350205b598c19370a25ba577 |
User & Date: | bohwaz on 2021-03-09 11:27:13 |
Other Links: | manifest | tags |
Context
2021-03-12
| ||
18:37 | Fix: error message when trying an action with nothing selected check-in: a3495ade8a user: bohwaz tags: trunk, stable | |
2021-03-10
| ||
19:32 | Merge with trunk check-in: ec840f8fdc user: bohwaz tags: dev | |
2021-03-09
| ||
11:27 | Fix export of analytical codes in simple list check-in: 1e9aa61835 user: bohwaz tags: trunk, stable | |
2021-03-08
| ||
15:33 | setTranslationTable expects an array check-in: d40d4ff083 user: bohwaz tags: trunk, stable | |
Changes
Modified src/include/lib/Garradin/Accounting/Transactions.php from [e021e3b8ba] to [1236717366].
︙ | ︙ | |||
401 402 403 404 405 406 407 | $list->orderBy('date', true); $list->setCount('COUNT(DISTINCT t.id)'); $list->groupBy('t.id'); $list->setModifier(function (&$row) { $row->date = \DateTime::createFromFormat('!Y-m-d', $row->date); if (isset($row->id_analytical, $row->code_analytical)) { | | | | | 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 | $list->orderBy('date', true); $list->setCount('COUNT(DISTINCT t.id)'); $list->groupBy('t.id'); $list->setModifier(function (&$row) { $row->date = \DateTime::createFromFormat('!Y-m-d', $row->date); if (isset($row->id_analytical, $row->code_analytical)) { $row->code_analytical = array_combine(explode(',', $row->id_analytical), explode(',', $row->code_analytical)); } else { $row->code_analytical = []; } }); $list->setExportCallback(function (&$row) { $row->change = Utils::money_format($row->change, '.', '', false); $row->code_analytical = implode(', ', $row->code_analytical); }); return $list; } } |
Modified src/templates/acc/accounts/simple.tpl from [67738b82da] to [a83a75f997].
︙ | ︙ | |||
35 36 37 38 39 40 41 | {/if} <td class="num"><a href="{$admin_url}acc/transactions/details.php?id={$line.id}">#{$line.id}</a></td> <td>{$line.date|date_short}</td> <td class="money">{$line.change|abs|raw|html_money}</td> <td>{$line.reference}</td> <th>{$line.label}</th> <td>{$line.line_reference}</td> | | | 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 | {/if} <td class="num"><a href="{$admin_url}acc/transactions/details.php?id={$line.id}">#{$line.id}</a></td> <td>{$line.date|date_short}</td> <td class="money">{$line.change|abs|raw|html_money}</td> <td>{$line.reference}</td> <th>{$line.label}</th> <td>{$line.line_reference}</td> <td class="num">{foreach from=$line.code_analytical item="code" key="id"}<a href="{$admin_url}acc/reports/statement.php?analytical={$id}">{$code}</a> {/foreach}</td> <td class="actions"> {if $line.type == Entities\Accounting\Transaction::TYPE_DEBT && ($line.status & Entities\Accounting\Transaction::STATUS_WAITING)} {linkbutton shape="check" label="Régler cette dette" href="!acc/transactions/new.php?payoff_for=%d"|args:$line.id} {elseif $line.type == Entities\Accounting\Transaction::TYPE_CREDIT && ($line.status & Entities\Accounting\Transaction::STATUS_WAITING)} {linkbutton shape="export" label="Régler cette créance" href="!acc/transactions/new.php?payoff_for=%d"|args:$line.id} {/if} |
︙ | ︙ |