Merge pull request #1924 from colemanw/4.4

CRM-13698 - Fix option_value.name to match civivolunteer

CRM/Upgrade/Incremental/php/FourFour.php

@@ -169,8 +169,8 @@ class CRM_Upgrade_Incremental_php_FourFour {
       $insertStatus[] = "(%1, 'Available', %2, 'Available',  NULL, 0, NULL, %3, 0, 0, 1, NULL, NULL)";
       $avinc = $inc = 1;
     }
-    if (!CRM_Core_OptionGroup::getValue('activity_status', 'No-show', 'name')) {
-      $insertStatus[] = "(%1, 'No-show', %4, 'No-show',  NULL, 0, NULL, %5, 0, 0, 1, NULL, NULL)";
+    if (!CRM_Core_OptionGroup::getValue('activity_status', 'No_show', 'name')) {
+      $insertStatus[] = "(%1, 'No-show', %4, 'No_show',  NULL, 0, NULL, %5, 0, 0, 1, NULL, NULL)";
       $nsinc = $inc + 1;
     }
     if (!empty($insertStatus)) {

xml/templates/civicrm_data.tpl

@@ -604,7 +604,7 @@ VALUES
   (@option_group_id_acs, '{ts escape="sql"}Unreachable{/ts}', 5, 'Unreachable', NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL),
   (@option_group_id_acs, '{ts escape="sql"}Not Required{/ts}',  6, 'Not Required',  NULL, 0, NULL, 6, NULL, 0, 0, 1, NULL, NULL),
   (@option_group_id_acs, '{ts escape="sql"}Available{/ts}',  7, 'Available',  NULL, 0, NULL, 7, NULL, 0, 0, 1, NULL, NULL),
-  (@option_group_id_acs, '{ts escape="sql"}No-show{/ts}',  8, 'No-show',  NULL, 0, NULL, 8, NULL, 0, 0, 1, NULL, NULL),
+  (@option_group_id_acs, '{ts escape="sql"}No-show{/ts}',  8, 'No_show',  NULL, 0, NULL, 8, NULL, 0, 0, 1, NULL, NULL),
 
   (@option_group_id_cas, '{ts escape="sql"}Ongoing{/ts}' , 1, 'Open'  ,  'Opened', 0, 1,    1, NULL, 0, 1, 1, NULL, NULL),
   (@option_group_id_cas, '{ts escape="sql"}Resolved{/ts}', 2, 'Closed',  'Closed', 0, NULL, 2, NULL, 0, 1, 1, NULL, NULL),