Overview
Comment:Release 1.1.0-rc2, merge with trunk changes
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | dev | 1.1.0-rc2
Files: files | file ages | folders
SHA3-256: 2766cf833f0fe63ed235de90456d175d3324ae6539e653d7888aa4b69cfd4b70
User & Date: bohwaz on 2021-04-08 10:23:41
Other Links: branch diff | manifest | tags
Context
2021-04-08
11:37
Remove useless config call check-in: da5b2c2db6 user: bohwaz tags: dev
10:23
Release 1.1.0-rc2, merge with trunk changes check-in: 2766cf833f user: bohwaz tags: dev, 1.1.0-rc2
2021-04-07
22:17
Fix FileSystem quota iterator check-in: 2aa74b5e61 user: bohwaz tags: dev
2021-03-25
18:42
New stable release check-in: 598cf1bdc2 user: bohwaz tags: trunk, stable, 1.0.7
Changes

Modified src/VERSION from [4f6f4be3cf] to [c471f5d34b].

1
1.1.0-rc1
|
1
1.1.0-rc2

Modified src/include/lib/Garradin/Accounting/Graph.php from [7ff385bce4] to [af4ec17e7a].

44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
		],
		'debts' => [
			'Comptes de tiers' => ['type' => Account::TYPE_THIRD_PARTY],
		],
	];

	const PIE_TYPES = [
		'revenue' => ['position' => Account::REVENUE],
		'expense' => ['position' => Account::EXPENSE],
		'assets' => ['type' => [Account::TYPE_BANK, Account::TYPE_CASH, Account::TYPE_OUTSTANDING]],
	];

	const WEEKLY_INTERVAL = 604800; // 7 days
	const MONTHLY_INTERVAL = 2635200; // 1 month

	static public function plot(string $type, array $criterias, int $interval = self::WEEKLY_INTERVAL, int $width = 700)







|
|







44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
		],
		'debts' => [
			'Comptes de tiers' => ['type' => Account::TYPE_THIRD_PARTY],
		],
	];

	const PIE_TYPES = [
		'revenue' => ['position' => Account::REVENUE, 'exclude_type' => Account::TYPE_VOLUNTEERING],
		'expense' => ['position' => Account::EXPENSE, 'exclude_type' => Account::TYPE_VOLUNTEERING],
		'assets' => ['type' => [Account::TYPE_BANK, Account::TYPE_CASH, Account::TYPE_OUTSTANDING]],
	];

	const WEEKLY_INTERVAL = 604800; // 7 days
	const MONTHLY_INTERVAL = 2635200; // 1 month

	static public function plot(string $type, array $criterias, int $interval = self::WEEKLY_INTERVAL, int $width = 700)

Modified src/include/lib/Garradin/Upgrade.php from [9dcecc2edd] to [e2ad1a6938].

87
88
89
90
91
92
93








94
95
96
97
98
99
100
			if (version_compare($v, '1.0.6', '<'))
			{
				// Missing trigger
				$db->begin();
				$db->import(ROOT . '/include/data/1.0.6_migration.sql');
				$db->commit();
			}









			if (version_compare($v, '1.1.0-beta1', '<'))
			{
				// Missing trigger
				$db->beginSchemaUpdate();

				$attachments = $db->getAssoc('SELECT f.id, w.uri || \'/\' || f.id || \'_\' || f.nom FROM fichiers f







>
>
>
>
>
>
>
>







87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
			if (version_compare($v, '1.0.6', '<'))
			{
				// Missing trigger
				$db->begin();
				$db->import(ROOT . '/include/data/1.0.6_migration.sql');
				$db->commit();
			}

			if (version_compare($v, '1.0.7', '<'))
			{
				// Missing trigger
				$db->begin();
				$db->import(ROOT . '/include/data/1.0.7_migration.sql');
				$db->commit();
			}

			if (version_compare($v, '1.1.0-beta1', '<'))
			{
				// Missing trigger
				$db->beginSchemaUpdate();

				$attachments = $db->getAssoc('SELECT f.id, w.uri || \'/\' || f.id || \'_\' || f.nom FROM fichiers f

Modified src/templates/acc/search.tpl from [f2a1ec386b] to [7cddfa9ea3].

36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
						</td>
						{else}
						<td>
							{if $key == 'credit' || $key == 'debit'}
								{$value|raw|money:false}
							{elseif $key == 'date'}
								{$value|date_short}
							{elseif null == $value}
								<em>(nul)</em>
							{else}
								{$value}
							{/if}
						</td>
						{/if}
					{/foreach}







|







36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
						</td>
						{else}
						<td>
							{if $key == 'credit' || $key == 'debit'}
								{$value|raw|money:false}
							{elseif $key == 'date'}
								{$value|date_short}
							{elseif null === $value}
								<em>(nul)</em>
							{else}
								{$value}
							{/if}
						</td>
						{/if}
					{/foreach}

Modified src/templates/admin/config/advanced/sql.tpl from [61d73a5581] to [02fdf7334b].

32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
				</tr>
			</thead>
			<tbody>
				{foreach from=$result item="row"}
					<tr>
						{foreach from=$row key="key" item="value"}
							<td>
								{if null == $value}
									<em>NULL</em>
								{else}
									{$value}
								{/if}
							</td>
						{/foreach}
					</tr>







|







32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
				</tr>
			</thead>
			<tbody>
				{foreach from=$result item="row"}
					<tr>
						{foreach from=$row key="key" item="value"}
							<td>
								{if null === $value}
									<em>NULL</em>
								{else}
									{$value}
								{/if}
							</td>
						{/foreach}
					</tr>