Overview
Comment: | Add trial balance |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | dev |
Files: | files | file ages | folders |
SHA1: |
20a088a37a844e7601d8f69e3aed5a18 |
User & Date: | bohwaz on 2020-10-09 14:11:38 |
Other Links: | branch diff | manifest | tags |
Context
2020-10-09
| ||
14:18 | Automatic simple view in journal check-in: bfa864d0a1 user: bohwaz tags: dev | |
14:11 | Add trial balance check-in: 20a088a37a user: bohwaz tags: dev | |
12:30 | Early error when trying to edit a transaction part of a closed year check-in: 926702d583 user: bohwaz tags: dev | |
Changes
Modified src/include/lib/Garradin/Template.php from [fc71db8dd6] to [c2bdf95e9a].
︙ | ︙ | |||
97 98 99 100 101 102 103 | return Utils::strftime_fr($format, $ts); }); $this->register_modifier('date_fr', function ($ts, $format = 'd/m/Y H:i:s') { return Utils::date_fr($format, $ts); }); | | > > > | 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 | return Utils::strftime_fr($format, $ts); }); $this->register_modifier('date_fr', function ($ts, $format = 'd/m/Y H:i:s') { return Utils::date_fr($format, $ts); }); $this->register_modifier('html_money', function (string $number, bool $hide_empty = true): string { if ($hide_empty && !$number) { return ''; } return sprintf('<b class="money">%s</b>', number_format($number/100, 2, ',', ' ')); }); $this->register_modifier('format_wiki', function ($str) { $str = Utils::SkrivToHTML($str); $str = Squelette_Filtres::typo_fr($str); return $str; |
︙ | ︙ |
Modified src/templates/acc/accounts/journal.tpl from [799d98c204] to [1bacd73b13].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | {include file="admin/_head.tpl" title="Journal : %s - %s"|args:$account.code:$account.label current="acc/accounts" body_id="rapport"} {if empty($year)} {include file="acc/_year_select.tpl"} {else} <nav class="acc-year"> <h4>Exercice sélectionné :</h4> <h3>{$current_year.label} — {$current_year.start_date|date_fr:'d/m/Y'} au {$current_year.end_date|date_fr:'d/m/Y'}</h3> </nav> {/if} {if $account.type} <nav class="tabs"> <ul> <li{if $simple_view} class="current"{/if}><a href="{$admin_url}acc/accounts/journal.php?id={$account.id}&simple=1&year={$year_id}">Vue simplifiée</a></li> <li{if !$simple_view} class="current"{/if}><a href="{$admin_url}acc/accounts/journal.php?id={$account.id}&simple=0&year={$year_id}">Vue normale</a></li> </ul> </nav> {/if} | > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | {include file="admin/_head.tpl" title="Journal : %s - %s"|args:$account.code:$account.label current="acc/accounts" body_id="rapport"} {if empty($year)} {include file="acc/_year_select.tpl"} {else} <nav class="acc-year"> <h4>Exercice sélectionné :</h4> <h3>{$current_year.label} — {$current_year.start_date|date_fr:'d/m/Y'} au {$current_year.end_date|date_fr:'d/m/Y'}</h3> </nav> {/if} {if $account.type} {if $simple_view} <p class="alert"> Attention : en comptabilité, les comptes de banque, de caisse, et de tiers apparaissent inversés par rapport aux relevés (<em>la banque doit de l'argent à l'association, donc les sommes placées sur le compte bancaires apparaissent au débit</em>). </p> {/if} <nav class="tabs"> <ul> <li{if $simple_view} class="current"{/if}><a href="{$admin_url}acc/accounts/journal.php?id={$account.id}&simple=1&year={$year_id}">Vue simplifiée</a></li> <li{if !$simple_view} class="current"{/if}><a href="{$admin_url}acc/accounts/journal.php?id={$account.id}&simple=0&year={$year_id}">Vue normale</a></li> </ul> </nav> {/if} |
︙ | ︙ | |||
46 47 48 49 50 51 52 | </thead> <tbody> {foreach from=$journal item="line"} <tr> <td class="num"><a href="{$admin_url}acc/transactions/details.php?id={$line.id}">{if $line.line_reference}{$line.line_reference}{elseif $line.reference}{$line.reference}{else}#{$line.id}{/if}</a></td> <td>{$line.date|date_fr:'d/m/Y'}</td> {if $simple_view} | | | | | | | 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 79 80 81 82 | </thead> <tbody> {foreach from=$journal item="line"} <tr> <td class="num"><a href="{$admin_url}acc/transactions/details.php?id={$line.id}">{if $line.line_reference}{$line.line_reference}{elseif $line.reference}{$line.reference}{else}#{$line.id}{/if}</a></td> <td>{$line.date|date_fr:'d/m/Y'}</td> {if $simple_view} <td class="money">{if $line.debit}-{$line.debit|raw|html_money}{else}+{$line.credit|raw|html_money}{/if}</td> {else} <td class="money">{$line.debit|raw|html_money}</td> <td class="money">{$line.credit|raw|html_money}</td> {/if} <td class="money">{$line.running_sum|raw|html_money:false}</td> <th>{$line.label}</th> <td class="actions"> {linkbutton href="acc/transactions/details.php?id=%d"|args:$line.id label="Détails" shape="search"} </td> </tr> {/foreach} </tbody> <tfoot> <tr> <td colspan="{if $simple_view}3{else}4{/if}">Solde</td> <td class="money">{$sum|raw|html_money:false}</td> <td colspan="2"></td> </tr> </tfoot> </table> {include file="admin/_foot.tpl"} |
Modified src/templates/acc/reports/_header.tpl from [66a9baa381] to [2ae1826e36].
1 2 3 4 5 6 7 8 9 10 11 12 13 | <div class="year-header"> <nav class="tabs noprint"> <ul> <li{if $current == "journal"} class="current"{/if}><a href="{$admin_url}acc/reports/journal.php?year={$year.id}">Journal général</a></li> <li{if $current == "ledger"} class="current"{/if}><a href="{$admin_url}acc/reports/ledger.php?year={$year.id}">Grand livre</a></li> <li{if $current == "statement"} class="current"{/if}><a href="{$admin_url}acc/reports/statement.php?year={$year.id}">Compte de résultat</a></li> <li{if $current == "balance_sheet"} class="current"{/if}><a href="{$admin_url}acc/reports/balance_sheet.php?year={$year.id}">Bilan</a></li> </ul> </nav> <h2>{$config.nom_asso}</h2> {if isset($projet)} | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | <div class="year-header"> <nav class="tabs noprint"> <ul> <li{if $current == "journal"} class="current"{/if}><a href="{$admin_url}acc/reports/journal.php?year={$year.id}">Journal général</a></li> <li{if $current == "ledger"} class="current"{/if}><a href="{$admin_url}acc/reports/ledger.php?year={$year.id}">Grand livre</a></li> <li{if $current == "trial_balance"} class="current"{/if}><a href="{$admin_url}acc/reports/trial_balance.php?year={$year.id}">Balance générale</a></li> <li{if $current == "statement"} class="current"{/if}><a href="{$admin_url}acc/reports/statement.php?year={$year.id}">Compte de résultat</a></li> <li{if $current == "balance_sheet"} class="current"{/if}><a href="{$admin_url}acc/reports/balance_sheet.php?year={$year.id}">Bilan</a></li> </ul> </nav> <h2>{$config.nom_asso}</h2> {if isset($projet)} |
︙ | ︙ |
Modified src/templates/acc/reports/journal.tpl from [3879a00730] to [9a7ab0a227].
︙ | ︙ | |||
19 20 21 22 23 24 25 | <tbody> <tr> <td rowspan="{$transaction.lines|count}" class="num"><a href="{$admin_url}acc/transactions/details.php?id={$transaction.id}">{if $transaction.reference}{$transaction.reference}{else}#{$transaction.id}{/if}</a></td> <td rowspan="{$transaction.lines|count}">{$transaction.date|date_fr:'d/m/Y'}</td> <th rowspan="{$transaction.lines|count}">{$transaction.label}</th> {foreach from=$transaction.lines item="line"} <td>{$line.account_code} - {$line.account_label}</td> | | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | <tbody> <tr> <td rowspan="{$transaction.lines|count}" class="num"><a href="{$admin_url}acc/transactions/details.php?id={$transaction.id}">{if $transaction.reference}{$transaction.reference}{else}#{$transaction.id}{/if}</a></td> <td rowspan="{$transaction.lines|count}">{$transaction.date|date_fr:'d/m/Y'}</td> <th rowspan="{$transaction.lines|count}">{$transaction.label}</th> {foreach from=$transaction.lines item="line"} <td>{$line.account_code} - {$line.account_label}</td> <td class="money">{$line.debit|escape|html_money}</td> <td class="money">{$line.credit|escape|html_money}</td> <td>{$line.label}</td> <td>{$line.reference}</td> </tr> <tr> {/foreach} </tr> </tbody> {/foreach} </table> <p class="help">Toutes les opérations sont libellées en {$config.monnaie}.</p> {include file="admin/_foot.tpl"} |
Modified src/templates/acc/reports/ledger.tpl from [40e74b9d0a] to [ccab234a1b].
1 2 3 4 5 6 7 8 9 | {include file="admin/_head.tpl" title="Grand livre" current="acc/years"} {include file="acc/reports/_header.tpl" current="ledger"} {foreach from=$ledger item="account"} <table class="list"> <caption><h4><a href="{$admin_url}acc/accounts/journal.php?id={$account.id}&year={$year.id}">{$account.code} — {$account.label}</h4></caption> <colgroup> | | > > | > | | | | < | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 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 | {include file="admin/_head.tpl" title="Grand livre" current="acc/years"} {include file="acc/reports/_header.tpl" current="ledger"} {foreach from=$ledger item="account"} <table class="list"> <caption><h4><a href="{$admin_url}acc/accounts/journal.php?id={$account.id}&year={$year.id}">{$account.code} — {$account.label}</h4></caption> <colgroup> <col width="5%" /> <col width="5%" /> <col width="10%" /> <col width="50%" /> <col width="10%" /> <col width="10%" /> <col width="10%" /> </colgroup> <thead> <tr> <td>Réf.</td> <td>Réf. ligne</td> <td>Date</td> <th>Intitulé</th> <td class="money">Débit</td> <td class="money">Crédit</td> <td class="money">Solde</td> </tr> </thead> <tbody> {foreach from=$account.lines item="line"} <tr> <td class="num"><a href="{$admin_url}acc/transactions/details.php?id={$line.id}">{if $line.reference}{$line.reference}{else}#{$line.id}{/if}</a></td> <td class="num">{$line.line_reference}</td> <td>{$line.date|date_fr:'d/m/Y'}</td> <th>{$line.label}{if $line.line_label} <em>({$line.line_label})</em>{/if}</th> <td class="money">{$line.debit|raw|html_money}</td> <td class="money">{$line.credit|raw|html_money}</td> <td class="money">{$line.running_sum|raw|html_money:false}</td> </tr> {/foreach} </tbody> <tfoot> <tr> <td colspan="3"></td> <th>Solde final</th> <td class="money">{$account.debit|raw|html_money}</td> <td class="money">{$account.credit|raw|html_money}</td> <td class="money">{$account.sum|raw|html_money:false}</td> </tr> </tfoot> </table> {if isset($account->all_debit)} <table class="list"> <colgroup> <col width="70%" /> <col width="10%" /> <col width="10%" /> <col width="10%" /> </colgroup> <tfoot> <tr> <td><strong>Totaux</strong></td> <td class="money">{$account.all_debit|raw|html_money:false}</td> <td class="money">{$account.all_credit|raw|html_money:false}</td> <td></td> </tr> </tfoot> </table> {/if} {/foreach} <p class="help">Toutes les opérations sont libellées en {$config.monnaie}.</p> {include file="admin/_foot.tpl"} |
Modified src/templates/acc/reports/statement.tpl from [e5a2990fd5] to [f1ba3a37b6].
︙ | ︙ | |||
20 21 22 23 24 25 26 | <tfoot> <tr> <td> <table> <tfoot> <tr> <th>Total charges</th> | | | | | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 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 | <tfoot> <tr> <td> <table> <tfoot> <tr> <th>Total charges</th> <td class="money">{$expense_sum|raw|html_money:false}</td> </tr> </tfoot> </table> </td> <td> <table> <tfoot> <tr> <th>Total produits</th> <td class="money">{$revenue_sum|raw|html_money:false}</td> </tr> </tfoot> </table> </td> </tr> {if $result} <tr> <td> {if ($result >= 0)} <table> <tfoot> <tr> <th>Résultat (excédent)</th> <td class="money">{$result|raw|html_money:false}</td> </tr> </tfoot> </table> {/if} </td> <td> {if ($result < 0)} <table> <tfoot> <tr> <th>Résultat (déficit)</th> <td class="money">{$result|raw|html_money:false}</td> </tr> </tfoot> </table> {/if} </td> </tr> {/if} </tfoot> </table> <p class="help">Toutes les opérations sont libellées en {$config.monnaie}.</p> {include file="admin/_foot.tpl"} |
Added src/templates/acc/reports/trial_balance.tpl version [cd8440501e].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | {include file="admin/_head.tpl" title="Balance générale" current="acc/years"} {include file="acc/reports/_header.tpl" current="trial_balance"} <table class="list"> <thead> <tr> <td>Numéro</td> <th>Compte</th> <td class="money">Total des débits</td> <td class="money">Total des crédits</td> <td class="money">Solde débiteur</td> <td class="money">Solde créditeur</td> </tr> </thead> {foreach from=$balance item="account"} <tbody> <tr> <td class="num"><a href="{$admin_url}acc/accounts/journal.php?id={$account.id}&year={$year.id}">{$account.code}</a></td> <th>{$account.label}</th> <td class="money">{$account.debit|raw|html_money}</td> <td class="money">{$account.credit|raw|html_money}</td> <td class="money">{if $account.sum < 0}{$account.debit|escape|html_money}{/if}</td> <td class="money">{if $account.sum > 0}{$account.credit|escape|html_money}{/if}</td> </tr> </tbody> {/foreach} </table> <p class="help">Toutes les opérations sont libellées en {$config.monnaie}.</p> {include file="admin/_foot.tpl"} |
Modified src/templates/acc/years/index.tpl from [3df707c5c9] to [30fe9a1ee3].
︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 | <dd class="desc"> {if $year.closed}Clôturé{else}En cours{/if} | Du {$year.start_date|date_fr:'d/m/Y'} au {$year.end_date|date_fr:'d/m/Y'} </dd> <dd class="desc"> <a href="{$admin_url}acc/reports/journal.php?year={$year.id}">Journal général</a> | <a href="{$admin_url}acc/reports/ledger.php?year={$year.id}">Grand livre</a> | <a href="{$admin_url}acc/reports/statement.php?year={$year.id}">Compte de résultat</a> | <a href="{$admin_url}acc/reports/balance_sheet.php?year={$year.id}">Bilan</a> </dd> {if $session->canAccess('compta', Membres::DROIT_ADMIN) && !$year.closed} <dd class="actions"> {linkbutton label="Balance d'ouverture" shape="reset" href="acc/years/balance.php?id=%d"|args:$year.id} {linkbutton label="Modifier" shape="edit" href="acc/years/edit.php?id=%d"|args:$year.id} | > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | <dd class="desc"> {if $year.closed}Clôturé{else}En cours{/if} | Du {$year.start_date|date_fr:'d/m/Y'} au {$year.end_date|date_fr:'d/m/Y'} </dd> <dd class="desc"> <a href="{$admin_url}acc/reports/journal.php?year={$year.id}">Journal général</a> | <a href="{$admin_url}acc/reports/ledger.php?year={$year.id}">Grand livre</a> | <a href="{$admin_url}acc/reports/trial_balance.php?year={$year.id}">Balance générale</a> | <a href="{$admin_url}acc/reports/statement.php?year={$year.id}">Compte de résultat</a> | <a href="{$admin_url}acc/reports/balance_sheet.php?year={$year.id}">Bilan</a> </dd> {if $session->canAccess('compta', Membres::DROIT_ADMIN) && !$year.closed} <dd class="actions"> {linkbutton label="Balance d'ouverture" shape="reset" href="acc/years/balance.php?id=%d"|args:$year.id} {linkbutton label="Modifier" shape="edit" href="acc/years/edit.php?id=%d"|args:$year.id} |
︙ | ︙ |
Added src/www/admin/acc/reports/trial_balance.php version [a483e23c57].
> > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 | <?php namespace Garradin; use Garradin\Accounting\Reports; require_once __DIR__ . '/_inc.php'; $tpl->assign('balance', Reports::getClosingSumsWithAccounts($criterias)); $tpl->display('acc/reports/trial_balance.tpl'); |