Merge pull request civicrm#9955 from eileenmcnaughton/joe

Towards CRM-19715, Remove Close Accounting Period code
monishdeb · Mar 9, 2017 · c873cda · c873cda
2 parents e51b741 + d228ef7
commit c873cda
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 269 deletions.
diff --git a/CRM/Contribute/Form/CloseAccPeriod.php b/CRM/Contribute/Form/CloseAccPeriod.php
diff --git a/CRM/Contribute/xml/Menu/Contribute.xml b/CRM/Contribute/xml/Menu/Contribute.xml
@@ -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>

diff --git a/CRM/Upgrade/Incremental/sql/4.7.18.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.18.mysql.tpl
@@ -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';
diff --git a/CRM/Upgrade/Incremental/sql/4.7.8.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.8.mysql.tpl
@@ -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);
diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
diff --git a/templates/CRM/Contribute/Form/CloseAccPeriod.tpl b/templates/CRM/Contribute/Form/CloseAccPeriod.tpl
diff --git a/tests/phpunit/WebTest/Contribute/AccrualSettingTest.php b/tests/phpunit/WebTest/Contribute/AccrualSettingTest.php
diff --git a/xml/templates/civicrm_navigation.tpl b/xml/templates/civicrm_navigation.tpl
@@ -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 ),