Overview
| Comment: | Add description in projects |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk | stable |
| Files: | files | file ages | folders |
| SHA1: |
4804b1ad1a08fb8ea8fe69c80ec8a454 |
| User & Date: | bohwaz on 2020-12-07 22:50:43 |
| Other Links: | manifest | tags |
Context
|
2020-12-08
| ||
| 00:58 | Show volunteering accounts differently, mark them in the chart, and allow to select them in advanced transaction creation check-in: b59f477a0f user: bohwaz tags: trunk | |
|
2020-12-07
| ||
| 22:50 | Add description in projects check-in: 4804b1ad1a user: bohwaz tags: trunk, stable | |
| 22:46 | Add script to re-create old categories as projects check-in: 68f063e7fd user: bohwaz tags: trunk | |
Changes
Modified src/include/lib/Garradin/Accounting/Reports.php from [bd1f8f1a69] to [3c67f495cc].
| ︙ | ︙ | |||
60 61 62 63 64 65 66 |
/**
* Return account sums per year or per account
* @param bool $order_year If true will return accounts grouped by year, if false it will return years grouped by account
*/
static public function getAnalyticalSums(bool $by_year = false): \Generator
{
| > | | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 |
/**
* Return account sums per year or per account
* @param bool $order_year If true will return accounts grouped by year, if false it will return years grouped by account
*/
static public function getAnalyticalSums(bool $by_year = false): \Generator
{
$sql = 'SELECT a.label AS account_label, a.description AS account_description, a.id AS id_account,
y.id AS id_year, y.label AS year_label, y.start_date, y.end_date,
SUM(l.credit - l.debit) AS sum, SUM(l.credit) AS credit, SUM(l.debit) AS debit
FROM acc_transactions_lines l
INNER JOIN acc_transactions t ON t.id = l.id_transaction
INNER JOIN acc_accounts a ON a.id = l.id_analytical
INNER JOIN acc_years y ON y.id = t.id_year
GROUP BY %s
ORDER BY %s;';
|
| ︙ | ︙ | |||
103 104 105 106 107 108 109 110 111 112 113 114 115 116 |
$current = null;
}
if (null === $current) {
$current = (object) [
'id' => $by_year ? $row->id_year : $row->id_account,
'label' => $by_year ? $row->year_label : $row->account_label,
'credit' => 0,
'debit' => 0,
'sum' => 0,
'items' => []
];
}
| > | 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 |
$current = null;
}
if (null === $current) {
$current = (object) [
'id' => $by_year ? $row->id_year : $row->id_account,
'label' => $by_year ? $row->year_label : $row->account_label,
'description' => !$by_year ? $row->account_description : null,
'credit' => 0,
'debit' => 0,
'sum' => 0,
'items' => []
];
}
|
| ︙ | ︙ |
Modified src/templates/acc/reports/projects.tpl from [12dd65a4eb] to [097c5f9f39].
| ︙ | ︙ | |||
28 29 30 31 32 33 34 |
<button onclick="window.print(); return false;" class="icn-btn" data-icon="⎙">Imprimer</button>
</p>
</div>
{if !empty($list)}
| | | > | 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 |
<button onclick="window.print(); return false;" class="icn-btn" data-icon="⎙">Imprimer</button>
</p>
</div>
{if !empty($list)}
<table class="list projects">
<thead>
<tr>
<td>Année</td>
<td></td>
<td class="money">Débits</td>
<td class="money">Crédits</td>
<td class="money">Solde</td>
</tr>
</thead>
{foreach from=$list item="parent"}
<tbody>
<tr class="title">
<th colspan="5">
<h2 class="ruler">{$parent.label}</h2>
{if $parent.description}<p class="help">{$parent.description|escape|nl2br}</p>{/if}
</th>
</tr>
{foreach from=$parent.items item="item"}
<tr>
<th>{$item.label}</th>
<td>
<span class="noprint">
|
| ︙ | ︙ |
Modified src/www/admin/static/styles/10-accounting.css from [2779caf5e1] to [c404c68c91].
| ︙ | ︙ | |||
100 101 102 103 104 105 106 |
table.accounts th { font-weight: normal; }
table.accounts .account-level-1 th { font-size: 1.6em; }
table.accounts .account-level-2 th { padding-left: 1em; font-size: 1.3em; }
table.accounts .account-level-3 th { padding-left: 2em; }
table.accounts .account-level-4 th { padding-left: 3em; }
table.accounts .account-level-5 th { padding-left: 4em; }
table.accounts .account-level-6 th { padding-left: 5em; }
| > > | 100 101 102 103 104 105 106 107 108 |
table.accounts th { font-weight: normal; }
table.accounts .account-level-1 th { font-size: 1.6em; }
table.accounts .account-level-2 th { padding-left: 1em; font-size: 1.3em; }
table.accounts .account-level-3 th { padding-left: 2em; }
table.accounts .account-level-4 th { padding-left: 3em; }
table.accounts .account-level-5 th { padding-left: 4em; }
table.accounts .account-level-6 th { padding-left: 5em; }
table.projects tr.title p.help { font-weight: normal; text-align: center; }
|