Overview
Comment: | Add alert message if transaction contains reconciled lines |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
6a2010abeaca4bdbe770a52c0d60cef0 |
User & Date: | bohwaz on 2021-01-04 23:10:34 |
Other Links: | manifest | tags |
Context
2021-01-05
| ||
13:02 | Fix cache update of account list when chart is modified check-in: 4bbae43922 user: bohwaz tags: trunk | |
2021-01-04
| ||
23:10 | Add alert message if transaction contains reconciled lines check-in: 6a2010abea user: bohwaz tags: trunk | |
23:10 | Fix label change check-in: 1fc9ea6f0f user: bohwaz tags: trunk | |
Changes
Modified src/templates/acc/transactions/edit.tpl from [1f373c1d5e] to [9472a8358a].
1 2 3 4 5 6 7 8 9 10 11 | {include file="admin/_head.tpl" title="Modification d'une écriture" current="acc/simple"} <form method="post" action="{$self_url}" enctype="multipart/form-data" data-focus="#f_date"> {form_errors} <fieldset> <legend>Type d'écriture</legend> <dl> {foreach from=$types_details item="type"} <dd class="radio-btn"> {input type="radio" name="type" value=$type.id source=$transaction label=null} | > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | {include file="admin/_head.tpl" title="Modification d'une écriture" current="acc/simple"} <form method="post" action="{$self_url}" enctype="multipart/form-data" data-focus="#f_date"> {form_errors} {if $has_reconciled_lines} <p class="alert block"> Attention, cette écriture contient des lignes qui ont été rapprochées. La modification de cette écriture entraînera la perte du rapprochement. </p> {/if} <fieldset> <legend>Type d'écriture</legend> <dl> {foreach from=$types_details item="type"} <dd class="radio-btn"> {input type="radio" name="type" value=$type.id source=$transaction label=null} |
︙ | ︙ |
Modified src/www/admin/acc/transactions/edit.php from [88e340bd1d] to [7be38ce3db].
︙ | ︙ | |||
77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 | else { $lines = $transaction->getLinesWithAccounts(); foreach ($lines as $k => &$line) { $line->account = [$line->id_account => sprintf('%s — %s', $line->account_code, $line->account_name)]; } } $first_line = $transaction->getFirstLine(); if ($transaction->type != Transaction::TYPE_ADVANCED) { $types_accounts = $transaction->getTypesAccounts(); } $amount = $transaction->getLinesCreditSum(); | > > > > > > > > | | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 | else { $lines = $transaction->getLinesWithAccounts(); foreach ($lines as $k => &$line) { $line->account = [$line->id_account => sprintf('%s — %s', $line->account_code, $line->account_name)]; } } $has_reconciled_lines = true; array_walk($lines, function ($l) use (&$has_reconciled_lines) { if (!empty($line->reconciled)) { $has_reconciled_lines = true; } }); $first_line = $transaction->getFirstLine(); if ($transaction->type != Transaction::TYPE_ADVANCED) { $types_accounts = $transaction->getTypesAccounts(); } $amount = $transaction->getLinesCreditSum(); $tpl->assign(compact('transaction', 'lines', 'types_accounts', 'amount', 'first_line', 'has_reconciled_lines')); $tpl->assign('types_details', Transaction::getTypesDetails()); $tpl->assign('chart_id', $chart->id()); $tpl->assign('analytical_accounts', ['' => '-- Aucun'] + $accounts->listAnalytical()); $tpl->assign('linked_users', $transaction->listLinkedUsersAssoc()); $tpl->display('acc/transactions/edit.tpl'); |