Move upgrade logic to .19

diff --git a/CRM/Upgrade/Incremental/sql/4.7.16.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.16.mysql.tpl
index dcc26eaf7c935b939a43a610ffd5bc7351ee7412..54ab063979efec469f847378b3571fea200e0f60 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.7.16.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.16.mysql.tpl
@@ -26,16 +26,3 @@ UPDATE `civicrm_dashboard`
   SET name = CONCAT('report/', SUBSTRING_INDEX(SUBSTRING_INDEX(url, '?', 1), '/', -1))
   WHERE name IS NULL AND url LIKE "civicrm/report/instance/%";
 
---  CRM-19517 Disable all price fields and price field options that use disabled fianancial types
-UPDATE civicrm_price_field_value cpfv
-INNER JOIN civicrm_financial_type cft ON cft.id = cpfv.financial_type_id
-SET cpfv.is_active = 0
-WHERE cft.is_active = 0;
-
-UPDATE civicrm_price_field cpf
-LEFT JOIN (SELECT DISTINCT price_field_id AS price_field_id
-  FROM civicrm_price_field_value
-  WHERE is_active = 1) AS price_field
-ON price_field.price_field_id = cpf.id
-SET cpf.is_active = 0
-WHERE price_field.price_field_id IS NULL;

diff --git a/CRM/Upgrade/Incremental/sql/4.7.19.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.19.mysql.tpl
index d6cecd7134f33d205d424610cb204aa979fba692..0b12d05bdcc8b0b55cbc6ad97210831162d449be 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.7.19.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.19.mysql.tpl
@@ -7,3 +7,18 @@ SELECT @close_accounting_period_activity_count := count(id) FROM `civicrm_activi
 -- Delete Close Accounting Period activity type
 DELETE FROM civicrm_option_value 
     WHERE option_group_id = @option_group_id_act AND name = 'Close Accounting Period' AND @close_accounting_period_activity_count = 0;
+
+--  CRM-19517 Disable all price fields and price field options that use disabled fianancial types
+UPDATE civicrm_price_field_value cpfv
+INNER JOIN civicrm_financial_type cft ON cft.id = cpfv.financial_type_id
+SET cpfv.is_active = 0
+WHERE cft.is_active = 0;
+
+UPDATE civicrm_price_field cpf
+LEFT JOIN (SELECT DISTINCT price_field_id AS price_field_id
+  FROM civicrm_price_field_value
+  WHERE is_active = 1) AS price_field
+ON price_field.price_field_id = cpf.id
+SET cpf.is_active = 0
+WHERE price_field.price_field_id IS NULL;
+