Overview
Comment: | Fix opening balance accounts |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | next2 |
Files: | files | file ages | folders |
SHA3-256: |
c19ff2948919c3cc72c9330785cc2c04 |
User & Date: | bohwaz on 2022-11-07 20:18:35 |
Other Links: | branch diff | manifest | tags |
Context
2022-11-07
| ||
20:21 | Don't create an opening balance if the appropriation failed check-in: 6822e6c72e user: bohwaz tags: next2 | |
20:18 | Fix opening balance accounts check-in: c19ff29489 user: bohwaz tags: next2 | |
20:08 | Link to all accounts chart page from all accounts year page check-in: ccdca1ba5d user: bohwaz tags: next2 | |
Changes
Modified src/templates/acc/years/balance.tpl from [e51bf24f9d] to [b8b625e850].
︙ | ︙ | |||
77 78 79 80 81 82 83 | <td> {$line.code} — {$line.label} <input type="hidden" name="lines[code][]" value="{$line.code}" /> <input type="hidden" name="lines[label][]" value="{$line.label}" /> </td> {/if} <th> | | | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | <td> {$line.code} — {$line.label} <input type="hidden" name="lines[code][]" value="{$line.code}" /> <input type="hidden" name="lines[label][]" value="{$line.label}" /> </td> {/if} <th> {input type="list" target="!acc/charts/accounts/selector.php?chart=%d"|args:$year.id_chart name="lines[account_selector][]" default=$line.account_selector} </th> <td>{input type="money" name="lines[debit][]" default=$line.debit size=5}</td> <td>{input type="money" name="lines[credit][]" default=$line.credit size=5}</td> <td>{button label="Enlever la ligne" shape="minus" min="1" name="remove_line"}</td> </tr> {/foreach} </tbody> |
︙ | ︙ |
Modified src/www/admin/acc/years/balance.php from [60df387c7b] to [f3a92fc256].
︙ | ︙ | |||
107 108 109 110 111 112 113 | foreach ($lines as $k => &$line) { $line->credit = !$line->is_debt ? abs($line->balance) : 0; $line->debit = $line->is_debt ? abs($line->balance) : 0; if ($chart_change) { if (array_key_exists($line->code, $matching_accounts)) { $acc = $matching_accounts[$line->code]; | | | > < | < < < < | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 | foreach ($lines as $k => &$line) { $line->credit = !$line->is_debt ? abs($line->balance) : 0; $line->debit = $line->is_debt ? abs($line->balance) : 0; if ($chart_change) { if (array_key_exists($line->code, $matching_accounts)) { $acc = $matching_accounts[$line->code]; $line->account_selector = [$acc->id => sprintf('%s — %s', $acc->code, $acc->label)]; } } else { $line->account_selector = $line->id ? [$line->id => sprintf('%s — %s', $line->code, $line->label)] : null; } $line = (array) $line; } unset($line); } if (!empty($_POST['lines']) && is_array($_POST['lines'])) { $lines = Transaction::getFormLines(); } $tpl->assign(compact('lines', 'years', 'chart_change', 'previous_year', 'year_selected', 'year', 'csrf_key')); $tpl->display('acc/years/balance.tpl'); |