Move upgrade logic to .16

diff --git a/CRM/Upgrade/Incremental/sql/4.7.15.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.15.mysql.tpl
index aa0c0e6f4cb5186e1249094fcfcfa5c848838b34..4052097c031ad6c9a7c27d1c6ae241fdedf32be3 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.7.15.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.15.mysql.tpl
@@ -2,38 +2,3 @@
 
 -- CRM-19685 (fix for inconsistencies)
 UPDATE civicrm_contact SET preferred_mail_format = 'Both' WHERE preferred_mail_format IS NULL;
-
--- CRM-19723 add icons
-SELECT @option_group_id_act := max(id) from civicrm_option_group where name = 'activity_type';
-UPDATE civicrm_option_value SET icon = 'fa-slideshare' WHERE option_group_id = @option_group_id_act AND name = 'Meeting';
-UPDATE civicrm_option_value SET icon = 'fa-phone' WHERE option_group_id = @option_group_id_act AND name = 'Phone Call';
-UPDATE civicrm_option_value SET icon = 'fa-envelope-o' WHERE option_group_id = @option_group_id_act AND name = 'Email';
-UPDATE civicrm_option_value SET icon = 'fa-mobile' WHERE option_group_id = @option_group_id_act AND name = 'SMS';
-UPDATE civicrm_option_value SET icon = 'fa-file-pdf-o' WHERE option_group_id = @option_group_id_act AND name = 'Print PDF Letter';
-UPDATE civicrm_option_value SET icon = 'fa-folder-open-o' WHERE option_group_id = @option_group_id_act AND name = 'Open Case';
-UPDATE civicrm_option_value SET icon = 'fa-share-square-o' WHERE option_group_id = @option_group_id_act AND name = 'Follow up';
-UPDATE civicrm_option_value SET icon = 'fa-random' WHERE option_group_id = @option_group_id_act AND name = 'Change Case Type';
-UPDATE civicrm_option_value SET icon = 'fa-pencil-square-o' WHERE option_group_id = @option_group_id_act AND name = 'Change Case Status';
-UPDATE civicrm_option_value SET icon = 'fa-calendar' WHERE option_group_id = @option_group_id_act AND name = 'Change Case Start Date';
-UPDATE civicrm_option_value SET icon = 'fa-user-plus' WHERE option_group_id = @option_group_id_act AND name = 'Assign Case Role';
-UPDATE civicrm_option_value SET icon = 'fa-user-times' WHERE option_group_id = @option_group_id_act AND name = 'Remove Case Role';
-UPDATE civicrm_option_value SET icon = 'fa-file-pdf-o' WHERE option_group_id = @option_group_id_act AND name = 'Print PDF Letter';
-UPDATE civicrm_option_value SET icon = 'fa-compress' WHERE option_group_id = @option_group_id_act AND name = 'Merge Case';
-UPDATE civicrm_option_value SET icon = 'fa-user-circle-o' WHERE option_group_id = @option_group_id_act AND name = 'Reassigned Case';
-UPDATE civicrm_option_value SET icon = 'fa-link' WHERE option_group_id = @option_group_id_act AND name = 'Link Cases';
-UPDATE civicrm_option_value SET icon = 'fa-tags' WHERE option_group_id = @option_group_id_act AND name = 'Change Case Tags';
-UPDATE civicrm_option_value SET icon = 'fa-users' WHERE option_group_id = @option_group_id_act AND name = 'Add Client To Case';
-
---  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.16.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.16.mysql.tpl
index 3a0092b85dda67f2ca008531726c0f661880f3f7..dcc26eaf7c935b939a43a610ffd5bc7351ee7412 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.7.16.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.16.mysql.tpl
@@ -25,3 +25,17 @@ UPDATE civicrm_option_value SET icon = 'fa-users' WHERE option_group_id = @optio
 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;