Comment: | Refactor old date_fr modifiers |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | dev |
Files: | files | file ages | folders |
SHA1: |
6dd8cf19c9f566ee6c6b8a128c078ec4 |
User & Date: | bohwaz on 2020-11-25 15:35:20 |
Other Links: | branch diff | manifest | tags |
2020-11-25
| ||
16:06 | Add ability to search accounting using accounts and analytical check-in: 3abc5388d1 user: bohwaz tags: dev | |
15:35 | Refactor old date_fr modifiers check-in: 6dd8cf19c9 user: bohwaz tags: dev | |
15:24 | Refactor date modifiers, remove format_sqlite_date_to_french modifier check-in: 6f8a05aa31 user: bohwaz tags: dev | |
Modified src/include/lib/Garradin/Template.php from [9daeb04963] to [7f7a38b762].
︙ | ︙ | |||
84 85 86 87 88 89 90 91 92 93 94 95 96 97 | $this->register_modifier('format_tel', [$this, 'formatPhoneNumber']); $this->register_modifier('abs', 'abs'); $this->register_modifier('display_champ_membre', [$this, 'displayChampMembre']); $this->register_modifier('format_bytes', ['Garradin\Utils', 'format_bytes']); $this->register_modifier('strftime_fr', [Utils::class, 'strftime_fr']); $this->register_modifier('date_fr', [Utils::class, 'date_fr']); $this->register_modifier('date_short', function ($dt) { return Utils::date_fr($dt, 'd/m/Y'); }); $this->register_modifier('html_money', [$this, 'htmlMoney']); $this->register_modifier('money_currency', [$this, 'htmlMoneyCurrency']); | > | 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 | $this->register_modifier('format_tel', [$this, 'formatPhoneNumber']); $this->register_modifier('abs', 'abs'); $this->register_modifier('display_champ_membre', [$this, 'displayChampMembre']); $this->register_modifier('format_bytes', ['Garradin\Utils', 'format_bytes']); $this->register_modifier('strftime_fr', [Utils::class, 'strftime_fr']); $this->register_modifier('date_fr', [Utils::class, 'date_fr']); $this->register_modifier('date_long', [Utils::class, 'date_fr']); $this->register_modifier('date_short', function ($dt) { return Utils::date_fr($dt, 'd/m/Y'); }); $this->register_modifier('html_money', [$this, 'htmlMoney']); $this->register_modifier('money_currency', [$this, 'htmlMoneyCurrency']); |
︙ | ︙ |
Modified src/templates/acc/_year_select.tpl from [35fd4a6a41] to [9d69235d94].
1 2 | <nav class="acc-year"> <h4>Exercice sélectionné :</h4> | | | 1 2 3 4 5 | <nav class="acc-year"> <h4>Exercice sélectionné :</h4> <h3>{$current_year.label} — {$current_year.start_date|date_short} au {$current_year.end_date|date_short}</h3> <footer>{linkbutton label="Changer d'exercice" href="!acc/years/select.php?from=%s"|args:rawurlencode($self_url) shape="settings"}</footer> </nav> |
Modified src/templates/acc/accounts/deposit.tpl from [0ffa4f06f4] to [970d3a07a5].
︙ | ︙ | |||
22 23 24 25 26 27 28 | </thead> <tbody> {foreach from=$journal item="line"} {if isset($line.sum)} <tr> <td colspan="5"></td> <td class="money">{if $line.sum > 0}-{/if}{$line.sum|abs|raw|html_money:false}</td> | | | | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | </thead> <tbody> {foreach from=$journal item="line"} {if isset($line.sum)} <tr> <td colspan="5"></td> <td class="money">{if $line.sum > 0}-{/if}{$line.sum|abs|raw|html_money:false}</td> <th>Solde au {$line.date|date_short}</th> <td colspan="2"></td> </tr> {else} <tr> <td class="check"> {input type="checkbox" name="deposit[%d]"|args:$line.id value="1" data-debit=$line.debit|abs data-credit=$line.credit default=$line.checked} </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>{$line.reference}</td> <td>{$line.line_reference}</td> <th>{$line.label}</th> <td class="money">{$line.debit|raw|html_money}</td> <td class="money">{if $line.running_sum > 0}-{/if}{$line.running_sum|abs|raw|html_money:false}</td> </tr> {/if} |
︙ | ︙ |
Modified src/templates/acc/accounts/journal.tpl from [9429529b37] to [09331b1b0f].
1 2 3 4 5 6 7 | {include file="admin/_head.tpl" title="Journal : %s - %s"|args:$account.code:$account.label current="acc/accounts" body_id="rapport" js=1} {if empty($year)} {include file="acc/_year_select.tpl"} {else} <nav class="acc-year"> <h4>Exercice sélectionné :</h4> | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | {include file="admin/_head.tpl" title="Journal : %s - %s"|args:$account.code:$account.label current="acc/accounts" body_id="rapport" js=1} {if empty($year)} {include file="acc/_year_select.tpl"} {else} <nav class="acc-year"> <h4>Exercice sélectionné :</h4> <h3>{$year.label} — {$year.start_date|date_short} au {$year.end_date|date_short}</h3> </nav> {/if} {if $account.type} {if $simple && $account::isReversed($account.type)} {include file="acc/_simple_help.tpl" link="?id=%d&simple=0&year=%d"|args:$account.id,$year.id type=$account.type} |
︙ | ︙ | |||
71 72 73 74 75 76 77 | <tr> {if $can_delete} <td class="check"> {input type="checkbox" name="check[]" value=$line.id default=0} </td> {/if} <td class="num"><a href="{$admin_url}acc/transactions/details.php?id={$line.id}">#{$line.id}</a></td> | | | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | <tr> {if $can_delete} <td class="check"> {input type="checkbox" name="check[]" value=$line.id default=0} </td> {/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> {if $simple} <td class="money">{if $line.change > 0}+{else}-{/if}{$line.change|abs|raw|html_money}</td> {else} <td class="money">{$line.debit|raw|html_money}</td> <td class="money">{$line.credit|raw|html_money}</td> {/if} {if isset($line->sum)} |
︙ | ︙ |
Modified src/templates/acc/accounts/reconcile.tpl from [c41d9d4909] to [94c65302b7].
︙ | ︙ | |||
62 63 64 65 66 67 68 | <tbody> {foreach from=$journal item="line"} {if isset($line->sum)} <tr> <td colspan="5"></td> <td class="money">{if $line.sum > 0}-{/if}{$line.sum|abs|raw|html_money:false}</td> <td class="money">{if $line.reconciled_sum > 0}-{/if}{$line.reconciled_sum|abs|raw|html_money}</td> | | | | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | <tbody> {foreach from=$journal item="line"} {if isset($line->sum)} <tr> <td colspan="5"></td> <td class="money">{if $line.sum > 0}-{/if}{$line.sum|abs|raw|html_money:false}</td> <td class="money">{if $line.reconciled_sum > 0}-{/if}{$line.reconciled_sum|abs|raw|html_money}</td> <th>Solde au {$line.date|date_short}</th> <td colspan="2"></td> </tr> {else} <tr> <td class="check"> {input type="checkbox" name="reconcile[%d]"|args:$line.id_line value="1" default=$line.reconciled} </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">{$line.credit|raw|html_money}</td> <td class="money">{$line.debit|raw|html_money}</td> {* Not a bug! Credit/debit is reversed here to reflect the bank statement *} <td class="money">{if $line.running_sum > 0}-{/if}{$line.running_sum|abs|raw|html_money:false}</td> <td class="money">{if $line.reconciled_sum > 0}-{/if}{$line.reconciled_sum|abs|raw|html_money:false}</td> <th>{$line.label}</th> <td>{$line.reference}</td> <td>{$line.line_reference}</td> |
︙ | ︙ |
Modified src/templates/acc/accounts/reconcile_assist.tpl from [03bd2d9406] to [06c3b7fb54].
︙ | ︙ | |||
89 90 91 92 93 94 95 | </thead> <tbody> {foreach from=$lines key="line_id" item="line"} {if isset($line->journal->sum)} <tr> <td colspan="4"></td> <td class="money">{if $line.journal.sum > 0}-{/if}{$line.journal.sum|abs|raw|html_money:false}</td> | | | 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | </thead> <tbody> {foreach from=$lines key="line_id" item="line"} {if isset($line->journal->sum)} <tr> <td colspan="4"></td> <td class="money">{if $line.journal.sum > 0}-{/if}{$line.journal.sum|abs|raw|html_money:false}</td> <th style="text-align: right">Solde au {$line.journal.date|date_short}</th> <td class="separator"></td> <td class="separator"></td> <td colspan="3"></td> </tr> {else} <tr> {if isset($line->journal)} |
︙ | ︙ |
Modified src/templates/acc/accounts/simple.tpl from [1d5d4027d3] to [d31f0ca0e1].
1 2 3 4 5 6 7 | {include file="admin/_head.tpl" title="Suivi : %s"|args:$types[$type] current="acc/simple"} {if empty($year)} {include file="acc/_year_select.tpl"} {else} <nav class="acc-year"> <h4>Exercice sélectionné :</h4> | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | {include file="admin/_head.tpl" title="Suivi : %s"|args:$types[$type] current="acc/simple"} {if empty($year)} {include file="acc/_year_select.tpl"} {else} <nav class="acc-year"> <h4>Exercice sélectionné :</h4> <h3>{$year.label} — {$year.start_date|date_short} au {$year.end_date|date_short}</h3> </nav> {/if} {if Entities\Accounting\Account::isReversed($type)} {include file="acc/_simple_help.tpl" link=null type=$type} {/if} |
︙ | ︙ | |||
30 31 32 33 34 35 36 | {include file="common/dynamic_list_head.tpl"} {foreach from=$list->iterate() item="line"} <tr> <td class="num"><a href="journal.php?id={$line.id_account}">{$line.account}</a></td> <td>{$line.account_label}</td> <td class="num"><a href="{$admin_url}acc/transactions/details.php?id={$line.id}">#{$line.id}</a></td> | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | {include file="common/dynamic_list_head.tpl"} {foreach from=$list->iterate() item="line"} <tr> <td class="num"><a href="journal.php?id={$line.id_account}">{$line.account}</a></td> <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} |
︙ | ︙ |
Modified src/templates/acc/index.tpl from [80251bc79f] to [cd50a72c90].
1 2 3 4 5 | {include file="admin/_head.tpl" title="Comptabilité" current="acc"} {foreach from=$years item="year"} <section class="year-infos"> <h2 class="ruler">{$year.label} — | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 | {include file="admin/_head.tpl" title="Comptabilité" current="acc"} {foreach from=$years item="year"} <section class="year-infos"> <h2 class="ruler">{$year.label} — Du {$year.start_date|date_short} au {$year.end_date|date_short}</h2> <nav class="tabs"> <aside> {linkbutton shape="search" href="!acc/search.php?year=%d"|args:$year.id label="Recherche"} {if $session->canAccess('compta', Membres::DROIT_ADMIN)} {linkbutton shape="upload" href="!acc/years/import.php?year=%d"|args:$year.id label="Import & export"} {/if} |
︙ | ︙ |
Modified src/templates/acc/reports/_header.tpl from [13b871412d] to [c9b9d26764].
︙ | ︙ | |||
16 17 18 19 20 21 22 | <h2>{$config.nom_asso}</h2> {if isset($analytical)} <h3>Projet : {$analytical.label}</h3> {/if} {if isset($year)} <p>Exercice comptable {if $year.closed}clôturé{else}en cours{/if} du | | | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | <h2>{$config.nom_asso}</h2> {if isset($analytical)} <h3>Projet : {$analytical.label}</h3> {/if} {if isset($year)} <p>Exercice comptable {if $year.closed}clôturé{else}en cours{/if} du {$year.start_date|date_short} au {$year.end_date|date_short}, généré le {$close_date|date_short}</p> {/if} <p class="noprint print-btn"> <button onclick="window.print(); return false;" class="icn-btn" data-icon="⎙">Imprimer</button> </p> </div> |
Modified src/templates/acc/reports/_journal.tpl from [21fc8fe8ba] to [37e07b0e8b].
︙ | ︙ | |||
11 12 13 14 15 16 17 | <td>Réf. ligne</td> </tr> </thead> {foreach from=$journal item="transaction"} <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> | | | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | <td>Réf. ligne</td> </tr> </thead> {foreach from=$journal item="transaction"} <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_short}</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|raw|html_money}</td> <td class="money">{$line.credit|raw|html_money}</td> <td>{$line.label}</td> <td>{$line.reference}</td> |
︙ | ︙ |
Modified src/templates/acc/reports/ledger.tpl from [718734f54c] to [58b1dc5251].
︙ | ︙ | |||
34 35 36 37 38 39 40 | </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> | | | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | </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_short}</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> |
︙ | ︙ |
Modified src/templates/acc/transactions/details.tpl from [4c1e9e82c6] to [11abde8f01].
︙ | ︙ | |||
34 35 36 37 38 39 40 | <dd>{$transaction.date|date_fr:'l j F Y (d/m/Y)'}</dd> <dt>Numéro pièce comptable</dt> <dd>{if trim($transaction.reference)}{$transaction.reference}{else}-{/if}</dd> <dt>Exercice</dt> <dd> <a href="{$admin_url}acc/reports/ledger.php?year={$transaction.id_year}">{$tr_year.label}</a> | | | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | <dd>{$transaction.date|date_fr:'l j F Y (d/m/Y)'}</dd> <dt>Numéro pièce comptable</dt> <dd>{if trim($transaction.reference)}{$transaction.reference}{else}-{/if}</dd> <dt>Exercice</dt> <dd> <a href="{$admin_url}acc/reports/ledger.php?year={$transaction.id_year}">{$tr_year.label}</a> | Du {$tr_year.start_date|date_short} au {$tr_year.end_date|date_short} | <strong>{if $tr_year.closed}Clôturé{else}En cours{/if}</strong> </dd> <dt>Écriture créée par</dt> <dd> {if $transaction.id_creator} {if $session->canAccess('compta', Membres::DROIT_ACCES)} |
︙ | ︙ |
Modified src/templates/acc/years/balance.tpl from [a2ea78d7e3] to [4fd7ac96b2].
︙ | ︙ | |||
8 9 10 11 12 13 14 | Cet exercice a déjà des écritures, peut-être avez-vous déjà renseigné la balance d'ouverture ? </p> {/if} <form method="post" action="{$self_url}"> <fieldset> | | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | Cet exercice a déjà des écritures, peut-être avez-vous déjà renseigné la balance d'ouverture ? </p> {/if} <form method="post" action="{$self_url}"> <fieldset> <legend>Exercice : « {$year.label} » du {$year.start_date|date_short} au {$year.end_date|date_short}</legend> {if null === $previous_year} <dl> <dt><label for="f_from_year">Reprendre les soldes de fermeture d'un exercice clôturé</label></dt> <dd> <select id="f_from_year" name="from_year"> <option value="">-- Aucun</option> {foreach from=$years item="year"} <option value="{$year.id}">{$year.label} — {$year.start_date|date_short} au {$year.end_date|date_short}</option> {/foreach} </select> </dd> </dl> {elseif 0 === $previous_year} <p class="alert block">Il n'existe aucun exercice clôturé, il n'est donc pas possible de reprendre une balance de clôture.</p> {else} |
︙ | ︙ |
Modified src/templates/acc/years/close.tpl from [f5e2afd02c] to [a98ff863c3].
︙ | ︙ | |||
11 12 13 14 15 16 17 | </h3> <p class="block alert"> Un exercice clôturé ne peut plus être rouvert ou modifié !<br /> Il ne sera plus possible de modifier ou supprimer les écritures de l'exercice clôturé. </p> <dl> <dt>Début de l'exercice</dt> | | | | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | </h3> <p class="block alert"> Un exercice clôturé ne peut plus être rouvert ou modifié !<br /> Il ne sera plus possible de modifier ou supprimer les écritures de l'exercice clôturé. </p> <dl> <dt>Début de l'exercice</dt> <dd>{$year.start_date|date_short}</dd> <dt>Fin de l'exercice</dt> <dd>{$year.end_date|date_short}</dd> </h3> </fieldset> <p class="help">Les soldes créditeurs ou débiteurs de chaque compte pourront être reportés automatiquement lors de l'ouverture de l'exercice suivant.</p> <p class="submit"> {csrf_field key="acc_years_close_%d"|args:$year.id} {button type="submit" name="close" label="Clôturer" shape="lock" class="main"} </p> </form> {include file="admin/_foot.tpl"} |
Modified src/templates/acc/years/import.tpl from [04e72548a2] to [83c69987e2].
1 2 3 4 | {include file="admin/_head.tpl" title="Importer des écritures" current="acc/years"} <nav class="acc-year"> <h4>Exercice sélectionné :</h4> | | | 1 2 3 4 5 6 7 8 9 10 11 12 | {include file="admin/_head.tpl" title="Importer des écritures" current="acc/years"} <nav class="acc-year"> <h4>Exercice sélectionné :</h4> <h3>{$year.label} — {$year.start_date|date_short} au {$year.end_date|date_short}</h3> </nav> <nav class="tabs"> <ul> <li class="current"><a href="{$admin_url}acc/years/import.php?id={$year.id}">Import</a></li> <li><a href="{$admin_url}acc/years/import.php?id={$year.id}&export=csv">Export journal général - CSV</a></li> <li><a href="{$admin_url}acc/years/import.php?id={$year.id}&export=ods">Export journal général - tableur</a></li> |
︙ | ︙ |
Modified src/templates/acc/years/index.tpl from [ec0beff3de] to [1a1526a67f].
︙ | ︙ | |||
34 35 36 37 38 39 40 | {/if} <dl class="list"> {foreach from=$list item="year"} <dt>{$year.label}</dt> <dd class="desc"> {if $year.closed}Clôturé{else}En cours{/if} | | | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | {/if} <dl class="list"> {foreach from=$list item="year"} <dt>{$year.label}</dt> <dd class="desc"> {if $year.closed}Clôturé{else}En cours{/if} | Du {$year.start_date|date_short} au {$year.end_date|date_short} | <a href="../charts/accounts/?id={$year.id_chart}">Plan comptable</a> </dd> <dd class="desc"> <a href="{$admin_url}acc/reports/graphs.php?year={$year.id}">Graphiques</a> | <a href="{$admin_url}acc/reports/trial_balance.php?year={$year.id}">Balance générale</a> | <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> |
︙ | ︙ |
Modified src/templates/acc/years/select.tpl from [cbf2afad9b] to [e5b2583bf6].
1 2 3 4 5 6 7 8 9 | {include file="admin/_head.tpl" title="Changer d'exercice" current="acc/years"} <form method="post" action="{$self_url}"> <fieldset> <legend>Changer l'exercice de travail</legend> <dl> <dd> <select name="year"> {foreach from=$list item="year"} | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | {include file="admin/_head.tpl" title="Changer d'exercice" current="acc/years"} <form method="post" action="{$self_url}"> <fieldset> <legend>Changer l'exercice de travail</legend> <dl> <dd> <select name="year"> {foreach from=$list item="year"} <option value="{$year.id}">{$year.label} — {$year.start_date|date_short} au {$year.end_date|date_short}</option> {/foreach} </select> </dd> <dd class="help">Ici ne peuvent être sélectionnés que les exercices ouverts, car il n'est pas possible de modifier un exercice clos. Pour consulter les rapports pour les exercices clos, voir <a href="{$www_url}admin/acc/years/">la liste des exercices</a>.</dd> </dl> </fieldset> |
︙ | ︙ |
Modified src/templates/admin/config/donnees/local.tpl from [d068197065] to [b1089b8af9].
︙ | ︙ | |||
29 30 31 32 33 34 35 | <p class="help">Aucune copie de sauvegarde disponible.</p> {else} <dl> <dt><label for="f_select">Sélectionner une sauvegarde</label></dt> <dd> <select name="file" id="f_select"> {foreach from=$liste key="f" item="d"} | | | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | <p class="help">Aucune copie de sauvegarde disponible.</p> {else} <dl> <dt><label for="f_select">Sélectionner une sauvegarde</label></dt> <dd> <select name="file" id="f_select"> {foreach from=$liste key="f" item="d"} <option value="{$f}">{$f} — {$d|date_long}</option> {/foreach} </select> </dd> <dd class="help"> Attention, en cas de restauration, l'intégralité des données courantes seront effacées et remplacées par celles contenues dans la sauvegarde sélectionnée. Cependant, afin de prévenir toute erreur une sauvegarde des données sera réalisée avant la restauration. </dd> |
︙ | ︙ |
Modified src/templates/admin/membres/fiche.tpl from [d0ce672faf] to [4cc42f5c24].
︙ | ︙ | |||
48 49 50 51 52 53 54 | </dl> <aside class="describe"> <dl class="describe"> <dt>Catégorie</dt> <dd>{$categorie.nom} <span class="droits">{format_droits droits=$categorie}</span></dd> <dt>Inscription</dt> | | | | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | </dl> <aside class="describe"> <dl class="describe"> <dt>Catégorie</dt> <dd>{$categorie.nom} <span class="droits">{format_droits droits=$categorie}</span></dd> <dt>Inscription</dt> <dd>{$membre.date_inscription|date_short}</dd> <dt>Dernière connexion</dt> <dd>{if empty($membre.date_connexion)}Jamais{else}{$membre.date_connexion|date_long}{/if}</dd> <dt>Mot de passe</dt> <dd> {if empty($membre.passe)} Pas de mot de passe configuré {else} <b class="icn">☑</b> Oui {if !empty($membre.secret_otp)} |
︙ | ︙ | |||
86 87 88 89 90 91 92 | {if $c == 'email'} {linkbutton href="!membres/message.php?id=%d"|args:$membre.id label="Envoyer un message" shape="mail"} {/if} {elseif $c_config.type == 'tel'} <a href="tel:{$membre->$c}">{$membre->$c|format_tel}</a> {elseif $c_config.type == 'country'} {$membre->$c|get_country_name} | | > > | | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | {if $c == 'email'} {linkbutton href="!membres/message.php?id=%d"|args:$membre.id label="Envoyer un message" shape="mail"} {/if} {elseif $c_config.type == 'tel'} <a href="tel:{$membre->$c}">{$membre->$c|format_tel}</a> {elseif $c_config.type == 'country'} {$membre->$c|get_country_name} {elseif $c_config.type == 'date'} {$membre->$c|date_short} {elseif $c_config.type == 'datetime'} {$membre->$c|date_fr} {elseif $c_config.type == 'password'} ******* {elseif $c_config.type == 'multiple'} <ul> {foreach from=$c_config.options key="b" item="name"} {if $membre->$c & (0x01 << $b)} <li>{$name}</li> |
︙ | ︙ |
Modified src/templates/admin/wiki/historique.tpl from [6cb01437fa] to [ad74fa04e5].
︙ | ︙ | |||
23 24 25 26 27 28 29 | {if $rev.revision == 1} diff {else} <a href="?id={$page.id}&diff={$rev.revision-1}.{$rev.revision}">diff</a> {/if} {/if} </td> | | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | {if $rev.revision == 1} diff {else} <a href="?id={$page.id}&diff={$rev.revision-1}.{$rev.revision}">diff</a> {/if} {/if} </td> <th>{$rev.date|date_long}</th> <td> {if $session->canAccess('membres', Membres::DROIT_ACCES)} <a href="{$admin_url}membres/fiche.php?id={$rev.id_auteur}">{$rev.nom_auteur}</a> {/if} </td> <td class="length"> {$rev.taille} octets |
︙ | ︙ | |||
51 52 53 54 55 56 57 | {/if} </td> </tr> {/foreach} </table> {elseif !empty($diff)} <div class="wikiRevision revisionLeft"> | | | | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | {/if} </td> </tr> {/foreach} </table> {elseif !empty($diff)} <div class="wikiRevision revisionLeft"> <h3>Version du {$rev1.date|date_long}</h3> {if $session->canAccess('membres', Membres::DROIT_ACCES)} <h4>De <a href="{$admin_url}membres/fiche.php?id={$rev1.id_auteur}">{$rev1.nom_auteur}</a></h4> {/if} {if $rev1.modification} <p><em>{$rev1.modification}</em></p> {/if} </div> <div class="wikiRevision revisionRight"> <h3>Version {if $rev2.revision == $page.revision}actuelle en date{/if} du {$rev2.date|date_long}</h3> {if $session->canAccess('membres', Membres::DROIT_ACCES)} <h4>De <a href="{$admin_url}membres/fiche.php?id={$rev2.id_auteur}">{$rev2.nom_auteur}</a></h4> {/if} {if $rev2.modification} <p><em>{$rev2.modification}</em></p> {/if} </div> |
︙ | ︙ |
Modified src/templates/admin/wiki/page.tpl from [1ba42801d7] to [3fdabd965d].
︙ | ︙ | |||
117 118 119 120 121 122 123 | {/foreach} </ul> {/if} </div> {/if} <p class="wikiFooter"> | | | 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 | {/foreach} </ul> {/if} </div> {/if} <p class="wikiFooter"> Dernière modification le {$page.date_modification|date_long} {if $session->canAccess('membres', Membres::DROIT_ACCES)} par <a href="{$admin_url}membres/fiche.php?id={$page.contenu.id_auteur}">{$auteur}</a> {/if} </p> {/if} {/if} {/if} {include file="admin/_foot.tpl"} |
Modified src/templates/admin/wiki/recent.tpl from [fc83e0203d] to [b616432b4b].
1 2 3 4 5 6 7 8 | {include file="admin/_head.tpl" title="Pages modifiées récemment" current="wiki/recent"} {if !empty($list)} <table class="list"> <tbody> {foreach from=$list item="page"} <tr> <th><a href="{$admin_url}wiki/?{$page.uri}">{$page.titre}</a></th> | | | 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="Pages modifiées récemment" current="wiki/recent"} {if !empty($list)} <table class="list"> <tbody> {foreach from=$list item="page"} <tr> <th><a href="{$admin_url}wiki/?{$page.uri}">{$page.titre}</a></th> <td>{$page.date_modification|date_long}</td> </tr> {/foreach} </tbody> </table> {pagination url="?p=[ID]" page=$current_page bypage=$bypage total=$total} {else} <p class="block alert">Pas de modification récente.</p> {/if} {include file="admin/_foot.tpl"} |
Modified src/templates/services/fees/_fee_form.tpl from [18db2693bd] to [298d8730a9].
︙ | ︙ | |||
44 45 46 47 48 49 50 | <p class="error block">Il n'y a aucun exercice ouvert dans la comptabilité, il n'est donc pas possible d'enregistrer les activités dans la comptabilité. Merci de commencer par <a href="{$admin_url}acc/years/new.php">créer un exercice</a>.</p> {else} <dl> <dt><label for="f_id_year">Exercice</label> <b>(obligatoire)</b></dt> <dd> <select id="f_id_year" name="id_year"> {foreach from=$years item="year"} | | | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | <p class="error block">Il n'y a aucun exercice ouvert dans la comptabilité, il n'est donc pas possible d'enregistrer les activités dans la comptabilité. Merci de commencer par <a href="{$admin_url}acc/years/new.php">créer un exercice</a>.</p> {else} <dl> <dt><label for="f_id_year">Exercice</label> <b>(obligatoire)</b></dt> <dd> <select id="f_id_year" name="id_year"> {foreach from=$years item="year"} <option value="{$year.id}">{$year.label} — {$year.start_date|date_short} au {$year.end_date|date_short}</option> {/foreach} </select> </dd> {input type="list" target="acc/charts/accounts/selector.php?targets=%s&year=%d"|args:$targets,$fee.id_year name="account" label="Compte à utiliser" default=$account required=1} </dl> {/if} </fieldset> |
︙ | ︙ |
Modified src/templates/services/fees/details.tpl from [176bc0243b] to [0b08e607ec].
︙ | ︙ | |||
17 18 19 20 21 22 23 | {include file="common/dynamic_list_head.tpl"} {foreach from=$list->iterate() item="row"} <tr> <th><a href="../../membres/fiche.php?id={$row.id_user}">{$row.identity}</a></th> <td>{if $row.paid}<b class="confirm">Oui</b>{else}<b class="error">Non</b>{/if}</td> <td class="money">{$row.paid_amount|raw|money_currency}</td> | | | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | {include file="common/dynamic_list_head.tpl"} {foreach from=$list->iterate() item="row"} <tr> <th><a href="../../membres/fiche.php?id={$row.id_user}">{$row.identity}</a></th> <td>{if $row.paid}<b class="confirm">Oui</b>{else}<b class="error">Non</b>{/if}</td> <td class="money">{$row.paid_amount|raw|money_currency}</td> <td>{$row.date|date_short}</td> <td class="actions"> {linkbutton shape="user" label="Toutes les activités de ce membre" href="!services/user.php?id=%d"|args:$row.id_user} {linkbutton shape="alert" label="Rappels envoyés" href="!services/reminders/user.php?id=%d"|args:$row.id_user} </td> </tr> {/foreach} |
︙ | ︙ |
Modified src/templates/services/index.tpl from [6402957964] to [5f8582b144].
︙ | ︙ | |||
20 21 22 23 24 25 26 | {foreach from=$list item="row"} <tr> <th><a href="fees/?id={$row.id}">{$row.label}</a></th> <td> {if $row.duration} {$row.duration} jours {elseif $row.start_date} | | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | {foreach from=$list item="row"} <tr> <th><a href="fees/?id={$row.id}">{$row.label}</a></th> <td> {if $row.duration} {$row.duration} jours {elseif $row.start_date} du {$row.start_date|date_short} au {$row.end_date|date_short} {else} ponctuelle {/if} </td> <td class="num"><a href="details.php?id={$row.id}">{$row.nb_users_ok}</a></td> <td class="num"><a href="details.php?id={$row.id}&type=expired">{$row.nb_users_expired}</a></td> <td class="num"><a href="details.php?id={$row.id}&type=unpaid">{$row.nb_users_unpaid}</a></td> |
︙ | ︙ |
Modified src/templates/services/reminders/details.tpl from [0fb566d2e1] to [c63967de23].
︙ | ︙ | |||
14 15 16 17 18 19 20 | {include file="common/dynamic_list_head.tpl"} {foreach from=$list->iterate() item="row"} <tr> <th><a href="../../membres/fiche.php?id={$row.id_user}">{$row.identity}</a></th> <td>{$row.email}</td> | | | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | {include file="common/dynamic_list_head.tpl"} {foreach from=$list->iterate() item="row"} <tr> <th><a href="../../membres/fiche.php?id={$row.id_user}">{$row.identity}</a></th> <td>{$row.email}</td> <td>{$row.date|date_short}</td> <td></td> </tr> {/foreach} </tbody> </table> {pagination url=$list->paginationURL() page=$list.page bypage=$list.per_page total=$list->count()} {include file="admin/_foot.tpl"} |