Merge pull request #10811 from jitendrapurohit/CRM-20913-sync-inprogress

CRM-20913: Fix inprogress value to match with contribution status
civicrm · Aug 3, 2017 · 540ca2e · 540ca2e
2 parents c1fa35e + 5a54595
commit 540ca2e
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 30 deletions.
diff --git a/CRM/Upgrade/Incremental/sql/4.7.24.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.24.mysql.tpl
@@ -8,5 +8,5 @@ INSERT INTO `civicrm_option_value` (`option_group_id`, {localize field='label'}`
 (@option_group_id_ps, {localize}'{ts escape="sql"}Completed{/ts}'{/localize} , 1, 'Completed', NULL, 1),
 (@option_group_id_ps, {localize}'{ts escape="sql"}Pending{/ts}'{/localize}    , 2, 'Pending', NULL, 2),
 (@option_group_id_ps, {localize}'{ts escape="sql"}Cancelled{/ts}'{/localize}  , 3, 'Cancelled', NULL, 3),
-(@option_group_id_ps, {localize}'{ts escape="sql"}In Progress{/ts}'{/localize}, 4, 'In Progress', NULL, 4),
+(@option_group_id_ps, {localize}'{ts escape="sql"}In Progress{/ts}'{/localize}, 5, 'In Progress', NULL, 4),
 (@option_group_id_ps, {localize}'{ts escape="sql"}Overdue{/ts}'{/localize}    , 6, 'Overdue', NULL, 5);
diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl
@@ -1033,7 +1033,7 @@ VALUES
   (@option_group_id_ps, '{ts escape="sql"}Completed{/ts}'  , 1, 'Completed'  , NULL, 0, NULL, 1, NULL, 0, 1, 1, NULL, NULL, NULL),
   (@option_group_id_ps, '{ts escape="sql"}Pending{/ts}'    , 2, 'Pending'    , NULL, 0, NULL, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
   (@option_group_id_ps, '{ts escape="sql"}Cancelled{/ts}'  , 3, 'Cancelled'  , NULL, 0, NULL, 3, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_ps, '{ts escape="sql"}In Progress{/ts}', 4, 'In Progress', NULL, 0, NULL, 4, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_ps, '{ts escape="sql"}In Progress{/ts}', 5, 'In Progress', NULL, 0, NULL, 4, NULL, 0, 1, 1, NULL, NULL, NULL),
   (@option_group_id_ps, '{ts escape="sql"}Overdue{/ts}'    , 6, 'Overdue'    , NULL, 0, NULL, 5, NULL, 0, 1, 1, NULL, NULL, NULL);
 
 -- financial accounts