Overview
Comment:Fix year is always current_year
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | dev | 1.0.0-beta8
Files: files | file ages | folders
SHA1: 15ae918267628a1b867b734a66bb2f992e75cd52
User & Date: bohwaz on 2020-11-25 22:27:36
Other Links: branch diff | manifest | tags
Context
2020-11-26
12:18
Fix issues with dates check-in: 7504029753 user: bohwaz tags: dev
2020-11-25
22:27
Fix year is always current_year check-in: 15ae918267 user: bohwaz tags: dev, 1.0.0-beta8
22:26
Fix issues with background check-in: 8bfc828da2 user: bohwaz tags: dev, 1.0.0-beta8
Changes

Modified src/www/admin/acc/accounts/simple.php from [ab194fa77a] to [7dbefa9e3c].

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
<?php
namespace Garradin;

use Garradin\Accounting\Accounts;
use Garradin\Entities\Accounting\Account;

require_once __DIR__ . '/../_inc.php';

if (!CURRENT_YEAR_ID) {
	Utils::redirect(ADMIN_URL . 'acc/years/?msg=OPEN');
}

$year_id = (int) qg('year') ?: CURRENT_YEAR_ID;

if ($year_id === CURRENT_YEAR_ID) {
	$year = $current_year;
}
else {
	$year = Years::get($year_id);

	if (!$year) {
		throw new UserException("L'exercice demandé n'existe pas.");
	}

	$tpl->assign('year', $year);
}

$types = [
	Account::TYPE_REVENUE => 'Recettes',
	Account::TYPE_EXPENSE => 'Dépenses',
	Account::TYPE_BANK => 'Banques',
	Account::TYPE_CASH => 'Caisses',
	Account::TYPE_OUTSTANDING => 'En attente',












<
<
<
|
<
<
<
<
<
<
<
<
<
<







1
2
3
4
5
6
7
8
9
10
11
12



13










14
15
16
17
18
19
20
<?php
namespace Garradin;

use Garradin\Accounting\Accounts;
use Garradin\Entities\Accounting\Account;

require_once __DIR__ . '/../_inc.php';

if (!CURRENT_YEAR_ID) {
	Utils::redirect(ADMIN_URL . 'acc/years/?msg=OPEN');
}




$year = $current_year;











$types = [
	Account::TYPE_REVENUE => 'Recettes',
	Account::TYPE_EXPENSE => 'Dépenses',
	Account::TYPE_BANK => 'Banques',
	Account::TYPE_CASH => 'Caisses',
	Account::TYPE_OUTSTANDING => 'En attente',