From: Pradeep Nayak <pradpnayak@gmail.com>
Date: Mon, 3 Nov 2014 05:31:04 +0000 (+0530)
Subject: -- CRM-15475, changed Cancelled mmebership status to reserved
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c4a02b20b428f79e4c82a3040d791966f3af0a19;p=civicrm-core.git

-- CRM-15475, changed Cancelled mmebership status to reserved

----------------------------------------
* CRM-15475: Fatal error on membership page if membership status 'Cancelled' is disabled
  https://issues.civicrm.org/jira/browse/CRM-15475
---

diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl
index 3a1ea615c4..c7ac9100de 100644
--- a/xml/templates/civicrm_data.tpl
+++ b/xml/templates/civicrm_data.tpl
@@ -1011,7 +1011,7 @@ VALUES
     ('Grace',     '{ts escape="sql"}Grace{/ts}', 'end_date', null, null,'end_date','month', 1, 1, 0, 3, 0, 1, 0),
     ('Expired',   '{ts escape="sql"}Expired{/ts}', 'end_date', 'month', 1, null, null, null, 0, 0, 4, 0, 1, 0),
     ('Pending',   '{ts escape="sql"}Pending{/ts}', 'join_date', null, null,'join_date',null,null, 0, 0, 5, 0, 1, 1),
-    ('Cancelled', '{ts escape="sql"}Cancelled{/ts}', 'join_date', null, null,'join_date',null,null, 0, 0, 6, 0, 1, 0),
+    ('Cancelled', '{ts escape="sql"}Cancelled{/ts}', 'join_date', null, null,'join_date',null,null, 0, 0, 6, 0, 1, 1),
     ('Deceased',  '{ts escape="sql"}Deceased{/ts}', null, null, null, null, null, null, 0, 1, 7, 0, 1, 1);