Overview
| Comment: | Set selected analytical account in edit form |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | stable |
| Files: | files | file ages | folders |
| SHA1: |
da4fe1bd047de10d98e96af6e09feb91 |
| User & Date: | bohwaz on 2020-12-07 16:17:52 |
| Other Links: | manifest | tags |
Context
|
2020-12-07
| ||
| 16:31 | Add transaction reference to service subscription screen check-in: 586e47221d user: bohwaz tags: stable | |
| 16:17 | Set selected analytical account in edit form check-in: da4fe1bd04 user: bohwaz tags: stable | |
|
2020-12-06
| ||
| 23:05 | Throw user message if the file has already been deleted check-in: d69e17e90d user: bohwaz tags: stable | |
Changes
Modified src/include/lib/Garradin/Entities/Accounting/Transaction.php from [d64763b884] to [acd6868e2d].
| ︙ | ︙ | |||
166 167 168 169 170 171 172 173 174 175 176 177 178 179 |
foreach ($this->getLines() as $line) {
$sum += $line->credit;
}
return $sum;
}
public function getTypesAccounts()
{
if ($this->type == self::TYPE_ADVANCED) {
return [];
}
| > > > > > > > > > > > | 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 |
foreach ($this->getLines() as $line) {
$sum += $line->credit;
}
return $sum;
}
public function getAnalyticalId(): ?int
{
$lines = $this->getLines();
if (!count($lines)) {
return null;
}
return current($lines)->id_analytical;
}
public function getTypesAccounts()
{
if ($this->type == self::TYPE_ADVANCED) {
return [];
}
|
| ︙ | ︙ |
Modified src/templates/acc/transactions/edit.tpl from [e42938496f] to [ca18285ee8].
| ︙ | ︙ | |||
60 61 62 63 64 65 66 |
{input type="list" multiple=true name="users" label="Membres associés" target="membres/selector.php" default=$linked_users}
{input type="textarea" name="notes" label="Remarques" rows=4 cols=30 source=$transaction}
{input type="file" name="file" label="Ajouter un fichier joint"}
</dl>
<dl data-types="all-but-advanced">
{if count($analytical_accounts) > 1}
| | | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 |
{input type="list" multiple=true name="users" label="Membres associés" target="membres/selector.php" default=$linked_users}
{input type="textarea" name="notes" label="Remarques" rows=4 cols=30 source=$transaction}
{input type="file" name="file" label="Ajouter un fichier joint"}
</dl>
<dl data-types="all-but-advanced">
{if count($analytical_accounts) > 1}
{input type="select" name="id_analytical" label="Projet (compte analytique)" options=$analytical_accounts default=$id_analytical}
{/if}
</dl>
</fieldset>
<p class="submit">
{csrf_field key="acc_edit_%d"|args:$transaction.id}
{button type="submit" name="save" label="Enregistrer" shape="right" class="main"}
|
| ︙ | ︙ |
Modified src/www/admin/acc/transactions/edit.php from [4ea18fe075] to [c7a0fc0b35].
| ︙ | ︙ | |||
77 78 79 80 81 82 83 84 85 86 87 88 89 90 |
else {
$lines = $transaction->getLinesWithAccounts();
foreach ($lines as $k => &$line) {
$line->account = [$line->id_account => sprintf('%s — %s', $line->account_code, $line->account_name)];
}
}
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 |
else {
$lines = $transaction->getLinesWithAccounts();
foreach ($lines as $k => &$line) {
$line->account = [$line->id_account => sprintf('%s — %s', $line->account_code, $line->account_name)];
}
}
$id_analytical = null;
if ($transaction->type != Transaction::TYPE_ADVANCED) {
$types_accounts = $transaction->getTypesAccounts();
$id_analytical = $transaction->getAnalyticalId();
}
$amount = $transaction->getLinesCreditSum();
$tpl->assign(compact('transaction', 'lines', 'types_accounts', 'amount', 'id_analytical'));
$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');
|