Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Towards CRM-19715, Remove Close Accounting Period code #9955

Merged
merged 1 commit into from
Mar 9, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 0 additions & 133 deletions CRM/Contribute/Form/CloseAccPeriod.php

This file was deleted.

9 changes: 0 additions & 9 deletions CRM/Contribute/xml/Menu/Contribute.xml
Original file line number Diff line number Diff line change
Expand Up @@ -318,15 +318,6 @@
<weight>630</weight>
<component>CiviContribute</component>
</item>
<item>
<path>civicrm/admin/contribute/closeaccperiod</path>
<title>Close Accounting Period</title>
<page_callback>CRM_Contribute_Form_CloseAccPeriod</page_callback>
<access_arguments>access CiviContribute,administer CiviCRM,administer Accounting</access_arguments>
<page_type>1</page_type>
<weight>640</weight>
<component>CiviContribute</component>
</item>
<item>
<path>civicrm/ajax/softcontributionlist</path>
<page_callback>CRM_Contribute_Page_AJAX::getSoftContributionRows</page_callback>
Expand Down
4 changes: 4 additions & 0 deletions CRM/Upgrade/Incremental/sql/4.7.18.mysql.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,7 @@ UPDATE `civicrm_state_province` SET `name`='Uttarakhand', `abbreviation`='UT' WH
UPDATE `civicrm_state_province` SET `name`='Yunlin County' WHERE `name` = 'Yunlin Conuty';
UPDATE `civicrm_country` SET `name`='Palestine, State of' WHERE `name` = 'Palestinian Territory';
UPDATE `civicrm_country` SET `name`='Virgin Islands, British' WHERE `name` = 'Virgin Islands,British';

--- CRM-19715 Remove Close Accounting Period code - now in an extension.
DELETE FROM civicrm_navigation
WHERE url = 'civicrm/admin/contribute/closeaccperiod?reset=1' AND name = 'Close Accounting Period';
5 changes: 0 additions & 5 deletions CRM/Upgrade/Incremental/sql/4.7.8.mysql.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,3 @@ SELECT @contributionNavId := id, @domainID := domain_id FROM civicrm_navigation
SELECT @navMaxWeight := MAX(ROUND(weight))+1 from civicrm_navigation WHERE parent_id = @contributionNavId;

UPDATE civicrm_navigation SET has_separator = 1 WHERE name = 'Manage Price Sets' AND parent_id = @contributionNavId;

INSERT INTO civicrm_navigation
(domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight)
VALUES
(@domainID, 'civicrm/admin/contribute/closeaccperiod?reset=1', '{ts escape="sql" skip="true"}Close Accounting Period{/ts}', 'Close Accounting Period', 'access CiviContribute,administer CiviCRM,administer Accounting', 'AND', @contributionNavId, '1', NULL, @navMaxWeight);
2 changes: 1 addition & 1 deletion sql/civicrm_generated.mysql

Large diffs are not rendered by default.

34 changes: 0 additions & 34 deletions templates/CRM/Contribute/Form/CloseAccPeriod.tpl

This file was deleted.

86 changes: 0 additions & 86 deletions tests/phpunit/WebTest/Contribute/AccrualSettingTest.php

This file was deleted.

1 change: 0 additions & 1 deletion xml/templates/civicrm_navigation.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ VALUES
( @domainID, 'civicrm/admin/contribute/managePremiums?reset=1', '{ts escape="sql" skip="true"}Premiums (Thank-you Gifts){/ts}', 'Premiums', 'access CiviContribute,administer CiviCRM', 'AND', @contributionlastID, '1', 1, 12 ),
( @domainID, 'civicrm/admin/price?reset=1&action=add', '{ts escape="sql" skip="true"}New Price Set{/ts}', 'New Price Set', 'access CiviContribute,administer CiviCRM', 'AND', @contributionlastID, '1', NULL, 13 ),
( @domainID, 'civicrm/admin/price?reset=1', '{ts escape="sql" skip="true"}Manage Price Sets{/ts}', 'Manage Price Sets', 'access CiviContribute,administer CiviCRM', 'AND', @contributionlastID, '1', 1, 14 ),
( @domainID, 'civicrm/admin/contribute/closeaccperiod?reset=1', '{ts escape="sql" skip="true"}Close Accounting Period{/ts}', 'Close Accounting Period', 'access CiviContribute,administer CiviCRM,administer Accounting', 'AND', @contributionlastID, '1', NULL, 15 ),

( @domainID, 'civicrm/financial/batch?reset=1&action=add', '{ts escape="sql" skip="true"}New Batch{/ts}', 'New Batch', 'create manual batch', 'AND', @financialTransactionID, '1', NULL, 1 ),
( @domainID, 'civicrm/financial/financialbatches?reset=1&batchStatus=1', '{ts escape="sql" skip="true"}Open Batches{/ts}', 'Open Batches', 'view own manual batches,view all manual batches', 'OR', @financialTransactionID, '1', NULL, 2 ),
Expand Down