Index: src/VERSION ================================================================== --- src/VERSION +++ src/VERSION @@ -1,1 +1,1 @@ -1.1.0-rc1 +1.1.0-rc2 Index: src/include/lib/Garradin/Accounting/Graph.php ================================================================== --- src/include/lib/Garradin/Accounting/Graph.php +++ src/include/lib/Garradin/Accounting/Graph.php @@ -46,12 +46,12 @@ 'Comptes de tiers' => ['type' => Account::TYPE_THIRD_PARTY], ], ]; const PIE_TYPES = [ - 'revenue' => ['position' => Account::REVENUE], - 'expense' => ['position' => Account::EXPENSE], + '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 Index: src/include/lib/Garradin/Upgrade.php ================================================================== --- src/include/lib/Garradin/Upgrade.php +++ src/include/lib/Garradin/Upgrade.php @@ -89,10 +89,18 @@ // 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(); Index: src/templates/acc/search.tpl ================================================================== --- src/templates/acc/search.tpl +++ src/templates/acc/search.tpl @@ -38,11 +38,11 @@