Overview
Comment: | Add column with project code, patch by @zou |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | dev | 1.0.0-beta8 |
Files: | files | file ages | folders |
SHA1: |
f9f9d935a76bad5ab85bf9e6ec14bccc |
User & Date: | bohwaz on 2020-11-25 19:31:46 |
Other Links: | branch diff | manifest | tags |
Context
2020-11-25
| ||
22:11 | Fix last minute issues check-in: 3a8f287453 user: bohwaz tags: dev, 1.0.0-beta8 | |
19:31 | Add column with project code, patch by @zou check-in: f9f9d935a7 user: bohwaz tags: dev, 1.0.0-beta8 | |
19:23 | Change analytical account action (patch from @zou) check-in: f7516d9adb user: bohwaz tags: dev | |
Changes
Modified src/include/lib/Garradin/Accounting/Accounts.php from [5c990f5765] to [6a2f112844].
︙ | ︙ | |||
217 218 219 220 221 222 223 | if (null === $type) { $other_types = implode(',', [0, Account::TYPE_OPENING, Account::TYPE_CLOSING]); } $tables = 'acc_transactions_lines l INNER JOIN acc_transactions t ON t.id = l.id_transaction | | > | 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 | if (null === $type) { $other_types = implode(',', [0, Account::TYPE_OPENING, Account::TYPE_CLOSING]); } $tables = 'acc_transactions_lines l INNER JOIN acc_transactions t ON t.id = l.id_transaction INNER JOIN acc_accounts a ON a.id = l.id_account LEFT JOIN acc_accounts b ON b.id = l.id_analytical'; $conditions = sprintf('a.type IN (%s) AND t.id_year = %d', $type ?: $other_types, $year_id); $sum = 0; $list = new DynamicList($columns, $tables, $conditions); $list->orderBy('date', true); $list->setCount('COUNT(*)'); |
︙ | ︙ |
Modified src/include/lib/Garradin/Entities/Accounting/Account.php from [fe2c4f18cc] to [6c62b2445b].
︙ | ︙ | |||
124 125 126 127 128 129 130 131 132 133 134 135 136 137 | 'select' => 'l.label', 'label' => 'Libellé ligne' ], 'line_reference' => [ 'label' => 'Réf. ligne', 'select' => 'l.reference', ], ]; protected $id; protected $id_chart; protected $code; protected $label; protected $description; | > > > > > > > | 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 | 'select' => 'l.label', 'label' => 'Libellé ligne' ], 'line_reference' => [ 'label' => 'Réf. ligne', 'select' => 'l.reference', ], 'id_analytical' => [ 'select' => 'l.id_analytical', ], 'code_analytical' => [ 'label' => 'Projet', 'select' => 'b.code', ], ]; protected $id; protected $id_chart; protected $code; protected $label; protected $description; |
︙ | ︙ | |||
179 180 181 182 183 184 185 | } public function listJournal(int $year_id, bool $simple = false) { $columns = self::LIST_COLUMNS; $tables = 'acc_transactions_lines l | | > | 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 | } public function listJournal(int $year_id, bool $simple = false) { $columns = self::LIST_COLUMNS; $tables = 'acc_transactions_lines l INNER JOIN acc_transactions t ON t.id = l.id_transaction LEFT JOIN acc_accounts b ON b.id = l.id_analytical'; $conditions = sprintf('l.id_account = %d AND t.id_year = %d', $this->id(), $year_id); $sum = 0; $reverse = $simple && self::isReversed($this->type) ? -1 : 1; if ($simple) { unset($columns['debit']['label'], $columns['credit']['label'], $columns['line_label']); |
︙ | ︙ |
Modified src/templates/acc/accounts/journal.tpl from [d802a84d1e] to [1e2a345225].
︙ | ︙ | |||
85 86 87 88 89 90 91 92 93 94 95 96 97 98 | {if isset($line->sum)} <td class="money">{$line.sum|raw|html_money:false}</td> {/if} <td>{$line.reference}</td> <th>{$line.label}</th> {if !$simple}<td>{$line.line_label}</td>{/if} <td>{$line.line_reference}</td> <td class="actions"> {if ($line.status & Entities\Accounting\Transaction::STATUS_WAITING)} {if $line.type == Entities\Accounting\Transaction::TYPE_DEBT} {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} {linkbutton shape="export" label="Régler cette créance" href="!acc/transactions/new.php?payoff_for=%d"|args:$line.id} {/if} | > | 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 | {if isset($line->sum)} <td class="money">{$line.sum|raw|html_money:false}</td> {/if} <td>{$line.reference}</td> <th>{$line.label}</th> {if !$simple}<td>{$line.line_label}</td>{/if} <td>{$line.line_reference}</td> <td class="num">{if $line.id_analytical}<a href="{$admin_url}acc/reports/statement.php?analytical={$line.id_analytical}">{$line.code_analytical}</a>{/if}</td> <td class="actions"> {if ($line.status & Entities\Accounting\Transaction::STATUS_WAITING)} {if $line.type == Entities\Accounting\Transaction::TYPE_DEBT} {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} {linkbutton shape="export" label="Régler cette créance" href="!acc/transactions/new.php?payoff_for=%d"|args:$line.id} {/if} |
︙ | ︙ | |||
108 109 110 111 112 113 114 | {if $can_edit} <td class="check"><input type="checkbox" value="Tout cocher / décocher" id="f_all2" /><label for="f_all2"></label></td> {/if} {if !$simple}<td></td>{/if} <td colspan="3">Solde</td> <td class="money">{$sum|raw|html_money:false}</td> {if !$simple}<td></td>{/if} | | | 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 | {if $can_edit} <td class="check"><input type="checkbox" value="Tout cocher / décocher" id="f_all2" /><label for="f_all2"></label></td> {/if} {if !$simple}<td></td>{/if} <td colspan="3">Solde</td> <td class="money">{$sum|raw|html_money:false}</td> {if !$simple}<td></td>{/if} <td class="actions" colspan="5"> {if $can_edit} <em>Pour les écritures cochées :</em> <input type="hidden" name="from" value="{$self_url}" /> <input type="hidden" name="year" value="{$year.id}" /> {csrf_field key="projects_action"} <select name="action"> <option value="">— Choisir une action à effectuer —</option> |
︙ | ︙ |
Modified src/templates/acc/accounts/simple.tpl from [ed79ad4ba1] to [293354b1e4].
︙ | ︙ | |||
47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | <td>{$line.account_label}</td> <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">{if $line.change > 0}+{else}-{/if}{$line.change|abs|raw|html_money}</td> <td>{$line.reference}</td> <th>{$line.label}</th> <td>{$line.line_reference}</td> <td class="actions"> {if $line.type == Entities\Accounting\Transaction::TYPE_DEBT} {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} {linkbutton shape="export" label="Régler cette créance" href="!acc/transactions/new.php?payoff_for=%d"|args:$line.id} {/if} {linkbutton href="!acc/transactions/details.php?id=%d"|args:$line.id label="Détails" shape="search"} </td> </tr> {/foreach} </tbody> {if $can_edit} <tfoot> <tr> <td class="check"><input type="checkbox" value="Tout cocher / décocher" id="f_all2" /><label for="f_all2"></label></td> | > | | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 | <td>{$line.account_label}</td> <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">{if $line.change > 0}+{else}-{/if}{$line.change|abs|raw|html_money}</td> <td>{$line.reference}</td> <th>{$line.label}</th> <td>{$line.line_reference}</td> <td class="num">{if $line.id_analytical}<a href="{$admin_url}acc/reports/statement.php?analytical={$line.id_analytical}">{$line.code_analytical}</a>{/if}</td> <td class="actions"> {if $line.type == Entities\Accounting\Transaction::TYPE_DEBT} {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} {linkbutton shape="export" label="Régler cette créance" href="!acc/transactions/new.php?payoff_for=%d"|args:$line.id} {/if} {linkbutton href="!acc/transactions/details.php?id=%d"|args:$line.id label="Détails" shape="search"} </td> </tr> {/foreach} </tbody> {if $can_edit} <tfoot> <tr> <td class="check"><input type="checkbox" value="Tout cocher / décocher" id="f_all2" /><label for="f_all2"></label></td> <td class="actions" colspan="10"> <em>Pour les écritures cochées :</em> <input type="hidden" name="from" value="{$self_url}" /> <input type="hidden" name="year" value="{$year.id}" /> {csrf_field key="projects_action"} <select name="action"> <option value="">— Choisir une action à effectuer —</option> <option value="change_analytical">Ajouter/enlever d'un projet</option> |
︙ | ︙ |