Schema - Fix boolean fields in various tables

diff --git a/CRM/ACL/DAO/ACLEntityRole.php b/CRM/ACL/DAO/ACLEntityRole.php
index c99c67b975910ae1fd58fef526c3846e3a03c1d1..5d03b57ff5d4a5baa08a9439cba79dd216a6c15c 100644 (file)
--- a/CRM/ACL/DAO/ACLEntityRole.php
+++ b/CRM/ACL/DAO/ACLEntityRole.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/ACL/ACLEntityRole.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:22633176232bcef28b59ab0388720837)
+ * (GenCodeChecksum:9c4c402f2b82415b38365ed3293e0b26)
  */
 
 /**
@@ -69,7 +69,7 @@ class CRM_ACL_DAO_ACLEntityRole extends CRM_Core_DAO {
   /**
    * Is this property active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -186,7 +186,9 @@ class CRM_ACL_DAO_ACLEntityRole extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('ACL Entity Role is Active'),
           'description' => ts('Is this property active?'),
+          'required' => TRUE,
           'where' => 'civicrm_acl_entity_role.is_active',
+          'default' => '0',
           'table_name' => 'civicrm_acl_entity_role',
           'entity' => 'ACLEntityRole',
           'bao' => 'CRM_ACL_BAO_ACLEntityRole',

diff --git a/CRM/Activity/DAO/Activity.php b/CRM/Activity/DAO/Activity.php
index 516386a36f1a561516cdd6bd06d2cbec18b6b754..4be0a386ce5ddc7fe4ffa73ee88301c0c64f4337 100644 (file)
--- a/CRM/Activity/DAO/Activity.php
+++ b/CRM/Activity/DAO/Activity.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Activity/Activity.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b37cf83d01ce6a8f72be6de97f00d7d3)
+ * (GenCodeChecksum:84bf6ac4a394e07666a4b2fb1456a794)
  */
 
 /**
@@ -174,7 +174,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
   public $parent_id;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -190,7 +190,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
   public $medium_id;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -206,7 +206,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
   public $relationship_id;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -231,7 +231,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
   public $result;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -265,7 +265,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
   /**
    * Activity marked as favorite.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -595,6 +595,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
           'name' => 'is_test',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Test'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_activity.is_test',
           'headerPattern' => '/(is.)?test(.activity)?/i',
@@ -633,6 +634,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
           'name' => 'is_auto',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Auto'),
+          'required' => TRUE,
           'where' => 'civicrm_activity.is_auto',
           'default' => '0',
           'table_name' => 'civicrm_activity',
@@ -662,6 +664,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
           'name' => 'is_current_revision',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is this activity a current revision in versioning chain?'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_activity.is_current_revision',
           'headerPattern' => '/(is.)?(current.)?(revision|version(ing)?)/i',
@@ -708,6 +711,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
           'name' => 'is_deleted',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Activity is in the Trash'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_activity.is_deleted',
           'headerPattern' => '/(activity.)?(trash|deleted)/i',
@@ -785,6 +789,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Starred'),
           'description' => ts('Activity marked as favorite.'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_activity.is_star',
           'headerPattern' => '/(activity.)?(star|favorite)/i',

diff --git a/CRM/Campaign/DAO/Campaign.php b/CRM/Campaign/DAO/Campaign.php
index 99b8489ede0f735759872d617f2f7e8681053059..58250dc3ca6dc428a3cde096d726dda753b1c218 100644 (file)
--- a/CRM/Campaign/DAO/Campaign.php
+++ b/CRM/Campaign/DAO/Campaign.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Campaign/Campaign.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:dab6fdaa9d622daab580b32ae1172bc7)
+ * (GenCodeChecksum:ec15aa356537755e66854f7da660cee2)
  */
 
 /**
@@ -149,7 +149,7 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO {
   /**
    * Is this Campaign enabled or disabled/cancelled?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -464,6 +464,7 @@ class CRM_Campaign_DAO_Campaign extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Campaign Active?'),
           'description' => ts('Is this Campaign enabled or disabled/cancelled?'),
+          'required' => TRUE,
           'where' => 'civicrm_campaign.is_active',
           'default' => '1',
           'table_name' => 'civicrm_campaign',

diff --git a/CRM/Campaign/DAO/Survey.php b/CRM/Campaign/DAO/Survey.php
index 410b6ea81267eaaafad0ff372e9e2cd27e9d4bec..370172d9d27aabca4663ed101011bee93b51d3ac 100644 (file)
--- a/CRM/Campaign/DAO/Survey.php
+++ b/CRM/Campaign/DAO/Survey.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Campaign/Survey.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d0bc187a5dd2297f5c81a7a84460fc17)
+ * (GenCodeChecksum:5a3eaa2d7c9afb84333c3a4601b63ab8)
  */
 
 /**
@@ -129,7 +129,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO {
   /**
    * Is this survey enabled or disabled/cancelled?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -138,7 +138,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO {
   /**
    * Is this default survey?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -192,7 +192,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO {
   /**
    * Bypass the email verification.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -219,7 +219,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO {
   /**
    * Can people share the petition through social media?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -426,6 +426,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Survey Is Active'),
           'description' => ts('Is this survey enabled or disabled/cancelled?'),
+          'required' => TRUE,
           'where' => 'civicrm_survey.is_active',
           'default' => '1',
           'table_name' => 'civicrm_survey',
@@ -439,6 +440,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Default Survey'),
           'description' => ts('Is this default survey?'),
+          'required' => TRUE,
           'where' => 'civicrm_survey.is_default',
           'default' => '0',
           'table_name' => 'civicrm_survey',
@@ -528,6 +530,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('No Email Verification'),
           'description' => ts('Bypass the email verification.'),
+          'required' => TRUE,
           'where' => 'civicrm_survey.bypass_confirm',
           'default' => '0',
           'table_name' => 'civicrm_survey',
@@ -572,6 +575,7 @@ class CRM_Campaign_DAO_Survey extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is shared through social media'),
           'description' => ts('Can people share the petition through social media?'),
+          'required' => TRUE,
           'where' => 'civicrm_survey.is_share',
           'default' => '1',
           'table_name' => 'civicrm_survey',

diff --git a/CRM/Case/DAO/Case.php b/CRM/Case/DAO/Case.php
index 49e5ba56110870951f1de53b9653d007f349e956..55a008310501f65894c7801d51a4e4af26dcf86b 100644 (file)
--- a/CRM/Case/DAO/Case.php
+++ b/CRM/Case/DAO/Case.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Case/Case.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:9255efc8fc0b791899a006e23eb55341)
+ * (GenCodeChecksum:cc7bc9034e7487e1913aa45fc4c119b8)
  */
 
 /**
@@ -109,7 +109,7 @@ class CRM_Case_DAO_Case extends CRM_Core_DAO {
   public $status_id;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -326,6 +326,7 @@ class CRM_Case_DAO_Case extends CRM_Core_DAO {
           'name' => 'is_deleted',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Case is in the Trash'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_case.is_deleted',
           'export' => TRUE,

diff --git a/CRM/Case/DAO/CaseType.php b/CRM/Case/DAO/CaseType.php
index 8b5f4651a4341614b60081bebdb502e43421f018..3fbe29126dbb1cb04da986e0ba7443da79561ae2 100644 (file)
--- a/CRM/Case/DAO/CaseType.php
+++ b/CRM/Case/DAO/CaseType.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Case/CaseType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1102802dc49a9899f93c16fce57fa141)
+ * (GenCodeChecksum:7b3029a4b42f22a060fadb39b7b2c678)
  */
 
 /**
@@ -70,7 +70,7 @@ class CRM_Case_DAO_CaseType extends CRM_Core_DAO {
   /**
    * Is this case type enabled?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -79,7 +79,7 @@ class CRM_Case_DAO_CaseType extends CRM_Core_DAO {
   /**
    * Is this case type a predefined system type?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -195,6 +195,7 @@ class CRM_Case_DAO_CaseType extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Case Type Is Active'),
           'description' => ts('Is this case type enabled?'),
+          'required' => TRUE,
           'where' => 'civicrm_case_type.is_active',
           'default' => '1',
           'table_name' => 'civicrm_case_type',
@@ -208,7 +209,9 @@ class CRM_Case_DAO_CaseType extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Case Type Is Reserved'),
           'description' => ts('Is this case type a predefined system type?'),
+          'required' => TRUE,
           'where' => 'civicrm_case_type.is_reserved',
+          'default' => '0',
           'table_name' => 'civicrm_case_type',
           'entity' => 'CaseType',
           'bao' => 'CRM_Case_BAO_CaseType',

diff --git a/CRM/Contact/DAO/Contact.php b/CRM/Contact/DAO/Contact.php
index 3270f8789b17913f231a7a0d19621ea56d8ec32f..4a327bb4b0f51a2428a2db475ce3ac8b12d930f6 100644 (file)
--- a/CRM/Contact/DAO/Contact.php
+++ b/CRM/Contact/DAO/Contact.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/Contact.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1ed20aff22fc1effbd05ea8411e48139)
+ * (GenCodeChecksum:67196fefde2ec151c97d463869102e21)
  */
 
 /**
@@ -84,35 +84,35 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO {
   public $contact_sub_type;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
   public $do_not_email;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
   public $do_not_phone;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
   public $do_not_mail;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
   public $do_not_sms;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -638,6 +638,7 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO {
           'name' => 'do_not_email',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Do Not Email'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_contact.do_not_email',
           'headerPattern' => '/d(o )?(not )?(email)/i',
@@ -658,6 +659,7 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO {
           'name' => 'do_not_phone',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Do Not Phone'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_contact.do_not_phone',
           'headerPattern' => '/d(o )?(not )?(call|phone)/i',
@@ -678,6 +680,7 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO {
           'name' => 'do_not_mail',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Do Not Mail'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_contact.do_not_mail',
           'headerPattern' => '/^(d(o\s)?n(ot\s)?mail)|(\w*)?bulk\s?(\w*)$/i',
@@ -698,6 +701,7 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO {
           'name' => 'do_not_sms',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Do Not Sms'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_contact.do_not_sms',
           'headerPattern' => '/d(o )?(not )?(sms)/i',
@@ -718,6 +722,7 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO {
           'name' => 'do_not_trade',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Do Not Trade'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_contact.do_not_trade',
           'headerPattern' => '/d(o )?(not )?(trade)/i',

diff --git a/CRM/Contact/DAO/ContactType.php b/CRM/Contact/DAO/ContactType.php
index 00043c7bd969275e1c25baf602a444dffcd18a8a..07b52112416df37fa18cda2845d83e4e93be08cb 100644 (file)
--- a/CRM/Contact/DAO/ContactType.php
+++ b/CRM/Contact/DAO/ContactType.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/ContactType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:9f3dbdc9b75770b084a6f2d6a4dfc652)
+ * (GenCodeChecksum:c2f6858290ecb933caba200b565c69bd)
  */
 
 /**
@@ -96,7 +96,7 @@ class CRM_Contact_DAO_ContactType extends CRM_Core_DAO {
   /**
    * Is this entry active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -105,7 +105,7 @@ class CRM_Contact_DAO_ContactType extends CRM_Core_DAO {
   /**
    * Is this contact type a predefined system type
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -274,6 +274,7 @@ class CRM_Contact_DAO_ContactType extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Contact Type Is Active?'),
           'description' => ts('Is this entry active?'),
+          'required' => TRUE,
           'where' => 'civicrm_contact_type.is_active',
           'default' => '1',
           'table_name' => 'civicrm_contact_type',
@@ -287,6 +288,7 @@ class CRM_Contact_DAO_ContactType extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Contact Type is Reserved?'),
           'description' => ts('Is this contact type a predefined system type'),
+          'required' => TRUE,
           'where' => 'civicrm_contact_type.is_reserved',
           'default' => '0',
           'table_name' => 'civicrm_contact_type',

diff --git a/CRM/Contact/DAO/DashboardContact.php b/CRM/Contact/DAO/DashboardContact.php
index b8881db880a7c021f2acafe1025cf6b7b0792016..fe7aeebb200bf4bad3f5534cf612033f78988f95 100644 (file)
--- a/CRM/Contact/DAO/DashboardContact.php
+++ b/CRM/Contact/DAO/DashboardContact.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/DashboardContact.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:fd3f7ea02b93c0dd3ecd46fb757bc2a3)
+ * (GenCodeChecksum:ca2325df4ca179436e4901bbed693e20)
  */
 
 /**
@@ -67,7 +67,7 @@ class CRM_Contact_DAO_DashboardContact extends CRM_Core_DAO {
   /**
    * Is this widget active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -195,8 +195,9 @@ class CRM_Contact_DAO_DashboardContact extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Dashlet is Active?'),
           'description' => ts('Is this widget active?'),
+          'required' => TRUE,
           'where' => 'civicrm_dashboard_contact.is_active',
-          'default' => '0',
+          'default' => '1',
           'table_name' => 'civicrm_dashboard_contact',
           'entity' => 'DashboardContact',
           'bao' => 'CRM_Contact_BAO_DashboardContact',

diff --git a/CRM/Contact/DAO/Group.php b/CRM/Contact/DAO/Group.php
index 3a2bf933cbff5a1f74a904fc1f87ca716ff8410e..2f203b3f8984052a4d5aba54677f788e7ee334cc 100644 (file)
--- a/CRM/Contact/DAO/Group.php
+++ b/CRM/Contact/DAO/Group.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/Group.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b58b83a311a0a9a7cd2350b452d2ca9a)
+ * (GenCodeChecksum:8b5d08ec2b844a6b9167fa80a590a58c)
  */
 
 /**
@@ -113,7 +113,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO {
   /**
    * Is this entry active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -203,14 +203,14 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO {
   /**
    * Is this group hidden?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
   public $is_hidden;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -395,7 +395,9 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Group Enabled'),
           'description' => ts('Is this entry active?'),
+          'required' => TRUE,
           'where' => 'civicrm_group.is_active',
+          'default' => '1',
           'table_name' => 'civicrm_group',
           'entity' => 'Group',
           'bao' => 'CRM_Contact_BAO_Group',
@@ -544,6 +546,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Group is Hidden'),
           'description' => ts('Is this group hidden?'),
+          'required' => TRUE,
           'where' => 'civicrm_group.is_hidden',
           'default' => '0',
           'table_name' => 'civicrm_group',
@@ -556,6 +559,7 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO {
           'name' => 'is_reserved',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Group is Reserved'),
+          'required' => TRUE,
           'where' => 'civicrm_group.is_reserved',
           'default' => '0',
           'table_name' => 'civicrm_group',

diff --git a/CRM/Contact/DAO/Relationship.php b/CRM/Contact/DAO/Relationship.php
index 0ecfdcf99915ea8e6cd4b77eddd4289956c2214e..ede52c66c60f66d85cf0d7a57e3c4d962f8ff24a 100644 (file)
--- a/CRM/Contact/DAO/Relationship.php
+++ b/CRM/Contact/DAO/Relationship.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/Relationship.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:9857c3a39c853ba7abfeb246af8a70ec)
+ * (GenCodeChecksum:138d23f70bbc1e8c3b1ad2d247e9a8df)
  */
 
 /**
@@ -104,7 +104,7 @@ class CRM_Contact_DAO_Relationship extends CRM_Core_DAO {
   /**
    * is the relationship active ?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -321,6 +321,7 @@ class CRM_Contact_DAO_Relationship extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Relationship Is Active'),
           'description' => ts('is the relationship active ?'),
+          'required' => TRUE,
           'where' => 'civicrm_relationship.is_active',
           'default' => '1',
           'table_name' => 'civicrm_relationship',

diff --git a/CRM/Contact/DAO/RelationshipCache.php b/CRM/Contact/DAO/RelationshipCache.php
index 41044bfeed3b6fda9827e81c69e2aef72204fe47..36fbb031720d8e0101987fd32c9b64f1a5660a3d 100644 (file)
--- a/CRM/Contact/DAO/RelationshipCache.php
+++ b/CRM/Contact/DAO/RelationshipCache.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/RelationshipCache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1bc7c47a01326782645f1cfac11c6d14)
+ * (GenCodeChecksum:637d262d0fe18e30673e5d1b1317e4aa)
  */
 
 /**
@@ -123,7 +123,7 @@ class CRM_Contact_DAO_RelationshipCache extends CRM_Core_DAO {
   /**
    * is the relationship active ?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -358,6 +358,7 @@ class CRM_Contact_DAO_RelationshipCache extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Relationship Is Active'),
           'description' => ts('is the relationship active ?'),
+          'required' => TRUE,
           'where' => 'civicrm_relationship_cache.is_active',
           'default' => '1',
           'table_name' => 'civicrm_relationship_cache',

diff --git a/CRM/Contact/DAO/RelationshipType.php b/CRM/Contact/DAO/RelationshipType.php
index 3bd1a0d80cdac4f68f9f850e446050ad3f9ce421..0104b22e2ecc13754ddfc31be715762e3bf2e3d8 100644 (file)
--- a/CRM/Contact/DAO/RelationshipType.php
+++ b/CRM/Contact/DAO/RelationshipType.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/RelationshipType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b020221ec1e27cbaf4eba0b9457a8448)
+ * (GenCodeChecksum:f420b1007ffa4e74cd3e23e34133f170)
  */
 
 /**
@@ -123,7 +123,7 @@ class CRM_Contact_DAO_RelationshipType extends CRM_Core_DAO {
   /**
    * Is this relationship type a predefined system type (can not be changed or de-activated)?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -132,7 +132,7 @@ class CRM_Contact_DAO_RelationshipType extends CRM_Core_DAO {
   /**
    * Is this relationship type currently active (i.e. can be used when creating or editing relationships)?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -357,7 +357,9 @@ class CRM_Contact_DAO_RelationshipType extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Relationship Type is Reserved'),
           'description' => ts('Is this relationship type a predefined system type (can not be changed or de-activated)?'),
+          'required' => TRUE,
           'where' => 'civicrm_relationship_type.is_reserved',
+          'default' => '0',
           'table_name' => 'civicrm_relationship_type',
           'entity' => 'RelationshipType',
           'bao' => 'CRM_Contact_BAO_RelationshipType',
@@ -372,6 +374,7 @@ class CRM_Contact_DAO_RelationshipType extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Relationship Type is Active'),
           'description' => ts('Is this relationship type currently active (i.e. can be used when creating or editing relationships)?'),
+          'required' => TRUE,
           'where' => 'civicrm_relationship_type.is_active',
           'default' => '1',
           'table_name' => 'civicrm_relationship_type',

diff --git a/CRM/Contribute/DAO/ContributionPage.php b/CRM/Contribute/DAO/ContributionPage.php
index 1efbad0a12d2ec286fc7f0a7c81a34a5b4673c68..803443f7832d8d0ec6e36d56fab758b3dd192de1 100644 (file)
--- a/CRM/Contribute/DAO/ContributionPage.php
+++ b/CRM/Contribute/DAO/ContributionPage.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/ContributionPage.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e33f9a31d9be56f20e20c753313478d1)
+ * (GenCodeChecksum:7419936ebe47d1c999473be6571682e7)
  */
 
 /**
@@ -86,7 +86,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
   /**
    * if true - processing logic must reject transaction at confirmation stage if pay method != credit card
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -95,7 +95,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
   /**
    * if true - allows real-time monetary transactions otherwise non-monetary transactions
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -104,7 +104,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
   /**
    * if true - allows recurring contributions, valid only for PayPal_Standard
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -113,7 +113,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
   /**
    * if false, the confirm page in contribution pages gets skipped
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -131,7 +131,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
   /**
    * if true - supports recurring intervals
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -140,7 +140,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
   /**
    * if true - asks user for recurring installments
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -149,7 +149,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
   /**
    * if true - user is able to adjust payment start date
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -158,7 +158,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
   /**
    * if true - allows the user to send payment directly to the org later
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -221,7 +221,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
   /**
    * if true, page will include an input text field where user can enter their own amount
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -293,7 +293,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
   /**
    * if true, receipt is automatically emailed to contact on success
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -347,7 +347,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
   /**
    * Is this property active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -365,7 +365,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
   /**
    * Is this property active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -428,7 +428,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
   /**
    * Can people share the contribution page through social media?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -437,7 +437,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
   /**
    * if true - billing block is required for online contribution page
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -594,6 +594,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Credit Card Only?'),
           'description' => ts('if true - processing logic must reject transaction at confirmation stage if pay method != credit card'),
+          'required' => TRUE,
           'where' => 'civicrm_contribution_page.is_credit_card_only',
           'default' => '0',
           'table_name' => 'civicrm_contribution_page',
@@ -607,6 +608,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Monetary'),
           'description' => ts('if true - allows real-time monetary transactions otherwise non-monetary transactions'),
+          'required' => TRUE,
           'where' => 'civicrm_contribution_page.is_monetary',
           'default' => '1',
           'table_name' => 'civicrm_contribution_page',
@@ -620,6 +622,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Recurring'),
           'description' => ts('if true - allows recurring contributions, valid only for PayPal_Standard'),
+          'required' => TRUE,
           'where' => 'civicrm_contribution_page.is_recur',
           'default' => '0',
           'table_name' => 'civicrm_contribution_page',
@@ -633,6 +636,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Confirmation Page?'),
           'description' => ts('if false, the confirm page in contribution pages gets skipped'),
+          'required' => TRUE,
           'where' => 'civicrm_contribution_page.is_confirm_enabled',
           'default' => '1',
           'table_name' => 'civicrm_contribution_page',
@@ -669,6 +673,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Support Recurring Intervals'),
           'description' => ts('if true - supports recurring intervals'),
+          'required' => TRUE,
           'where' => 'civicrm_contribution_page.is_recur_interval',
           'default' => '0',
           'table_name' => 'civicrm_contribution_page',
@@ -682,6 +687,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Recurring Installments?'),
           'description' => ts('if true - asks user for recurring installments'),
+          'required' => TRUE,
           'where' => 'civicrm_contribution_page.is_recur_installments',
           'default' => '0',
           'table_name' => 'civicrm_contribution_page',
@@ -695,6 +701,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Adjust Recurring Start Date'),
           'description' => ts('if true - user is able to adjust payment start date'),
+          'required' => TRUE,
           'where' => 'civicrm_contribution_page.adjust_recur_start_date',
           'default' => '0',
           'table_name' => 'civicrm_contribution_page',
@@ -708,6 +715,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Pay Later'),
           'description' => ts('if true - allows the user to send payment directly to the org later'),
+          'required' => TRUE,
           'where' => 'civicrm_contribution_page.is_pay_later',
           'default' => '0',
           'table_name' => 'civicrm_contribution_page',
@@ -809,6 +817,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Allow Other Amounts'),
           'description' => ts('if true, page will include an input text field where user can enter their own amount'),
+          'required' => TRUE,
           'where' => 'civicrm_contribution_page.is_allow_other_amount',
           'default' => '0',
           'table_name' => 'civicrm_contribution_page',
@@ -933,6 +942,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Send email Receipt'),
           'description' => ts('if true, receipt is automatically emailed to contact on success'),
+          'required' => TRUE,
           'where' => 'civicrm_contribution_page.is_email_receipt',
           'default' => '0',
           'table_name' => 'civicrm_contribution_page',
@@ -1019,7 +1029,9 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Page Active?'),
           'description' => ts('Is this property active?'),
+          'required' => TRUE,
           'where' => 'civicrm_contribution_page.is_active',
+          'default' => '1',
           'table_name' => 'civicrm_contribution_page',
           'entity' => 'ContributionPage',
           'bao' => 'CRM_Contribute_BAO_ContributionPage',
@@ -1048,6 +1060,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Amount Block Active?'),
           'description' => ts('Is this property active?'),
+          'required' => TRUE,
           'where' => 'civicrm_contribution_page.amount_block_is_active',
           'default' => '1',
           'table_name' => 'civicrm_contribution_page',
@@ -1164,6 +1177,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Contribution Page Shared?'),
           'description' => ts('Can people share the contribution page through social media?'),
+          'required' => TRUE,
           'where' => 'civicrm_contribution_page.is_share',
           'default' => '1',
           'table_name' => 'civicrm_contribution_page',
@@ -1177,6 +1191,7 @@ class CRM_Contribute_DAO_ContributionPage extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is billing block required'),
           'description' => ts('if true - billing block is required for online contribution page'),
+          'required' => TRUE,
           'where' => 'civicrm_contribution_page.is_billing_required',
           'default' => '0',
           'table_name' => 'civicrm_contribution_page',

diff --git a/CRM/Contribute/DAO/ContributionRecur.php b/CRM/Contribute/DAO/ContributionRecur.php
index 2806acb2d8b64fad4e80040b0a9fba5c2c7ec8e1..7ac2191332f9a95488a8992f54a8bafa92269f39 100644 (file)
--- a/CRM/Contribute/DAO/ContributionRecur.php
+++ b/CRM/Contribute/DAO/ContributionRecur.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/ContributionRecur.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6dcf9956d80db83ef6e3d871c1b973d0)
+ * (GenCodeChecksum:caadace3dd39c9bcc5f340bd9ff4da95)
  */
 
 /**
@@ -192,7 +192,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
   public $contribution_status_id;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -282,7 +282,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
   /**
    * if true, receipt is automatically emailed to contact on each successful payment
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -667,6 +667,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
           'name' => 'is_test',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Test'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_contribution_recur.is_test',
           'export' => TRUE,
@@ -859,6 +860,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Send email Receipt?'),
           'description' => ts('if true, receipt is automatically emailed to contact on each successful payment'),
+          'required' => TRUE,
           'where' => 'civicrm_contribution_recur.is_email_receipt',
           'default' => '1',
           'table_name' => 'civicrm_contribution_recur',

diff --git a/CRM/Contribute/DAO/ContributionSoft.php b/CRM/Contribute/DAO/ContributionSoft.php
index 5db113938a02761146f3567611ed9f43cfb9b8b4..98294b9d6cf7d65192073806255175f7f3e8ebad 100644 (file)
--- a/CRM/Contribute/DAO/ContributionSoft.php
+++ b/CRM/Contribute/DAO/ContributionSoft.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/ContributionSoft.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:78899ec4310e1facc05fdb11cfac1432)
+ * (GenCodeChecksum:9d890f5a0f0efc24ce1adaf5c84ac54e)
  */
 
 /**
@@ -86,7 +86,7 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO {
   public $pcp_id;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -287,6 +287,7 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO {
           'name' => 'pcp_display_in_roll',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Soft Contribution Display on PCP'),
+          'required' => TRUE,
           'where' => 'civicrm_contribution_soft.pcp_display_in_roll',
           'default' => '0',
           'table_name' => 'civicrm_contribution_soft',

diff --git a/CRM/Contribute/DAO/Premium.php b/CRM/Contribute/DAO/Premium.php
index 803ac3598f4eca500001ee89cc9d5e1aa48af17c..437a2e22b73ed863d015ec360d387c8eb5e771cf 100644 (file)
--- a/CRM/Contribute/DAO/Premium.php
+++ b/CRM/Contribute/DAO/Premium.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/Premium.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a458d7c03a26386d799d9d69db691051)
+ * (GenCodeChecksum:4fc24f46e0da197aafb4399dd0965aa4)
  */
 
 /**
@@ -283,6 +283,7 @@ class CRM_Contribute_DAO_Premium extends CRM_Core_DAO {
           'description' => ts('Boolean. Should we automatically display minimum contribution amount text after the premium descriptions.'),
           'required' => TRUE,
           'where' => 'civicrm_premiums.premiums_display_min_contribution',
+          'default' => '0',
           'table_name' => 'civicrm_premiums',
           'entity' => 'Premium',
           'bao' => 'CRM_Contribute_BAO_Premium',

diff --git a/CRM/Contribute/DAO/Widget.php b/CRM/Contribute/DAO/Widget.php
index c2d381e35ca6eed8a9dddf71fb3b57faced600d5..3881be8636e372c6eded705d8f8227597bd003c5 100644 (file)
--- a/CRM/Contribute/DAO/Widget.php
+++ b/CRM/Contribute/DAO/Widget.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/Widget.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4148353263bb1ae6e21aff61b94cc701)
+ * (GenCodeChecksum:8327209557468328fd4ec358866fdab0)
  */
 
 /**
@@ -52,7 +52,7 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO {
   /**
    * Is this property active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -245,7 +245,9 @@ class CRM_Contribute_DAO_Widget extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Enabled?'),
           'description' => ts('Is this property active?'),
+          'required' => TRUE,
           'where' => 'civicrm_contribution_widget.is_active',
+          'default' => '1',
           'table_name' => 'civicrm_contribution_widget',
           'entity' => 'Widget',
           'bao' => 'CRM_Contribute_BAO_Widget',

diff --git a/CRM/Core/DAO/ActionLog.php b/CRM/Core/DAO/ActionLog.php
index 94ab9bdc8f1327532a7ebd49191a8b2fd78b2fef..21c4ba8b8c0e8c9ab76a878eb167fa048901f226 100644 (file)
--- a/CRM/Core/DAO/ActionLog.php
+++ b/CRM/Core/DAO/ActionLog.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/ActionLog.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:5437b79ba43089ace75ed2e072e7677e)
+ * (GenCodeChecksum:f3a6da0a3e4c1c9601265c8ad6eb85f4)
  */
 
 /**
@@ -85,7 +85,7 @@ class CRM_Core_DAO_ActionLog extends CRM_Core_DAO {
   /**
    * Was there any error sending the reminder?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -254,6 +254,7 @@ class CRM_Core_DAO_ActionLog extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Error?'),
           'description' => ts('Was there any error sending the reminder?'),
+          'required' => TRUE,
           'where' => 'civicrm_action_log.is_error',
           'default' => '0',
           'table_name' => 'civicrm_action_log',

diff --git a/CRM/Core/DAO/ActionSchedule.php b/CRM/Core/DAO/ActionSchedule.php
index 8a01d1a99f4554840cb6f3c0b9cc95821e93231c..cd58cfb12d447ea6b14c552adbdbbe95ae7b63dd 100644 (file)
--- a/CRM/Core/DAO/ActionSchedule.php
+++ b/CRM/Core/DAO/ActionSchedule.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/ActionSchedule.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ea596948c02894437bcc1a3f5b5c4f9d)
+ * (GenCodeChecksum:444acdd7b222ed9f593b0b84aebfb763)
  */
 
 /**
@@ -67,7 +67,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO {
   /**
    * Is this the recipient criteria limited to OR in addition to?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -128,7 +128,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO {
   public $start_action_date;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -191,7 +191,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO {
   /**
    * Is this option active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -254,7 +254,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO {
   /**
    * Record Activity for this reminder?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -512,7 +512,9 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Limit To'),
           'description' => ts('Is this the recipient criteria limited to OR in addition to?'),
+          'required' => TRUE,
           'where' => 'civicrm_action_schedule.limit_to',
+          'default' => '1',
           'table_name' => 'civicrm_action_schedule',
           'entity' => 'ActionSchedule',
           'bao' => 'CRM_Core_BAO_ActionSchedule',
@@ -633,6 +635,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO {
           'name' => 'is_repeat',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Repeat?'),
+          'required' => TRUE,
           'where' => 'civicrm_action_schedule.is_repeat',
           'default' => '0',
           'table_name' => 'civicrm_action_schedule',
@@ -754,6 +757,7 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Schedule is Active?'),
           'description' => ts('Is this option active?'),
+          'required' => TRUE,
           'where' => 'civicrm_action_schedule.is_active',
           'default' => '1',
           'table_name' => 'civicrm_action_schedule',
@@ -846,8 +850,9 @@ class CRM_Core_DAO_ActionSchedule extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Record Activity for Reminder?'),
           'description' => ts('Record Activity for this reminder?'),
+          'required' => TRUE,
           'where' => 'civicrm_action_schedule.record_activity',
-          'default' => NULL,
+          'default' => '0',
           'table_name' => 'civicrm_action_schedule',
           'entity' => 'ActionSchedule',
           'bao' => 'CRM_Core_BAO_ActionSchedule',

diff --git a/CRM/Core/DAO/Address.php b/CRM/Core/DAO/Address.php
index d0ab74783ce975800eadf5c20697c130e07ff715..95ed9717b7d5d6252d5380ccab9abbfbcaf4c10d 100644 (file)
--- a/CRM/Core/DAO/Address.php
+++ b/CRM/Core/DAO/Address.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Address.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:80a3c43c953f8fe1ddb7ac96cd926139)
+ * (GenCodeChecksum:63f758987eb3ff9fb47750eddb1a9ee8)
  */
 
 /**
@@ -67,7 +67,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO {
   /**
    * Is this the primary address.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -76,7 +76,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO {
   /**
    * Is this the billing address.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -267,7 +267,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO {
   /**
    * Is this a manually entered geo code
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -402,6 +402,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Primary address'),
           'description' => ts('Is this the primary address.'),
+          'required' => TRUE,
           'where' => 'civicrm_address.is_primary',
           'default' => '0',
           'table_name' => 'civicrm_address',
@@ -418,6 +419,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Billing Address'),
           'description' => ts('Is this the billing address.'),
+          'required' => TRUE,
           'where' => 'civicrm_address.is_billing',
           'default' => '0',
           'table_name' => 'civicrm_address',
@@ -828,6 +830,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Manually Geocoded'),
           'description' => ts('Is this a manually entered geo code'),
+          'required' => TRUE,
           'where' => 'civicrm_address.manual_geo_code',
           'export' => TRUE,
           'default' => '0',

diff --git a/CRM/Core/DAO/Country.php b/CRM/Core/DAO/Country.php
index dff3a8146c761cbb45135bc33840ce10dc45472d..d6cd9d5503c90931892d9aa1986a0a57e702e565 100644 (file)
--- a/CRM/Core/DAO/Country.php
+++ b/CRM/Core/DAO/Country.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Country.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:7798fb6aea4643dd3f7189981c641012)
+ * (GenCodeChecksum:27aa4dca6a02c9e3827feff015f759fe)
  */
 
 /**
@@ -112,7 +112,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO {
   /**
    * Should state/province be displayed as abbreviation for contacts from this country?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -121,7 +121,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO {
   /**
    * Is this Country active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -304,6 +304,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Abbreviate Province?'),
           'description' => ts('Should state/province be displayed as abbreviation for contacts from this country?'),
+          'required' => TRUE,
           'where' => 'civicrm_country.is_province_abbreviated',
           'default' => '0',
           'table_name' => 'civicrm_country',
@@ -317,6 +318,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Country Is Active'),
           'description' => ts('Is this Country active?'),
+          'required' => TRUE,
           'where' => 'civicrm_country.is_active',
           'default' => '1',
           'table_name' => 'civicrm_country',

diff --git a/CRM/Core/DAO/County.php b/CRM/Core/DAO/County.php
index d1f5bb8873b1b9fab6f832d37eec6b1597cbaeef..72415042c8eb81591a41977f41446ed2f628a5e7 100644 (file)
--- a/CRM/Core/DAO/County.php
+++ b/CRM/Core/DAO/County.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/County.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:5a261e24e77bb54854f782628a13dbf6)
+ * (GenCodeChecksum:3b5b06caf78948fe6bbbafe831c2aa96)
  */
 
 /**
@@ -76,7 +76,7 @@ class CRM_Core_DAO_County extends CRM_Core_DAO {
   /**
    * Is this County active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -200,6 +200,7 @@ class CRM_Core_DAO_County extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('County Is Active'),
           'description' => ts('Is this County active?'),
+          'required' => TRUE,
           'where' => 'civicrm_county.is_active',
           'default' => '1',
           'table_name' => 'civicrm_county',

diff --git a/CRM/Core/DAO/CustomField.php b/CRM/Core/DAO/CustomField.php
index 4132455e1aafc5a50071d07741598bf74e17dbe7..a74d5a950ae0008354dfbdf3fd5d532f1347c015 100644 (file)
--- a/CRM/Core/DAO/CustomField.php
+++ b/CRM/Core/DAO/CustomField.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/CustomField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:3af9363de85802021c314ddb8d443848)
+ * (GenCodeChecksum:52ca62aae191d0b8f9ec8bf5ad5595d1)
  */
 
 /**
@@ -116,7 +116,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO {
   /**
    * Is a value required for this property.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -125,7 +125,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO {
   /**
    * Is this property searchable.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -134,7 +134,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO {
   /**
    * Is this property range searchable.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -206,7 +206,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO {
   /**
    * Is this property set by PHP Code? A code field is viewable but not editable
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -323,7 +323,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO {
   /**
    * Should the multi-record custom field values be displayed in tab table listing
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -503,6 +503,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Custom Field Is Required?'),
           'description' => ts('Is a value required for this property.'),
+          'required' => TRUE,
           'where' => 'civicrm_custom_field.is_required',
           'default' => '0',
           'table_name' => 'civicrm_custom_field',
@@ -516,6 +517,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Allow Searching on Field?'),
           'description' => ts('Is this property searchable.'),
+          'required' => TRUE,
           'where' => 'civicrm_custom_field.is_searchable',
           'default' => '0',
           'table_name' => 'civicrm_custom_field',
@@ -529,6 +531,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Search as a Range'),
           'description' => ts('Is this property range searchable.'),
+          'required' => TRUE,
           'where' => 'civicrm_custom_field.is_search_range',
           'default' => '0',
           'table_name' => 'civicrm_custom_field',
@@ -635,6 +638,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Field is Viewable'),
           'description' => ts('Is this property set by PHP Code? A code field is viewable but not editable'),
+          'required' => TRUE,
           'where' => 'civicrm_custom_field.is_view',
           'default' => '0',
           'table_name' => 'civicrm_custom_field',
@@ -818,6 +822,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Field Display'),
           'description' => ts('Should the multi-record custom field values be displayed in tab table listing'),
+          'required' => TRUE,
           'where' => 'civicrm_custom_field.in_selector',
           'default' => '0',
           'table_name' => 'civicrm_custom_field',

diff --git a/CRM/Core/DAO/CustomGroup.php b/CRM/Core/DAO/CustomGroup.php
index 41f78998d694180f4e455acf7dc92bc74eea4916..55448549ca8c6b2e67caba4f1ee1ff22128f0b73 100644 (file)
--- a/CRM/Core/DAO/CustomGroup.php
+++ b/CRM/Core/DAO/CustomGroup.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/CustomGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:979bca796163b9af253a7860d9d4a01d)
+ * (GenCodeChecksum:65d78bdab80228a63775214faab08ee0)
  */
 
 /**
@@ -115,7 +115,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO {
   /**
    * Will this group be in collapsed or expanded mode on initial display ?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -151,7 +151,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO {
   /**
    * Is this property active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -169,7 +169,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO {
   /**
    * Does this group hold multiple values?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -196,7 +196,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO {
   /**
    * Will this group be in collapsed or expanded mode on advanced search display ?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -223,7 +223,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO {
   /**
    * Is this a reserved Custom Group?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -232,7 +232,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO {
   /**
    * Is this property public?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -412,6 +412,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Collapse Custom Group?'),
           'description' => ts('Will this group be in collapsed or expanded mode on initial display ?'),
+          'required' => TRUE,
           'where' => 'civicrm_custom_group.collapse_display',
           'default' => '0',
           'table_name' => 'civicrm_custom_group',
@@ -473,6 +474,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Custom Group Is Active?'),
           'description' => ts('Is this property active?'),
+          'required' => TRUE,
           'where' => 'civicrm_custom_group.is_active',
           'default' => '1',
           'table_name' => 'civicrm_custom_group',
@@ -504,6 +506,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Supports Multiple Records'),
           'description' => ts('Does this group hold multiple values?'),
+          'required' => TRUE,
           'where' => 'civicrm_custom_group.is_multiple',
           'default' => '0',
           'table_name' => 'civicrm_custom_group',
@@ -541,6 +544,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Collapse Group Display'),
           'description' => ts('Will this group be in collapsed or expanded mode on advanced search display ?'),
+          'required' => TRUE,
           'where' => 'civicrm_custom_group.collapse_adv_display',
           'default' => '0',
           'table_name' => 'civicrm_custom_group',
@@ -582,6 +586,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Reserved Group?'),
           'description' => ts('Is this a reserved Custom Group?'),
+          'required' => TRUE,
           'where' => 'civicrm_custom_group.is_reserved',
           'default' => '0',
           'table_name' => 'civicrm_custom_group',
@@ -595,6 +600,7 @@ class CRM_Core_DAO_CustomGroup extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Custom Group Is Public?'),
           'description' => ts('Is this property public?'),
+          'required' => TRUE,
           'where' => 'civicrm_custom_group.is_public',
           'default' => '1',
           'table_name' => 'civicrm_custom_group',

diff --git a/CRM/Core/DAO/Dashboard.php b/CRM/Core/DAO/Dashboard.php
index 6121094d5ec534d5a61b96c3623e2efaced78779..d1cb04ef75c5d1c65b0b445823497b4c9775fbf4 100644 (file)
--- a/CRM/Core/DAO/Dashboard.php
+++ b/CRM/Core/DAO/Dashboard.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Dashboard.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c93931e695d897a5f4ad92e388748424)
+ * (GenCodeChecksum:35f8b4725d70d269c6c23ed8f7e2b47d)
  */
 
 /**
@@ -103,7 +103,7 @@ class CRM_Core_DAO_Dashboard extends CRM_Core_DAO {
   /**
    * Is this dashlet active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -112,7 +112,7 @@ class CRM_Core_DAO_Dashboard extends CRM_Core_DAO {
   /**
    * Is this dashlet reserved?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -308,6 +308,7 @@ class CRM_Core_DAO_Dashboard extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Dashlet Active?'),
           'description' => ts('Is this dashlet active?'),
+          'required' => TRUE,
           'where' => 'civicrm_dashboard.is_active',
           'default' => '0',
           'table_name' => 'civicrm_dashboard',
@@ -321,6 +322,7 @@ class CRM_Core_DAO_Dashboard extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Dashlet Reserved?'),
           'description' => ts('Is this dashlet reserved?'),
+          'required' => TRUE,
           'where' => 'civicrm_dashboard.is_reserved',
           'default' => '0',
           'table_name' => 'civicrm_dashboard',

diff --git a/CRM/Core/DAO/Email.php b/CRM/Core/DAO/Email.php
index 739ea4b1646831b922eb481553b430db18b60856..082c77f910250deae123510aa5eab81c3b04ba3d 100644 (file)
--- a/CRM/Core/DAO/Email.php
+++ b/CRM/Core/DAO/Email.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Email.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:2a48ebd09a4f1de290856c1e7315ce69)
+ * (GenCodeChecksum:58fe115e0962f83c3906bce5f663f0fc)
  */
 
 /**
@@ -83,7 +83,7 @@ class CRM_Core_DAO_Email extends CRM_Core_DAO {
   /**
    * Is this the primary email address
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -92,7 +92,7 @@ class CRM_Core_DAO_Email extends CRM_Core_DAO {
   /**
    * Is this the billing?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -273,6 +273,7 @@ class CRM_Core_DAO_Email extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Primary email'),
           'description' => ts('Is this the primary email address'),
+          'required' => TRUE,
           'where' => 'civicrm_email.is_primary',
           'default' => '0',
           'table_name' => 'civicrm_email',
@@ -289,6 +290,7 @@ class CRM_Core_DAO_Email extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Billing Email?'),
           'description' => ts('Is this the billing?'),
+          'required' => TRUE,
           'where' => 'civicrm_email.is_billing',
           'default' => '0',
           'table_name' => 'civicrm_email',

diff --git a/CRM/Core/DAO/IM.php b/CRM/Core/DAO/IM.php
index 1547662bf95bba4aa48adf534acac07bdf0ec54d..3d193b22b28c93b6f35032295c29b31a029d67d2 100644 (file)
--- a/CRM/Core/DAO/IM.php
+++ b/CRM/Core/DAO/IM.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/IM.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:830e0ccbcdcfe1769330d4cfb39f3285)
+ * (GenCodeChecksum:aa43f28e70d1de3571aa1775f71d7990)
  */
 
 /**
@@ -92,7 +92,7 @@ class CRM_Core_DAO_IM extends CRM_Core_DAO {
   /**
    * Is this the primary IM for this contact and location.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -101,7 +101,7 @@ class CRM_Core_DAO_IM extends CRM_Core_DAO {
   /**
    * Is this the billing?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -246,6 +246,7 @@ class CRM_Core_DAO_IM extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Primary IM'),
           'description' => ts('Is this the primary IM for this contact and location.'),
+          'required' => TRUE,
           'where' => 'civicrm_im.is_primary',
           'default' => '0',
           'table_name' => 'civicrm_im',
@@ -262,6 +263,7 @@ class CRM_Core_DAO_IM extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is IM Billing?'),
           'description' => ts('Is this the billing?'),
+          'required' => TRUE,
           'where' => 'civicrm_im.is_billing',
           'default' => '0',
           'table_name' => 'civicrm_im',

diff --git a/CRM/Core/DAO/Job.php b/CRM/Core/DAO/Job.php
index 65d35198052f009737ca86d6474672d343e88737..6ba4e72cc3a790ea5ada2d8e7bde91de64a02556 100644 (file)
--- a/CRM/Core/DAO/Job.php
+++ b/CRM/Core/DAO/Job.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Job.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:75ec772bec625c1d315df0abadd2fca6)
+ * (GenCodeChecksum:48dcb79d3068aa6d0a994054b84658fe)
  */
 
 /**
@@ -123,7 +123,7 @@ class CRM_Core_DAO_Job extends CRM_Core_DAO {
   /**
    * Is this job active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -342,7 +342,9 @@ class CRM_Core_DAO_Job extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Job Is Active?'),
           'description' => ts('Is this job active?'),
+          'required' => TRUE,
           'where' => 'civicrm_job.is_active',
+          'default' => '1',
           'table_name' => 'civicrm_job',
           'entity' => 'Job',
           'bao' => 'CRM_Core_BAO_Job',

diff --git a/CRM/Core/DAO/MailSettings.php b/CRM/Core/DAO/MailSettings.php
index 206ce6c08644730f268a9724a940d88518553a12..635828f78f7431aac8c3c87d24748532b237a4e9 100644 (file)
--- a/CRM/Core/DAO/MailSettings.php
+++ b/CRM/Core/DAO/MailSettings.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/MailSettings.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d0b9b61f890ea3ff893f8d4e03d0afcd)
+ * (GenCodeChecksum:d31cb841b4c5f88a27dacae0ab50a618)
  */
 
 /**
@@ -60,7 +60,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
   /**
    * whether this is the default set of settings for this domain
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -141,7 +141,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
   /**
    * whether to use SSL or not
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -168,14 +168,14 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
   /**
    * Enabling this option will have CiviCRM skip any emails that do not have the Case ID or Case Hash so that the system will only process emails that can be placed on case records. Any emails that are not processed will be moved to the ignored folder.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
   public $is_non_case_email_skipped;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -280,7 +280,9 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Default Mail Settings?'),
           'description' => ts('whether this is the default set of settings for this domain'),
+          'required' => TRUE,
           'where' => 'civicrm_mail_settings.is_default',
+          'default' => '0',
           'table_name' => 'civicrm_mail_settings',
           'entity' => 'MailSettings',
           'bao' => 'CRM_Core_BAO_MailSettings',
@@ -409,7 +411,9 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Mail Account Uses SSL'),
           'description' => ts('whether to use SSL or not'),
+          'required' => TRUE,
           'where' => 'civicrm_mail_settings.is_ssl',
+          'default' => '0',
           'table_name' => 'civicrm_mail_settings',
           'entity' => 'MailSettings',
           'bao' => 'CRM_Core_BAO_MailSettings',
@@ -457,6 +461,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Skip emails which do not have a Case ID or Case hash'),
           'description' => ts('Enabling this option will have CiviCRM skip any emails that do not have the Case ID or Case Hash so that the system will only process emails that can be placed on case records. Any emails that are not processed will be moved to the ignored folder.'),
+          'required' => TRUE,
           'where' => 'civicrm_mail_settings.is_non_case_email_skipped',
           'default' => '0',
           'table_name' => 'civicrm_mail_settings',
@@ -472,6 +477,7 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
           'name' => 'is_contact_creation_disabled_if_no_match',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Do not create new contacts when filing emails'),
+          'required' => TRUE,
           'where' => 'civicrm_mail_settings.is_contact_creation_disabled_if_no_match',
           'default' => '0',
           'table_name' => 'civicrm_mail_settings',

diff --git a/CRM/Core/DAO/Menu.php b/CRM/Core/DAO/Menu.php
index d2fc425efcb7a9013c9e8a769043c62e0f007911..e8cc323017b21cb71354babcd2e17f65a5e36d2b 100644 (file)
--- a/CRM/Core/DAO/Menu.php
+++ b/CRM/Core/DAO/Menu.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Menu.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a6c1c555579640a8bb83b496ee126e1a)
+ * (GenCodeChecksum:4d01bd1731e617a192799fab24077cac)
  */
 
 /**
@@ -146,7 +146,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO {
   /**
    * Is this menu item active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -155,7 +155,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO {
   /**
    * Is this menu accessible to the public?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -164,7 +164,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO {
   /**
    * Is this menu exposed to the navigation system?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -173,7 +173,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO {
   /**
    * Should this menu be exposed via SSL if enabled?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -209,7 +209,7 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO {
   /**
    * skip this url being exposed to breadcrumb
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -468,7 +468,9 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Enabled?'),
           'description' => ts('Is this menu item active?'),
+          'required' => TRUE,
           'where' => 'civicrm_menu.is_active',
+          'default' => '1',
           'table_name' => 'civicrm_menu',
           'entity' => 'Menu',
           'bao' => 'CRM_Core_DAO_Menu',
@@ -480,7 +482,9 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Public?'),
           'description' => ts('Is this menu accessible to the public?'),
+          'required' => TRUE,
           'where' => 'civicrm_menu.is_public',
+          'default' => '1',
           'table_name' => 'civicrm_menu',
           'entity' => 'Menu',
           'bao' => 'CRM_Core_DAO_Menu',
@@ -492,7 +496,9 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Exposed?'),
           'description' => ts('Is this menu exposed to the navigation system?'),
+          'required' => TRUE,
           'where' => 'civicrm_menu.is_exposed',
+          'default' => '1',
           'table_name' => 'civicrm_menu',
           'entity' => 'Menu',
           'bao' => 'CRM_Core_DAO_Menu',
@@ -504,7 +510,9 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Use SSL?'),
           'description' => ts('Should this menu be exposed via SSL if enabled?'),
+          'required' => TRUE,
           'where' => 'civicrm_menu.is_ssl',
+          'default' => '1',
           'table_name' => 'civicrm_menu',
           'entity' => 'Menu',
           'bao' => 'CRM_Core_DAO_Menu',
@@ -558,7 +566,9 @@ class CRM_Core_DAO_Menu extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Hide Breadcrumb?'),
           'description' => ts('skip this url being exposed to breadcrumb'),
+          'required' => TRUE,
           'where' => 'civicrm_menu.skipBreadcrumb',
+          'default' => '0',
           'table_name' => 'civicrm_menu',
           'entity' => 'Menu',
           'bao' => 'CRM_Core_DAO_Menu',

diff --git a/CRM/Core/DAO/MessageTemplate.php b/CRM/Core/DAO/MessageTemplate.php
index 72c90015672b761eebd50d70fa5e74523fb20f3a..a124c9d467c388088bf7774c6d80b4ffcfc951b4 100644 (file)
--- a/CRM/Core/DAO/MessageTemplate.php
+++ b/CRM/Core/DAO/MessageTemplate.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/MessageTemplate.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1fba7635baeb10d95b90c02ca4ea99c6)
+ * (GenCodeChecksum:a2e8de0828f836d42d4dcce19200ab27)
  */
 
 /**
@@ -76,7 +76,7 @@ class CRM_Core_DAO_MessageTemplate extends CRM_Core_DAO {
   public $msg_html;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -101,7 +101,7 @@ class CRM_Core_DAO_MessageTemplate extends CRM_Core_DAO {
   /**
    * is this the default message template for the workflow referenced by workflow_id?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -110,7 +110,7 @@ class CRM_Core_DAO_MessageTemplate extends CRM_Core_DAO {
   /**
    * is this the reserved message template which we ship for the workflow referenced by workflow_id?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -119,7 +119,7 @@ class CRM_Core_DAO_MessageTemplate extends CRM_Core_DAO {
   /**
    * Is this message template used for sms?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -237,6 +237,7 @@ class CRM_Core_DAO_MessageTemplate extends CRM_Core_DAO {
           'name' => 'is_active',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Active'),
+          'required' => TRUE,
           'where' => 'civicrm_msg_template.is_active',
           'default' => '1',
           'table_name' => 'civicrm_msg_template',
@@ -275,6 +276,7 @@ class CRM_Core_DAO_MessageTemplate extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Message Template Is Default?'),
           'description' => ts('is this the default message template for the workflow referenced by workflow_id?'),
+          'required' => TRUE,
           'where' => 'civicrm_msg_template.is_default',
           'default' => '1',
           'table_name' => 'civicrm_msg_template',
@@ -288,6 +290,7 @@ class CRM_Core_DAO_MessageTemplate extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Message Template Is Reserved?'),
           'description' => ts('is this the reserved message template which we ship for the workflow referenced by workflow_id?'),
+          'required' => TRUE,
           'where' => 'civicrm_msg_template.is_reserved',
           'default' => '0',
           'table_name' => 'civicrm_msg_template',
@@ -301,6 +304,7 @@ class CRM_Core_DAO_MessageTemplate extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Message Template is used for SMS?'),
           'description' => ts('Is this message template used for sms?'),
+          'required' => TRUE,
           'where' => 'civicrm_msg_template.is_sms',
           'default' => '0',
           'table_name' => 'civicrm_msg_template',

diff --git a/CRM/Core/DAO/OpenID.php b/CRM/Core/DAO/OpenID.php
index c5413e170d7dd420b6eff273c8bfa36cbc0cdbdf..7a6650f7bc874a350cd10686a7f6ce6e0399fc8e 100644 (file)
--- a/CRM/Core/DAO/OpenID.php
+++ b/CRM/Core/DAO/OpenID.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/OpenID.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0e8f41d1f528dfadc08d7f53610948ca)
+ * (GenCodeChecksum:7c70e03ffe06633c9e61c5845967d286)
  */
 
 /**
@@ -78,7 +78,7 @@ class CRM_Core_DAO_OpenID extends CRM_Core_DAO {
   /**
    * Is this the primary email for this contact and location.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -213,6 +213,7 @@ class CRM_Core_DAO_OpenID extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Primary ID'),
           'description' => ts('Is this the primary email for this contact and location.'),
+          'required' => TRUE,
           'where' => 'civicrm_openid.is_primary',
           'default' => '0',
           'table_name' => 'civicrm_openid',

diff --git a/CRM/Core/DAO/Phone.php b/CRM/Core/DAO/Phone.php
index 3241bf3f1d39e6afca339367be03721aca78a554..e8255a6032d0f349e3ef242135cae04d25d06334 100644 (file)
--- a/CRM/Core/DAO/Phone.php
+++ b/CRM/Core/DAO/Phone.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Phone.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:76f82c31308292a82535fb6bcf6acc4d)
+ * (GenCodeChecksum:b55a8820477e7df5db59b4ac8dc6adb6)
  */
 
 /**
@@ -74,7 +74,7 @@ class CRM_Core_DAO_Phone extends CRM_Core_DAO {
   /**
    * Is this the primary phone for this contact and location.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -83,7 +83,7 @@ class CRM_Core_DAO_Phone extends CRM_Core_DAO {
   /**
    * Is this the billing?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -234,6 +234,7 @@ class CRM_Core_DAO_Phone extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Primary phone'),
           'description' => ts('Is this the primary phone for this contact and location.'),
+          'required' => TRUE,
           'where' => 'civicrm_phone.is_primary',
           'default' => '0',
           'table_name' => 'civicrm_phone',
@@ -250,6 +251,7 @@ class CRM_Core_DAO_Phone extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Billing Phone'),
           'description' => ts('Is this the billing?'),
+          'required' => TRUE,
           'where' => 'civicrm_phone.is_billing',
           'default' => '0',
           'table_name' => 'civicrm_phone',

diff --git a/CRM/Core/DAO/PrevNextCache.php b/CRM/Core/DAO/PrevNextCache.php
index 9ab4943daa5e211ac599bf269e19c4a0f50b69eb..917c784383c9f5a92c35b42cd9bd4c71e152a36c 100644 (file)
--- a/CRM/Core/DAO/PrevNextCache.php
+++ b/CRM/Core/DAO/PrevNextCache.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/PrevNextCache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:34c9a3b8f37f15fa5f0d9174e5e1c981)
+ * (GenCodeChecksum:f024b706891db44527cdb153c1cdaea7)
  */
 
 /**
@@ -83,7 +83,7 @@ class CRM_Core_DAO_PrevNextCache extends CRM_Core_DAO {
   public $data;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -202,6 +202,7 @@ class CRM_Core_DAO_PrevNextCache extends CRM_Core_DAO {
           'name' => 'is_selected',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Selected'),
+          'required' => TRUE,
           'where' => 'civicrm_prevnext_cache.is_selected',
           'default' => '0',
           'table_name' => 'civicrm_prevnext_cache',

diff --git a/CRM/Core/DAO/PrintLabel.php b/CRM/Core/DAO/PrintLabel.php
index 73cd71cb68a7d918be9ca85f38bbcd76564da6b8..6a44d1fd370a04fbb80636d2a42c80fe7155477f 100644 (file)
--- a/CRM/Core/DAO/PrintLabel.php
+++ b/CRM/Core/DAO/PrintLabel.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/PrintLabel.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:2ff186e7860c945a080bd0d8672dee5f)
+ * (GenCodeChecksum:55db87fdd43d6037d64da10df24fc2b8)
  */
 
 /**
@@ -94,7 +94,7 @@ class CRM_Core_DAO_PrintLabel extends CRM_Core_DAO {
   /**
    * Is this default?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -103,7 +103,7 @@ class CRM_Core_DAO_PrintLabel extends CRM_Core_DAO {
   /**
    * Is this option active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -112,7 +112,7 @@ class CRM_Core_DAO_PrintLabel extends CRM_Core_DAO {
   /**
    * Is this reserved label?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -288,6 +288,7 @@ class CRM_Core_DAO_PrintLabel extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Label is Default?'),
           'description' => ts('Is this default?'),
+          'required' => TRUE,
           'where' => 'civicrm_print_label.is_default',
           'default' => '1',
           'table_name' => 'civicrm_print_label',
@@ -301,6 +302,7 @@ class CRM_Core_DAO_PrintLabel extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Label Is Active?'),
           'description' => ts('Is this option active?'),
+          'required' => TRUE,
           'where' => 'civicrm_print_label.is_active',
           'default' => '1',
           'table_name' => 'civicrm_print_label',
@@ -314,6 +316,7 @@ class CRM_Core_DAO_PrintLabel extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Label Reserved?'),
           'description' => ts('Is this reserved label?'),
+          'required' => TRUE,
           'where' => 'civicrm_print_label.is_reserved',
           'default' => '1',
           'table_name' => 'civicrm_print_label',

diff --git a/CRM/Core/DAO/Setting.php b/CRM/Core/DAO/Setting.php
index 32c4c45741d298c317f462a22b4ae89fc6acf577..65cc578f4aedab737be78e0653f5be45cc1b0c70 100644 (file)
--- a/CRM/Core/DAO/Setting.php
+++ b/CRM/Core/DAO/Setting.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Setting.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1540ee58b9ec485590f4ce8cfe94f5a4)
+ * (GenCodeChecksum:faec64e198a9187d40a3c1036a543d5c)
  */
 
 /**
@@ -76,7 +76,7 @@ class CRM_Core_DAO_Setting extends CRM_Core_DAO {
   /**
    * Is this setting a contact specific or site wide setting?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -242,7 +242,9 @@ class CRM_Core_DAO_Setting extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Domain Setting?'),
           'description' => ts('Is this setting a contact specific or site wide setting?'),
+          'required' => TRUE,
           'where' => 'civicrm_setting.is_domain',
+          'default' => '0',
           'table_name' => 'civicrm_setting',
           'entity' => 'Setting',
           'bao' => 'CRM_Core_BAO_Setting',

diff --git a/CRM/Core/DAO/StateProvince.php b/CRM/Core/DAO/StateProvince.php
index a07f290a77813571db2bd6ff30842b079d3ea9c1..4492a7fa1b00fe2fb42978819ff51323f27ab688 100644 (file)
--- a/CRM/Core/DAO/StateProvince.php
+++ b/CRM/Core/DAO/StateProvince.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/StateProvince.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:fe8e2b8bd40cc99eb28b66260a48da80)
+ * (GenCodeChecksum:b52f997bf6a08f0408c349a0ef187779)
  */
 
 /**
@@ -76,7 +76,7 @@ class CRM_Core_DAO_StateProvince extends CRM_Core_DAO {
   /**
    * Is this StateProvince active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -194,6 +194,7 @@ class CRM_Core_DAO_StateProvince extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('StateProvince Is Active'),
           'description' => ts('Is this StateProvince active?'),
+          'required' => TRUE,
           'where' => 'civicrm_state_province.is_active',
           'default' => '1',
           'table_name' => 'civicrm_state_province',

diff --git a/CRM/Core/DAO/StatusPreference.php b/CRM/Core/DAO/StatusPreference.php
index 60d0f297efaada5daf96a2ae4e7b4770c41a06d9..6dfacf75f9f0cebd4a79602babd0de363fd3b0b6 100644 (file)
--- a/CRM/Core/DAO/StatusPreference.php
+++ b/CRM/Core/DAO/StatusPreference.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/StatusPreference.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1fca44b28defd0dfa440e071408ae623)
+ * (GenCodeChecksum:3be71b1385c3b8095593a3c916f63b38)
  */
 
 /**
@@ -96,7 +96,7 @@ class CRM_Core_DAO_StatusPreference extends CRM_Core_DAO {
   /**
    * Is this status check active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -265,6 +265,7 @@ class CRM_Core_DAO_StatusPreference extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Check Is Active'),
           'description' => ts('Is this status check active?'),
+          'required' => TRUE,
           'where' => 'civicrm_status_pref.is_active',
           'default' => '1',
           'table_name' => 'civicrm_status_pref',

diff --git a/CRM/Core/DAO/Tag.php b/CRM/Core/DAO/Tag.php
index 3dcf7dbf5d0e8cc2ccd661b36eccea155b7af0cb..123795f5a939b01a6040169016a45f2639514e27 100644 (file)
--- a/CRM/Core/DAO/Tag.php
+++ b/CRM/Core/DAO/Tag.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Tag.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4e8a87bf73d5f2f09dacdd4891ee7305)
+ * (GenCodeChecksum:68e222188dd1d031d2219aa1617e15af)
  */
 
 /**
@@ -83,21 +83,21 @@ class CRM_Core_DAO_Tag extends CRM_Core_DAO {
   /**
    * Is this tag selectable / displayed
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
   public $is_selectable;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
   public $is_reserved;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -252,6 +252,7 @@ class CRM_Core_DAO_Tag extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Display Tag?'),
           'description' => ts('Is this tag selectable / displayed'),
+          'required' => TRUE,
           'where' => 'civicrm_tag.is_selectable',
           'default' => '1',
           'table_name' => 'civicrm_tag',
@@ -264,6 +265,7 @@ class CRM_Core_DAO_Tag extends CRM_Core_DAO {
           'name' => 'is_reserved',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Reserved'),
+          'required' => TRUE,
           'where' => 'civicrm_tag.is_reserved',
           'default' => '0',
           'table_name' => 'civicrm_tag',
@@ -276,6 +278,7 @@ class CRM_Core_DAO_Tag extends CRM_Core_DAO {
           'name' => 'is_tagset',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Tagset'),
+          'required' => TRUE,
           'where' => 'civicrm_tag.is_tagset',
           'default' => '0',
           'table_name' => 'civicrm_tag',

diff --git a/CRM/Core/DAO/UFField.php b/CRM/Core/DAO/UFField.php
index a35a7cc36844291f4849fff2f8f8b0fff883e4f6..8f4b833061c5b692a6892de16bdde909026c41e4 100644 (file)
--- a/CRM/Core/DAO/UFField.php
+++ b/CRM/Core/DAO/UFField.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/UFField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:dbab868218968878ca554480f974c2b4)
+ * (GenCodeChecksum:4d8ac7c59b6f2301cc22fe7966e8fc91)
  */
 
 /**
@@ -60,7 +60,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO {
   /**
    * Is this field currently shareable? If false, hide the field for all sharing contexts.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -69,7 +69,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO {
   /**
    * the field is view only and not editable in user forms.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -78,7 +78,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO {
   /**
    * Is this field required when included in a user or registration form?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -123,7 +123,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO {
   /**
    * Is this field included as a column in the selector table?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -132,7 +132,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO {
   /**
    * Is this field included search form of profile?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -186,7 +186,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO {
   /**
    * Is this field reserved for use by some other CiviCRM functionality?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -195,7 +195,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO {
   /**
    * Include in multi-record listing?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -306,6 +306,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Profile Field Is Active'),
           'description' => ts('Is this field currently shareable? If false, hide the field for all sharing contexts.'),
+          'required' => TRUE,
           'where' => 'civicrm_uf_field.is_active',
           'default' => '1',
           'table_name' => 'civicrm_uf_field',
@@ -319,6 +320,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Profile Is View Only'),
           'description' => ts('the field is view only and not editable in user forms.'),
+          'required' => TRUE,
           'where' => 'civicrm_uf_field.is_view',
           'default' => '0',
           'table_name' => 'civicrm_uf_field',
@@ -332,6 +334,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Profile Field Is Required'),
           'description' => ts('Is this field required when included in a user or registration form?'),
+          'required' => TRUE,
           'where' => 'civicrm_uf_field.is_required',
           'default' => '0',
           'table_name' => 'civicrm_uf_field',
@@ -404,6 +407,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Profile Field Is a Filter'),
           'description' => ts('Is this field included as a column in the selector table?'),
+          'required' => TRUE,
           'where' => 'civicrm_uf_field.in_selector',
           'default' => '0',
           'table_name' => 'civicrm_uf_field',
@@ -417,6 +421,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Profile Field Is Searchable'),
           'description' => ts('Is this field included search form of profile?'),
+          'required' => TRUE,
           'where' => 'civicrm_uf_field.is_searchable',
           'default' => '0',
           'table_name' => 'civicrm_uf_field',
@@ -507,7 +512,9 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Profile Field Is Reserved'),
           'description' => ts('Is this field reserved for use by some other CiviCRM functionality?'),
+          'required' => TRUE,
           'where' => 'civicrm_uf_field.is_reserved',
+          'default' => '0',
           'table_name' => 'civicrm_uf_field',
           'entity' => 'UFField',
           'bao' => 'CRM_Core_BAO_UFField',
@@ -519,6 +526,7 @@ class CRM_Core_DAO_UFField extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Profile Field Supports Multiple'),
           'description' => ts('Include in multi-record listing?'),
+          'required' => TRUE,
           'where' => 'civicrm_uf_field.is_multi_summary',
           'default' => '0',
           'table_name' => 'civicrm_uf_field',

diff --git a/CRM/Core/DAO/UFGroup.php b/CRM/Core/DAO/UFGroup.php
index 37f9346e36260dde5550a19dd735e5eebe09daab..a3b97104aa042b72eb0257b446244dd7497e00d3 100644 (file)
--- a/CRM/Core/DAO/UFGroup.php
+++ b/CRM/Core/DAO/UFGroup.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/UFGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6d64e2deaff9b8408d4110c44d0e8152)
+ * (GenCodeChecksum:37e03f3367ced4a53471f4f137c8c8ad)
  */
 
 /**
@@ -42,7 +42,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
   /**
    * Is this form currently active? If false, hide all related fields for all sharing contexts.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -132,7 +132,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
   /**
    * Should a CAPTCHA widget be included this Profile form.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -141,7 +141,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
   /**
    * Do we want to map results from this profile.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -150,7 +150,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
   /**
    * Should edit link display in profile selector
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -159,7 +159,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
   /**
    * Should we display a link to the website profile in profile selector
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -168,7 +168,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
   /**
    * Should we update the contact record if we find a duplicate
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -186,7 +186,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
   /**
    * Should we create a cms user for this profile
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -202,7 +202,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
   /**
    * Is this group reserved for use by some other CiviCRM functionality?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -238,7 +238,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
   /**
    * Should we include proximity search feature in this profile search form?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -265,7 +265,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
   /**
    * Should a Cancel button be included in this Profile form.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -336,6 +336,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Profile Is Active'),
           'description' => ts('Is this form currently active? If false, hide all related fields for all sharing contexts.'),
+          'required' => TRUE,
           'where' => 'civicrm_uf_group.is_active',
           'default' => '1',
           'table_name' => 'civicrm_uf_group',
@@ -502,6 +503,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Show Captcha On Profile'),
           'description' => ts('Should a CAPTCHA widget be included this Profile form.'),
+          'required' => TRUE,
           'where' => 'civicrm_uf_group.add_captcha',
           'default' => '0',
           'table_name' => 'civicrm_uf_group',
@@ -515,6 +517,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Map Profile'),
           'description' => ts('Do we want to map results from this profile.'),
+          'required' => TRUE,
           'where' => 'civicrm_uf_group.is_map',
           'default' => '0',
           'table_name' => 'civicrm_uf_group',
@@ -528,6 +531,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Show Edit Link?'),
           'description' => ts('Should edit link display in profile selector'),
+          'required' => TRUE,
           'where' => 'civicrm_uf_group.is_edit_link',
           'default' => '0',
           'table_name' => 'civicrm_uf_group',
@@ -541,6 +545,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Show Link to CMS User'),
           'description' => ts('Should we display a link to the website profile in profile selector'),
+          'required' => TRUE,
           'where' => 'civicrm_uf_group.is_uf_link',
           'default' => '0',
           'table_name' => 'civicrm_uf_group',
@@ -554,6 +559,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Update on Duplicate'),
           'description' => ts('Should we update the contact record if we find a duplicate'),
+          'required' => TRUE,
           'where' => 'civicrm_uf_group.is_update_dupe',
           'default' => '0',
           'table_name' => 'civicrm_uf_group',
@@ -581,6 +587,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Create CMS User?'),
           'description' => ts('Should we create a cms user for this profile '),
+          'required' => TRUE,
           'where' => 'civicrm_uf_group.is_cms_user',
           'default' => '0',
           'table_name' => 'civicrm_uf_group',
@@ -605,7 +612,9 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Profile Is Reserved'),
           'description' => ts('Is this group reserved for use by some other CiviCRM functionality?'),
+          'required' => TRUE,
           'where' => 'civicrm_uf_group.is_reserved',
+          'default' => '0',
           'table_name' => 'civicrm_uf_group',
           'entity' => 'UFGroup',
           'bao' => 'CRM_Core_BAO_UFGroup',
@@ -659,6 +668,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Include Proximity Search?'),
           'description' => ts('Should we include proximity search feature in this profile search form?'),
+          'required' => TRUE,
           'where' => 'civicrm_uf_group.is_proximity_search',
           'default' => '0',
           'table_name' => 'civicrm_uf_group',
@@ -708,6 +718,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Include Cancel Button'),
           'description' => ts('Should a Cancel button be included in this Profile form.'),
+          'required' => TRUE,
           'where' => 'civicrm_uf_group.add_cancel_button',
           'default' => '1',
           'table_name' => 'civicrm_uf_group',

diff --git a/CRM/Core/DAO/UFJoin.php b/CRM/Core/DAO/UFJoin.php
index a3460bd94f4c460625cc676b4709cea919ee29de..5d7d4d547ea2a6f8e29b6d1356154e3ac9c3c817 100644 (file)
--- a/CRM/Core/DAO/UFJoin.php
+++ b/CRM/Core/DAO/UFJoin.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/UFJoin.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1e4fa645d4bface77a08688d714ba651)
+ * (GenCodeChecksum:f2e966f7c15ec53893157c9fad65cde2)
  */
 
 /**
@@ -42,7 +42,7 @@ class CRM_Core_DAO_UFJoin extends CRM_Core_DAO {
   /**
    * Is this join currently active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -166,6 +166,7 @@ class CRM_Core_DAO_UFJoin extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Profile Use is active'),
           'description' => ts('Is this join currently active?'),
+          'required' => TRUE,
           'where' => 'civicrm_uf_join.is_active',
           'default' => '1',
           'table_name' => 'civicrm_uf_join',

diff --git a/CRM/Core/DAO/WordReplacement.php b/CRM/Core/DAO/WordReplacement.php
index efb8b81e05d0108e6f639baef6458d3d2e7c5921..d07c8547e7b75e47707ed7d2757513baf4ff35c7 100644 (file)
--- a/CRM/Core/DAO/WordReplacement.php
+++ b/CRM/Core/DAO/WordReplacement.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/WordReplacement.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:705cadb5a39522334249027149873712)
+ * (GenCodeChecksum:c5865289b55e3bdbca5fbca82a61526b)
  */
 
 /**
@@ -60,7 +60,7 @@ class CRM_Core_DAO_WordReplacement extends CRM_Core_DAO {
   /**
    * Is this entry active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -173,6 +173,7 @@ class CRM_Core_DAO_WordReplacement extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Word Replacement is Active'),
           'description' => ts('Is this entry active?'),
+          'required' => TRUE,
           'where' => 'civicrm_word_replacement.is_active',
           'default' => '1',
           'table_name' => 'civicrm_word_replacement',

diff --git a/CRM/Cxn/DAO/Cxn.php b/CRM/Cxn/DAO/Cxn.php
index c347beef13238a9c9b7e9cb354ca5714c80f142a..f63a7ac99d7dcdb3ce376d09006eb50344101f6d 100644 (file)
--- a/CRM/Cxn/DAO/Cxn.php
+++ b/CRM/Cxn/DAO/Cxn.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Cxn/Cxn.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ef4c2d6fa99ceb5d3b6cc29e78d80e42)
+ * (GenCodeChecksum:c08750593de1e3fd08e6a9899b555cde)
  */
 
 /**
@@ -96,7 +96,7 @@ class CRM_Cxn_DAO_Cxn extends CRM_Core_DAO {
   /**
    * Is connection currently enabled?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -263,6 +263,7 @@ class CRM_Cxn_DAO_Cxn extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Active'),
           'description' => ts('Is connection currently enabled?'),
+          'required' => TRUE,
           'where' => 'civicrm_cxn.is_active',
           'default' => '1',
           'table_name' => 'civicrm_cxn',

diff --git a/CRM/Dedupe/DAO/DedupeRuleGroup.php b/CRM/Dedupe/DAO/DedupeRuleGroup.php
index 434f259678da1669e4c707207e2b8603bbc93d93..9c7e1cffb8600d5d1089fd60055377bd00ba5498 100644 (file)
--- a/CRM/Dedupe/DAO/DedupeRuleGroup.php
+++ b/CRM/Dedupe/DAO/DedupeRuleGroup.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Dedupe/DedupeRuleGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:66687eeebbe44a6fca675162a59edaa0)
+ * (GenCodeChecksum:9390f709bdbf2945acb57c353814e393)
  */
 
 /**
@@ -87,7 +87,7 @@ class CRM_Dedupe_DAO_DedupeRuleGroup extends CRM_Core_DAO {
   /**
    * Is this a reserved rule - a rule group that has been optimized and cannot be changed by the admin
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -232,7 +232,9 @@ class CRM_Dedupe_DAO_DedupeRuleGroup extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Reserved?'),
           'description' => ts('Is this a reserved rule - a rule group that has been optimized and cannot be changed by the admin'),
+          'required' => TRUE,
           'where' => 'civicrm_dedupe_rule_group.is_reserved',
+          'default' => '0',
           'table_name' => 'civicrm_dedupe_rule_group',
           'entity' => 'DedupeRuleGroup',
           'bao' => 'CRM_Dedupe_BAO_DedupeRuleGroup',

diff --git a/CRM/Event/Cart/DAO/Cart.php b/CRM/Event/Cart/DAO/Cart.php
index e5998e753208a4295a4a7d01b51c5149e58ea37d..9f9ff821031e71a707e186893bd452759e8fddf2 100644 (file)
--- a/CRM/Event/Cart/DAO/Cart.php
+++ b/CRM/Event/Cart/DAO/Cart.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Event/Cart/Cart.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:58e30874811fa80b8a405f368004e697)
+ * (GenCodeChecksum:e88efc43107d7828fa4b0d2c29abb564)
  */
 
 /**
@@ -50,7 +50,7 @@ class CRM_Event_Cart_DAO_Cart extends CRM_Core_DAO {
   public $user_id;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -134,6 +134,7 @@ class CRM_Event_Cart_DAO_Cart extends CRM_Core_DAO {
           'name' => 'completed',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Complete?'),
+          'required' => TRUE,
           'where' => 'civicrm_event_carts.completed',
           'default' => '0',
           'table_name' => 'civicrm_event_carts',

diff --git a/CRM/Event/DAO/Participant.php b/CRM/Event/DAO/Participant.php
index 6a4624cf812000b96df858bba0f9d806e4f58345..bc2325233220f14095f917e0287726c32fc80a3d 100644 (file)
--- a/CRM/Event/DAO/Participant.php
+++ b/CRM/Event/DAO/Participant.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Event/Participant.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:62382336b5251b2ee93828d70138cd7e)
+ * (GenCodeChecksum:9d1b4abcd8bb1106b31c610026aed0d5)
  */
 
 /**
@@ -112,14 +112,14 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO {
   public $fee_level;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
   public $is_test;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -437,6 +437,7 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO {
           'name' => 'is_test',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Test'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_participant.is_test',
           'export' => TRUE,
@@ -451,6 +452,7 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO {
           'name' => 'is_pay_later',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Pay Later'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_participant.is_pay_later',
           'headerPattern' => '/(is.)?(pay(.)?later)$/i',

diff --git a/CRM/Event/DAO/ParticipantStatusType.php b/CRM/Event/DAO/ParticipantStatusType.php
index bdb75e0e43cabb7f7939c0e0d136b9e033ff13ec..160c3f56b1fa23af7ab7e38a77cc0f66d524da16 100644 (file)
--- a/CRM/Event/DAO/ParticipantStatusType.php
+++ b/CRM/Event/DAO/ParticipantStatusType.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Event/ParticipantStatusType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:bb9ea5411d4ab4f767d891f2e0f20858)
+ * (GenCodeChecksum:ed0f2b22eb6983f73fa5b87fc4fa7c9c)
  */
 
 /**
@@ -70,7 +70,7 @@ class CRM_Event_DAO_ParticipantStatusType extends CRM_Core_DAO {
   /**
    * whether this is a status type required by the system
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -79,7 +79,7 @@ class CRM_Event_DAO_ParticipantStatusType extends CRM_Core_DAO {
   /**
    * whether this status type is active
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -88,7 +88,7 @@ class CRM_Event_DAO_ParticipantStatusType extends CRM_Core_DAO {
   /**
    * whether this status type is counted against event size limit
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -210,7 +210,9 @@ class CRM_Event_DAO_ParticipantStatusType extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Participant Status Is Reserved?>'),
           'description' => ts('whether this is a status type required by the system'),
+          'required' => TRUE,
           'where' => 'civicrm_participant_status_type.is_reserved',
+          'default' => '0',
           'table_name' => 'civicrm_participant_status_type',
           'entity' => 'ParticipantStatusType',
           'bao' => 'CRM_Event_BAO_ParticipantStatusType',
@@ -222,6 +224,7 @@ class CRM_Event_DAO_ParticipantStatusType extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Participant Status is Active'),
           'description' => ts('whether this status type is active'),
+          'required' => TRUE,
           'where' => 'civicrm_participant_status_type.is_active',
           'default' => '1',
           'table_name' => 'civicrm_participant_status_type',
@@ -235,7 +238,9 @@ class CRM_Event_DAO_ParticipantStatusType extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Participant Status Counts?'),
           'description' => ts('whether this status type is counted against event size limit'),
+          'required' => TRUE,
           'where' => 'civicrm_participant_status_type.is_counted',
+          'default' => '0',
           'table_name' => 'civicrm_participant_status_type',
           'entity' => 'ParticipantStatusType',
           'bao' => 'CRM_Event_BAO_ParticipantStatusType',

diff --git a/CRM/Financial/DAO/FinancialTrxn.php b/CRM/Financial/DAO/FinancialTrxn.php
index ff401a529b85f63d32e15af718a92366de5561cd..709ec8760e295cfd7251885c89d4916dcab81a4b 100644 (file)
--- a/CRM/Financial/DAO/FinancialTrxn.php
+++ b/CRM/Financial/DAO/FinancialTrxn.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/FinancialTrxn.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ab70fbb4b84fe620236a196f5a80926e)
+ * (GenCodeChecksum:91bd49e83b574c92b7633805f6e0a903)
  */
 
 /**
@@ -104,7 +104,7 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO {
   /**
    * Is this entry either a payment or a reversal of a payment?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -394,6 +394,7 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Payment?'),
           'description' => ts('Is this entry either a payment or a reversal of a payment?'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_financial_trxn.is_payment',
           'export' => TRUE,

diff --git a/CRM/Financial/DAO/PaymentProcessor.php b/CRM/Financial/DAO/PaymentProcessor.php
index 82622f2b69949139c6664068120a4392170a5ccd..7210013c8c1813b9996841aaa1c1a136484c9df3 100644 (file)
--- a/CRM/Financial/DAO/PaymentProcessor.php
+++ b/CRM/Financial/DAO/PaymentProcessor.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/PaymentProcessor.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:7d4681a9b748c272c9da9807af6e4809)
+ * (GenCodeChecksum:7f1fd3e55d2b10ce458a9503349f9e61)
  */
 
 /**
@@ -86,7 +86,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO {
   /**
    * Is this processor active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -95,7 +95,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO {
   /**
    * Is this processor the default?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -104,7 +104,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO {
   /**
    * Is this processor for a test site?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -185,7 +185,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO {
   /**
    * Can process recurring contributions
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -376,6 +376,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Processor is Active?'),
           'description' => ts('Is this processor active?'),
+          'required' => TRUE,
           'where' => 'civicrm_payment_processor.is_active',
           'default' => '1',
           'table_name' => 'civicrm_payment_processor',
@@ -389,6 +390,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Processor Is Default?'),
           'description' => ts('Is this processor the default?'),
+          'required' => TRUE,
           'where' => 'civicrm_payment_processor.is_default',
           'default' => '0',
           'table_name' => 'civicrm_payment_processor',
@@ -402,6 +404,7 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Test Processor?'),
           'description' => ts('Is this processor for a test site?'),
+          'required' => TRUE,
           'where' => 'civicrm_payment_processor.is_test',
           'default' => '0',
           'table_name' => 'civicrm_payment_processor',
@@ -569,7 +572,9 @@ class CRM_Financial_DAO_PaymentProcessor extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Processor Supports Recurring?'),
           'description' => ts('Can process recurring contributions'),
+          'required' => TRUE,
           'where' => 'civicrm_payment_processor.is_recur',
+          'default' => '0',
           'table_name' => 'civicrm_payment_processor',
           'entity' => 'PaymentProcessor',
           'bao' => 'CRM_Financial_BAO_PaymentProcessor',

diff --git a/CRM/Financial/DAO/PaymentProcessorType.php b/CRM/Financial/DAO/PaymentProcessorType.php
index 4088336a4a1927a23cf615ee3ed9d3ebbd55e906..e56feb89296a71bb952f1d6a4348a011a2f9efb1 100644 (file)
--- a/CRM/Financial/DAO/PaymentProcessorType.php
+++ b/CRM/Financial/DAO/PaymentProcessorType.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/PaymentProcessorType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a24e95eecd01bdb6ff555cd307a62084)
+ * (GenCodeChecksum:5c849e6c7ad27a02c17defc1a3e23de7)
  */
 
 /**
@@ -70,7 +70,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO {
   /**
    * Is this processor active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -79,7 +79,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO {
   /**
    * Is this processor the default?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -188,7 +188,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO {
   /**
    * Can process recurring contributions
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -304,6 +304,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Processor Type Is Active?'),
           'description' => ts('Is this processor active?'),
+          'required' => TRUE,
           'where' => 'civicrm_payment_processor_type.is_active',
           'default' => '1',
           'table_name' => 'civicrm_payment_processor_type',
@@ -317,6 +318,7 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Processor Type is Default?'),
           'description' => ts('Is this processor the default?'),
+          'required' => TRUE,
           'where' => 'civicrm_payment_processor_type.is_default',
           'default' => '0',
           'table_name' => 'civicrm_payment_processor_type',
@@ -520,7 +522,9 @@ class CRM_Financial_DAO_PaymentProcessorType extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Processor Type Supports Recurring?'),
           'description' => ts('Can process recurring contributions'),
+          'required' => TRUE,
           'where' => 'civicrm_payment_processor_type.is_recur',
+          'default' => '0',
           'table_name' => 'civicrm_payment_processor_type',
           'entity' => 'PaymentProcessorType',
           'bao' => 'CRM_Financial_BAO_PaymentProcessorType',

diff --git a/CRM/Friend/DAO/Friend.php b/CRM/Friend/DAO/Friend.php
index 19dac5041dd9840e5631ddd9ecf65fe999cfc057..63c192f78042dbf2bbd82e1339073f736e3ea74d 100644 (file)
--- a/CRM/Friend/DAO/Friend.php
+++ b/CRM/Friend/DAO/Friend.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Friend/Friend.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:49f46991da84d0d0067ea70ab6276f15)
+ * (GenCodeChecksum:b0719dca7c584cd3d669975119108d78)
  */
 
 /**
@@ -110,7 +110,7 @@ class CRM_Friend_DAO_Friend extends CRM_Core_DAO {
   public $thankyou_text;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -303,7 +303,9 @@ class CRM_Friend_DAO_Friend extends CRM_Core_DAO {
           'name' => 'is_active',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Enabled?'),
+          'required' => TRUE,
           'where' => 'civicrm_tell_friend.is_active',
+          'default' => '1',
           'table_name' => 'civicrm_tell_friend',
           'entity' => 'Friend',
           'bao' => 'CRM_Friend_BAO_Friend',

diff --git a/CRM/Mailing/DAO/Mailing.php b/CRM/Mailing/DAO/Mailing.php
index 219a8c990504346ea566c65181d49bbd4eb76109..5345514b1fa560937b27405126573f2c8f65fab4 100644 (file)
--- a/CRM/Mailing/DAO/Mailing.php
+++ b/CRM/Mailing/DAO/Mailing.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Mailing.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d9992e7d40fdab9d29f2a093e34aa1cb)
+ * (GenCodeChecksum:4144d565580335c15e750f73a73df644)
  */
 
 /**
@@ -209,7 +209,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
   /**
    * Should we track URL click-throughs for this mailing?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -218,7 +218,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
   /**
    * Should we forward replies back to the author?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -227,7 +227,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
   /**
    * Should we enable the auto-responder?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -236,7 +236,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
   /**
    * Should we track when recipients open/read this mailing?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -245,7 +245,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
   /**
    * Has at least one job associated with this mailing finished?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -263,7 +263,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
   /**
    * Overwrite the VERP address in Reply-To
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -353,7 +353,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
   /**
    * Is this mailing archived?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -380,7 +380,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
   /**
    * Remove duplicate emails?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -805,7 +805,9 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Url Tracking'),
           'description' => ts('Should we track URL click-throughs for this mailing?'),
+          'required' => TRUE,
           'where' => 'civicrm_mailing.url_tracking',
+          'default' => '0',
           'table_name' => 'civicrm_mailing',
           'entity' => 'Mailing',
           'bao' => 'CRM_Mailing_BAO_Mailing',
@@ -821,7 +823,9 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Forward Replies'),
           'description' => ts('Should we forward replies back to the author?'),
+          'required' => TRUE,
           'where' => 'civicrm_mailing.forward_replies',
+          'default' => '0',
           'table_name' => 'civicrm_mailing',
           'entity' => 'Mailing',
           'bao' => 'CRM_Mailing_BAO_Mailing',
@@ -837,7 +841,9 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Auto Responder'),
           'description' => ts('Should we enable the auto-responder?'),
+          'required' => TRUE,
           'where' => 'civicrm_mailing.auto_responder',
+          'default' => '0',
           'table_name' => 'civicrm_mailing',
           'entity' => 'Mailing',
           'bao' => 'CRM_Mailing_BAO_Mailing',
@@ -853,7 +859,9 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Track Mailing?'),
           'description' => ts('Should we track when recipients open/read this mailing?'),
+          'required' => TRUE,
           'where' => 'civicrm_mailing.open_tracking',
+          'default' => '0',
           'table_name' => 'civicrm_mailing',
           'entity' => 'Mailing',
           'bao' => 'CRM_Mailing_BAO_Mailing',
@@ -865,7 +873,9 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Mailing Completed'),
           'description' => ts('Has at least one job associated with this mailing finished?'),
+          'required' => TRUE,
           'where' => 'civicrm_mailing.is_completed',
+          'default' => '0',
           'table_name' => 'civicrm_mailing',
           'entity' => 'Mailing',
           'bao' => 'CRM_Mailing_BAO_Mailing',
@@ -896,6 +906,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Override Verp'),
           'description' => ts('Overwrite the VERP address in Reply-To'),
+          'required' => TRUE,
           'where' => 'civicrm_mailing.override_verp',
           'default' => '0',
           'table_name' => 'civicrm_mailing',
@@ -1068,6 +1079,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Mailing Archived?'),
           'description' => ts('Is this mailing archived?'),
+          'required' => TRUE,
           'where' => 'civicrm_mailing.is_archived',
           'default' => '0',
           'table_name' => 'civicrm_mailing',
@@ -1129,6 +1141,7 @@ class CRM_Mailing_DAO_Mailing extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('No Duplicate emails?'),
           'description' => ts('Remove duplicate emails?'),
+          'required' => TRUE,
           'where' => 'civicrm_mailing.dedupe_email',
           'default' => '0',
           'table_name' => 'civicrm_mailing',

diff --git a/CRM/Mailing/DAO/MailingComponent.php b/CRM/Mailing/DAO/MailingComponent.php
index 0f77ebdfb50f1caad629618cf597d6186d77e55a..44509bb0e5802e62faeebbab416c309de0a553e7 100644 (file)
--- a/CRM/Mailing/DAO/MailingComponent.php
+++ b/CRM/Mailing/DAO/MailingComponent.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/MailingComponent.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:07a2027aee545a570c9fd99294f98d9a)
+ * (GenCodeChecksum:0714e4996da6d79fc972efe53df08a26)
  */
 
 /**
@@ -84,7 +84,7 @@ class CRM_Mailing_DAO_MailingComponent extends CRM_Core_DAO {
   /**
    * Is this the default component for this component_type?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -93,7 +93,7 @@ class CRM_Mailing_DAO_MailingComponent extends CRM_Core_DAO {
   /**
    * Is this property active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -231,6 +231,7 @@ class CRM_Mailing_DAO_MailingComponent extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Mailing Component is Default?'),
           'description' => ts('Is this the default component for this component_type?'),
+          'required' => TRUE,
           'where' => 'civicrm_mailing_component.is_default',
           'default' => '0',
           'table_name' => 'civicrm_mailing_component',
@@ -244,7 +245,9 @@ class CRM_Mailing_DAO_MailingComponent extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Mailing Component Is Active?'),
           'description' => ts('Is this property active?'),
+          'required' => TRUE,
           'where' => 'civicrm_mailing_component.is_active',
+          'default' => '1',
           'table_name' => 'civicrm_mailing_component',
           'entity' => 'MailingComponent',
           'bao' => 'CRM_Mailing_BAO_MailingComponent',

diff --git a/CRM/Mailing/DAO/MailingJob.php b/CRM/Mailing/DAO/MailingJob.php
index 3ba252d04082e85f77212e577f6bf7393a242968..3f366c0dbc8bc9c26f9976e43c21bef250d6fcc6 100644 (file)
--- a/CRM/Mailing/DAO/MailingJob.php
+++ b/CRM/Mailing/DAO/MailingJob.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/MailingJob.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:fdca7fda2701c59049924abfdb6adf3b)
+ * (GenCodeChecksum:492e51f255632b9c3d87714bc9ca0f4d)
  */
 
 /**
@@ -86,7 +86,7 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO {
   /**
    * Is this job for a test mail?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -283,6 +283,7 @@ class CRM_Mailing_DAO_MailingJob extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Mailing Job Is Test?'),
           'description' => ts('Is this job for a test mail?'),
+          'required' => TRUE,
           'where' => 'civicrm_mailing_job.is_test',
           'default' => '0',
           'table_name' => 'civicrm_mailing_job',

diff --git a/CRM/Member/DAO/Membership.php b/CRM/Member/DAO/Membership.php
index 94bcb0f9b07e0a5be76d49e9fcf50f9e970f40b1..dd6995cd3011f851dc9a01fa91ce19eff1f44555 100644 (file)
--- a/CRM/Member/DAO/Membership.php
+++ b/CRM/Member/DAO/Membership.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Member/Membership.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0619aa3946bcadcab1919672c9ecf35a)
+ * (GenCodeChecksum:1668d4d8a9f2e1686bf9f5b6ea1c55dc)
  */
 
 /**
@@ -123,7 +123,7 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO {
   /**
    * Admin users may set a manual status which overrides the calculated status. When this flag is true, automated status update scripts should NOT modify status for the record.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -157,14 +157,14 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO {
   public $max_related;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
   public $is_test;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -421,10 +421,12 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Status Override'),
           'description' => ts('Admin users may set a manual status which overrides the calculated status. When this flag is true, automated status update scripts should NOT modify status for the record.'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_membership.is_override',
           'headerPattern' => '/override$/i',
           'export' => TRUE,
+          'default' => '0',
           'table_name' => 'civicrm_membership',
           'entity' => 'Membership',
           'bao' => 'CRM_Member_BAO_Membership',
@@ -491,6 +493,7 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO {
           'name' => 'is_test',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Test'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_membership.is_test',
           'headerPattern' => '/(is.)?test(.member(ship)?)?/i',
@@ -509,6 +512,7 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO {
           'name' => 'is_pay_later',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Pay Later'),
+          'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_membership.is_pay_later',
           'headerPattern' => '/(is.)?(pay(.)?later)$/i',

diff --git a/CRM/Member/DAO/MembershipBlock.php b/CRM/Member/DAO/MembershipBlock.php
index a8fdf704d6034c326b3b9af1480a00170408d719..d51f917e0422e5a2576c37504590be931b88f567 100644 (file)
--- a/CRM/Member/DAO/MembershipBlock.php
+++ b/CRM/Member/DAO/MembershipBlock.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Member/MembershipBlock.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:8e0e93f6f480d279cbf4ac53db86a8f3)
+ * (GenCodeChecksum:b8779f341fdb53bc75c0928fea73f06f)
  */
 
 /**
@@ -79,7 +79,7 @@ class CRM_Member_DAO_MembershipBlock extends CRM_Core_DAO {
   /**
    * Display minimum membership fee
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -88,7 +88,7 @@ class CRM_Member_DAO_MembershipBlock extends CRM_Core_DAO {
   /**
    * Should membership transactions be processed separately
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -133,7 +133,7 @@ class CRM_Member_DAO_MembershipBlock extends CRM_Core_DAO {
   /**
    * Is membership sign up optional
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -142,7 +142,7 @@ class CRM_Member_DAO_MembershipBlock extends CRM_Core_DAO {
   /**
    * Is this membership_block enabled
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -274,6 +274,7 @@ class CRM_Member_DAO_MembershipBlock extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Membership Block Display Minimum Fee'),
           'description' => ts('Display minimum membership fee'),
+          'required' => TRUE,
           'where' => 'civicrm_membership_block.display_min_fee',
           'default' => '1',
           'table_name' => 'civicrm_membership_block',
@@ -287,6 +288,7 @@ class CRM_Member_DAO_MembershipBlock extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Membership Block Is Separate Payment'),
           'description' => ts('Should membership transactions be processed separately'),
+          'required' => TRUE,
           'where' => 'civicrm_membership_block.is_separate_payment',
           'default' => '1',
           'table_name' => 'civicrm_membership_block',
@@ -352,6 +354,7 @@ class CRM_Member_DAO_MembershipBlock extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Required'),
           'description' => ts('Is membership sign up optional'),
+          'required' => TRUE,
           'where' => 'civicrm_membership_block.is_required',
           'default' => '0',
           'table_name' => 'civicrm_membership_block',
@@ -365,6 +368,7 @@ class CRM_Member_DAO_MembershipBlock extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Active'),
           'description' => ts('Is this membership_block enabled'),
+          'required' => TRUE,
           'where' => 'civicrm_membership_block.is_active',
           'default' => '1',
           'table_name' => 'civicrm_membership_block',

diff --git a/CRM/Member/DAO/MembershipStatus.php b/CRM/Member/DAO/MembershipStatus.php
index 764946fbb835158ee166b2365434797b508eacf4..0b4d58277acb1d5f4b6ab4c5eb8990c43c1c8c1a 100644 (file)
--- a/CRM/Member/DAO/MembershipStatus.php
+++ b/CRM/Member/DAO/MembershipStatus.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Member/MembershipStatus.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:5c4442b352b42ed23368f5dbb0bc0531)
+ * (GenCodeChecksum:baf51df46a12becf1b8ed3f8a25e2237)
  */
 
 /**
@@ -122,7 +122,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO {
   /**
    * Does this status aggregate to current members (e.g. New, Renewed, Grace might all be TRUE... while Unrenewed, Lapsed, Inactive would be FALSE).
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -131,7 +131,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO {
   /**
    * Is this status for admin/manual assignment only.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -147,7 +147,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO {
   /**
    * Assign this status to a membership record if no other status match is found.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -156,7 +156,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO {
   /**
    * Is this membership_status enabled.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -165,7 +165,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO {
   /**
    * Is this membership_status reserved.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -367,7 +367,9 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Current Membership?'),
           'description' => ts('Does this status aggregate to current members (e.g. New, Renewed, Grace might all be TRUE... while Unrenewed, Lapsed, Inactive would be FALSE).'),
+          'required' => TRUE,
           'where' => 'civicrm_membership_status.is_current_member',
+          'default' => '0',
           'table_name' => 'civicrm_membership_status',
           'entity' => 'MembershipStatus',
           'bao' => 'CRM_Member_BAO_MembershipStatus',
@@ -379,7 +381,9 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Administrator Only?'),
           'description' => ts('Is this status for admin/manual assignment only.'),
+          'required' => TRUE,
           'where' => 'civicrm_membership_status.is_admin',
+          'default' => '0',
           'table_name' => 'civicrm_membership_status',
           'entity' => 'MembershipStatus',
           'bao' => 'CRM_Member_BAO_MembershipStatus',
@@ -405,7 +409,9 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Default Status?'),
           'description' => ts('Assign this status to a membership record if no other status match is found.'),
+          'required' => TRUE,
           'where' => 'civicrm_membership_status.is_default',
+          'default' => '0',
           'table_name' => 'civicrm_membership_status',
           'entity' => 'MembershipStatus',
           'bao' => 'CRM_Member_BAO_MembershipStatus',
@@ -420,6 +426,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Active'),
           'description' => ts('Is this membership_status enabled.'),
+          'required' => TRUE,
           'where' => 'civicrm_membership_status.is_active',
           'default' => '1',
           'table_name' => 'civicrm_membership_status',
@@ -436,6 +443,7 @@ class CRM_Member_DAO_MembershipStatus extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Reserved'),
           'description' => ts('Is this membership_status reserved.'),
+          'required' => TRUE,
           'where' => 'civicrm_membership_status.is_reserved',
           'default' => '0',
           'table_name' => 'civicrm_membership_status',

diff --git a/CRM/PCP/DAO/PCP.php b/CRM/PCP/DAO/PCP.php
index f0996d982cadc950483c8476ef89b3a4732782dd..96572086a623e39b8e11bfe2d8ddc18664c6dd7c 100644 (file)
--- a/CRM/PCP/DAO/PCP.php
+++ b/CRM/PCP/DAO/PCP.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/PCP/PCP.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:9f11f3e21038c8027ad0e97497ccc356)
+ * (GenCodeChecksum:580fcea1bad18a3de9e966545756fbe7)
  */
 
 /**
@@ -146,7 +146,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO {
   /**
    * Is Personal Campaign Page enabled/active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -155,7 +155,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO {
   /**
    * Notify owner via email when someone donates to page?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -445,8 +445,9 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Enabled?'),
           'description' => ts('Is Personal Campaign Page enabled/active?'),
+          'required' => TRUE,
           'where' => 'civicrm_pcp.is_active',
-          'default' => '0',
+          'default' => '1',
           'table_name' => 'civicrm_pcp',
           'entity' => 'PCP',
           'bao' => 'CRM_PCP_BAO_PCP',
@@ -461,6 +462,7 @@ class CRM_PCP_DAO_PCP extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Notify Owner?'),
           'description' => ts('Notify owner via email when someone donates to page?'),
+          'required' => TRUE,
           'where' => 'civicrm_pcp.is_notify',
           'default' => '0',
           'table_name' => 'civicrm_pcp',

diff --git a/CRM/PCP/DAO/PCPBlock.php b/CRM/PCP/DAO/PCPBlock.php
index 351bb1b4836aad86ff8764f24fd94efd6b37f6fe..c610d7b8446765a26e73a5ee66ba7e482e55f8d5 100644 (file)
--- a/CRM/PCP/DAO/PCPBlock.php
+++ b/CRM/PCP/DAO/PCPBlock.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/PCP/PCPBlock.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:5528529230e5f5dbcfa0466ada0514d1)
+ * (GenCodeChecksum:4b4cbd3c471584e645cd442b994b73bb)
  */
 
 /**
@@ -95,7 +95,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO {
   /**
    * Does Personal Campaign Page require manual activation by administrator? (is inactive by default after setup)?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -104,7 +104,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO {
   /**
    * Does Personal Campaign Page allow using tell a friend?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -131,7 +131,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO {
   /**
    * Is Personal Campaign Page Block enabled/active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -303,8 +303,9 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Approval Required?'),
           'description' => ts('Does Personal Campaign Page require manual activation by administrator? (is inactive by default after setup)?'),
+          'required' => TRUE,
           'where' => 'civicrm_pcp_block.is_approval_needed',
-          'default' => NULL,
+          'default' => '0',
           'table_name' => 'civicrm_pcp_block',
           'entity' => 'PCPBlock',
           'bao' => 'CRM_PCP_BAO_PCPBlock',
@@ -316,8 +317,9 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Tell a Friend Enabled?'),
           'description' => ts('Does Personal Campaign Page allow using tell a friend?'),
+          'required' => TRUE,
           'where' => 'civicrm_pcp_block.is_tellfriend_enabled',
-          'default' => NULL,
+          'default' => '0',
           'table_name' => 'civicrm_pcp_block',
           'entity' => 'PCPBlock',
           'bao' => 'CRM_PCP_BAO_PCPBlock',
@@ -357,6 +359,7 @@ class CRM_PCP_DAO_PCPBlock extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Enabled?'),
           'description' => ts('Is Personal Campaign Page Block enabled/active?'),
+          'required' => TRUE,
           'where' => 'civicrm_pcp_block.is_active',
           'default' => '1',
           'table_name' => 'civicrm_pcp_block',

diff --git a/CRM/Pledge/DAO/PledgeBlock.php b/CRM/Pledge/DAO/PledgeBlock.php
index 020203b2803996604ae9069215256932e42a44cf..72d227201b96cfdbde184a105324b4cff37e74d2 100644 (file)
--- a/CRM/Pledge/DAO/PledgeBlock.php
+++ b/CRM/Pledge/DAO/PledgeBlock.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Pledge/PledgeBlock.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a3bd49cda507ac9872922e16ff37a645)
+ * (GenCodeChecksum:5c573642b549c72e343477a782ed62dc)
  */
 
 /**
@@ -70,7 +70,7 @@ class CRM_Pledge_DAO_PledgeBlock extends CRM_Core_DAO {
   /**
    * Is frequency interval exposed on the contribution form.
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -235,6 +235,7 @@ class CRM_Pledge_DAO_PledgeBlock extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Expose Frequency Interval?'),
           'description' => ts('Is frequency interval exposed on the contribution form.'),
+          'required' => TRUE,
           'where' => 'civicrm_pledge_block.is_pledge_interval',
           'default' => '0',
           'table_name' => 'civicrm_pledge_block',

diff --git a/CRM/Price/DAO/PriceField.php b/CRM/Price/DAO/PriceField.php
index 809ccf6d487a69dfd4be9259f2f0b2e4f2a3a1fe..13a15de67e710f2b4d93eb833d28778e0f9606bb 100644 (file)
--- a/CRM/Price/DAO/PriceField.php
+++ b/CRM/Price/DAO/PriceField.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Price/PriceField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e8aa16285c520e7ce5288da53397f9df)
+ * (GenCodeChecksum:15774f8e0c7f8ef88b21f86cf8ef43bc)
  */
 
 /**
@@ -77,7 +77,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO {
   /**
    * Enter a quantity for this field?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -113,7 +113,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO {
   /**
    * Should the price be displayed next to the label for each option?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -131,7 +131,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO {
   /**
    * Is this price field active
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -140,7 +140,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO {
   /**
    * Is this price field required (value must be > 1)
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -326,6 +326,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Price Field Quantity Required?'),
           'description' => ts('Enter a quantity for this field?'),
+          'required' => TRUE,
           'where' => 'civicrm_price_field.is_enter_qty',
           'default' => '0',
           'table_name' => 'civicrm_price_field',
@@ -392,6 +393,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Price Field Show Amounts?'),
           'description' => ts('Should the price be displayed next to the label for each option?'),
+          'required' => TRUE,
           'where' => 'civicrm_price_field.is_display_amounts',
           'default' => '1',
           'table_name' => 'civicrm_price_field',
@@ -424,6 +426,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Price Field Is Active?'),
           'description' => ts('Is this price field active'),
+          'required' => TRUE,
           'where' => 'civicrm_price_field.is_active',
           'default' => '1',
           'table_name' => 'civicrm_price_field',
@@ -440,6 +443,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Price Field is Required?'),
           'description' => ts('Is this price field required (value must be > 1)'),
+          'required' => TRUE,
           'where' => 'civicrm_price_field.is_required',
           'default' => '1',
           'table_name' => 'civicrm_price_field',

diff --git a/CRM/Price/DAO/PriceFieldValue.php b/CRM/Price/DAO/PriceFieldValue.php
index 0eb232139db48131bfaaf2a856ca515660f56c97..fc0642b78defc67dafb715129f7e5b0db4cb7e4b 100644 (file)
--- a/CRM/Price/DAO/PriceFieldValue.php
+++ b/CRM/Price/DAO/PriceFieldValue.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Price/PriceFieldValue.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:3596e8942576c06b6a393c4d16226de9)
+ * (GenCodeChecksum:d39a35fbdcaed47315fdc0ecce662c7f)
  */
 
 /**
@@ -151,7 +151,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO {
   /**
    * Is this default price field option
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -160,7 +160,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO {
   /**
    * Is this price field value active
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -473,6 +473,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Default Price Field Option?'),
           'description' => ts('Is this default price field option'),
+          'required' => TRUE,
           'where' => 'civicrm_price_field_value.is_default',
           'default' => '0',
           'table_name' => 'civicrm_price_field_value',
@@ -489,6 +490,7 @@ class CRM_Price_DAO_PriceFieldValue extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Price Field Value is Active'),
           'description' => ts('Is this price field value active'),
+          'required' => TRUE,
           'where' => 'civicrm_price_field_value.is_active',
           'default' => '1',
           'table_name' => 'civicrm_price_field_value',

diff --git a/CRM/Price/DAO/PriceSet.php b/CRM/Price/DAO/PriceSet.php
index e434d718b568bb9ba769ded8a8a865f83f9e737f..d9006795a2f340ba5e456e5d968561778dd4ab3b 100644 (file)
--- a/CRM/Price/DAO/PriceSet.php
+++ b/CRM/Price/DAO/PriceSet.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Price/PriceSet.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:128263766d018b5c021df384b3ab6c92)
+ * (GenCodeChecksum:1aec76208959c72965733e217aaf1fc1)
  */
 
 /**
@@ -70,7 +70,7 @@ class CRM_Price_DAO_PriceSet extends CRM_Core_DAO {
   /**
    * Is this price set active
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -124,7 +124,7 @@ class CRM_Price_DAO_PriceSet extends CRM_Core_DAO {
   /**
    * Is set if edited on Contribution or Event Page rather than through Manage Price Sets
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -133,7 +133,7 @@ class CRM_Price_DAO_PriceSet extends CRM_Core_DAO {
   /**
    * Is this a predefined system price set  (i.e. it can not be deleted, edited)?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -272,6 +272,7 @@ class CRM_Price_DAO_PriceSet extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Price Set Is Active?'),
           'description' => ts('Is this price set active'),
+          'required' => TRUE,
           'where' => 'civicrm_price_set.is_active',
           'default' => '1',
           'table_name' => 'civicrm_price_set',
@@ -385,6 +386,7 @@ class CRM_Price_DAO_PriceSet extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Is Price Set Quick Config?'),
           'description' => ts('Is set if edited on Contribution or Event Page rather than through Manage Price Sets'),
+          'required' => TRUE,
           'where' => 'civicrm_price_set.is_quick_config',
           'default' => '0',
           'table_name' => 'civicrm_price_set',
@@ -401,6 +403,7 @@ class CRM_Price_DAO_PriceSet extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Price Set Is Reserved'),
           'description' => ts('Is this a predefined system price set  (i.e. it can not be deleted, edited)?'),
+          'required' => TRUE,
           'where' => 'civicrm_price_set.is_reserved',
           'default' => '0',
           'table_name' => 'civicrm_price_set',

diff --git a/CRM/Report/DAO/ReportInstance.php b/CRM/Report/DAO/ReportInstance.php
index f5ce8c71717caec3f69f51aebd1402b0f79a78e3..69b1eac776f386e1594f3164649071bd462adeab 100644 (file)
--- a/CRM/Report/DAO/ReportInstance.php
+++ b/CRM/Report/DAO/ReportInstance.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Report/ReportInstance.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0cc1db696d0899940ac62d266cb55a0a)
+ * (GenCodeChecksum:588c8712caae98e6765ac8ed21c9e6b2)
  */
 
 /**
@@ -131,7 +131,7 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO {
   /**
    * Is this entry active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -219,7 +219,7 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO {
   public $drilldown_id;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -449,7 +449,9 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Report Instance is Active'),
           'description' => ts('Is this entry active?'),
+          'required' => TRUE,
           'where' => 'civicrm_report_instance.is_active',
+          'default' => '1',
           'table_name' => 'civicrm_report_instance',
           'entity' => 'ReportInstance',
           'bao' => 'CRM_Report_BAO_ReportInstance',
@@ -612,6 +614,7 @@ class CRM_Report_DAO_ReportInstance extends CRM_Core_DAO {
           'name' => 'is_reserved',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Instance is Reserved'),
+          'required' => TRUE,
           'where' => 'civicrm_report_instance.is_reserved',
           'default' => '0',
           'table_name' => 'civicrm_report_instance',

diff --git a/CRM/SMS/DAO/Provider.php b/CRM/SMS/DAO/Provider.php
index 290bcf09559197ba6df8d481384d79b0a163f8f7..4605f19e5cc0573848108ae95c1a983d3e7878a7 100644 (file)
--- a/CRM/SMS/DAO/Provider.php
+++ b/CRM/SMS/DAO/Provider.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/SMS/Provider.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0fc3229e1bb7ff0e9203e6c5c7ba3d6a)
+ * (GenCodeChecksum:77bb8b25b596507446974d9dd3bd4c8e)
  */
 
 /**
@@ -97,14 +97,14 @@ class CRM_SMS_DAO_Provider extends CRM_Core_DAO {
   public $api_params;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
   public $is_default;
 
   /**
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -295,6 +295,7 @@ class CRM_SMS_DAO_Provider extends CRM_Core_DAO {
           'name' => 'is_default',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('SMS Provider is Default?'),
+          'required' => TRUE,
           'where' => 'civicrm_sms_provider.is_default',
           'default' => '0',
           'table_name' => 'civicrm_sms_provider',
@@ -310,8 +311,9 @@ class CRM_SMS_DAO_Provider extends CRM_Core_DAO {
           'name' => 'is_active',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('SMS Provider is Active?'),
+          'required' => TRUE,
           'where' => 'civicrm_sms_provider.is_active',
-          'default' => '0',
+          'default' => '1',
           'table_name' => 'civicrm_sms_provider',
           'entity' => 'Provider',
           'bao' => 'CRM_SMS_BAO_Provider',

diff --git a/CRM/Upgrade/Incremental/php/FiveFortyNine.php b/CRM/Upgrade/Incremental/php/FiveFortyNine.php
index 6b570a6f046892ae96571d2dc397523501ade08c..0a4c026484c91729917215e80135e02892f99cee 100644 (file)
--- a/CRM/Upgrade/Incremental/php/FiveFortyNine.php
+++ b/CRM/Upgrade/Incremental/php/FiveFortyNine.php
@@ -60,6 +60,315 @@ class CRM_Upgrade_Incremental_php_FiveFortyNine extends CRM_Upgrade_Incremental_
       'is_active' => "DEFAULT 1 COMMENT 'Is this property active?'",
       'is_default' => "DEFAULT 0 COMMENT 'Is this account the default one (or default tax one) for its financial_account_type?'",
     ],
+    'civicrm_premiums' => [
+      'premiums_display_min_contribution' => 'DEFAULT 0',
+    ],
+    'civicrm_membership_status' => [
+      'is_current_member' => "DEFAULT 0 COMMENT 'Does this status aggregate to current members (e.g. New, Renewed, Grace might all be TRUE... while Unrenewed, Lapsed, Inactive would be FALSE).'",
+      'is_admin' => "DEFAULT 0 COMMENT 'Is this status for admin/manual assignment only.'",
+      'is_default' => "DEFAULT 0 COMMENT 'Assign this status to a membership record if no other status match is found.'",
+      'is_active' => "DEFAULT 1 COMMENT 'Is this membership_status enabled.'",
+      'is_reserved' => "DEFAULT 0 COMMENT 'Is this membership_status reserved.'",
+    ],
+    'civicrm_campaign' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is this Campaign enabled or disabled/cancelled?'",
+    ],
+    'civicrm_survey' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is this survey enabled or disabled/cancelled?'",
+      'is_default' => "DEFAULT 0 COMMENT 'Is this default survey?'",
+      'bypass_confirm' => "DEFAULT 0 COMMENT 'Bypass the email verification.'",
+      'is_share' => "DEFAULT 1 COMMENT 'Can people share the petition through social media?'",
+    ],
+    'civicrm_participant_status_type' => [
+      'is_reserved' => "DEFAULT 0 COMMENT 'whether this is a status type required by the system'",
+      'is_active' => "DEFAULT 1 COMMENT 'whether this status type is active'",
+      'is_counted' => "DEFAULT 0 COMMENT 'whether this status type is counted against event size limit'",
+    ],
+    'civicrm_event_carts' => [
+      'completed' => "DEFAULT 0",
+    ],
+    'civicrm_dedupe_rule_group' => [
+      'is_reserved' => "DEFAULT 0 COMMENT 'Is this a reserved rule - a rule group that has been optimized and cannot be changed by the admin'",
+    ],
+    'civicrm_case_type' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is this case type enabled?'",
+      'is_reserved' => "DEFAULT 0 COMMENT 'Is this case type a predefined system type?'",
+    ],
+    'civicrm_tell_friend' => [
+      'is_active' => "DEFAULT 1",
+    ],
+    'civicrm_pledge_block' => [
+      'is_pledge_interval' => "DEFAULT 0 COMMENT 'Is frequency interval exposed on the contribution form.'",
+    ],
+    'civicrm_pcp' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is Personal Campaign Page enabled/active?'",
+      'is_notify' => "DEFAULT 0 COMMENT 'Notify owner via email when someone donates to page?'",
+    ],
+    'civicrm_cxn' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is connection currently enabled?'",
+    ],
+    'civicrm_contribution_page' => [
+      'is_credit_card_only' => "DEFAULT 0 COMMENT 'if true - processing logic must reject transaction at confirmation stage if pay method != credit card'",
+      'is_monetary' => "DEFAULT 1 COMMENT 'if true - allows real-time monetary transactions otherwise non-monetary transactions'",
+      'is_recur' => "DEFAULT 0 COMMENT 'if true - allows recurring contributions, valid only for PayPal_Standard'",
+      'is_confirm_enabled' => "DEFAULT 1 COMMENT 'if false, the confirm page in contribution pages gets skipped'",
+      'is_recur_interval' => "DEFAULT 0 COMMENT 'if true - supports recurring intervals'",
+      'is_recur_installments' => "DEFAULT 0 COMMENT 'if true - asks user for recurring installments'",
+      'adjust_recur_start_date' => "DEFAULT 0 COMMENT 'if true - user is able to adjust payment start date'",
+      'is_pay_later' => "DEFAULT 0 COMMENT 'if true - allows the user to send payment directly to the org later'",
+      'is_allow_other_amount' => "DEFAULT 0 COMMENT 'if true, page will include an input text field where user can enter their own amount'",
+      'is_email_receipt' => "DEFAULT 0 COMMENT 'if true, receipt is automatically emailed to contact on success'",
+      'is_active' => "DEFAULT 1 COMMENT 'Is this property active?'",
+      'amount_block_is_active' => "DEFAULT 1 COMMENT 'Is this property active?'",
+      'is_share' => "DEFAULT 1 COMMENT 'Can people share the contribution page through social media?'",
+      'is_billing_required' => "DEFAULT 0 COMMENT 'if true - billing block is required for online contribution page'",
+    ],
+    'civicrm_contribution_widget' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is this property active?'",
+    ],
+    'civicrm_payment_processor' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is this processor active?'",
+      'is_default' => "DEFAULT 0 COMMENT 'Is this processor the default?'",
+      'is_test' => "DEFAULT 0 COMMENT 'Is this processor for a test site?'",
+      'is_recur' => "DEFAULT 0 COMMENT 'Can process recurring contributions'",
+    ],
+    'civicrm_sms_provider' => [
+      'is_default' => "DEFAULT 0",
+      'is_active' => "DEFAULT 1",
+    ],
+    'civicrm_membership_block' => [
+      'display_min_fee' => "DEFAULT 1 COMMENT 'Display minimum membership fee'",
+      'is_separate_payment' => "DEFAULT 1 COMMENT 'Should membership transactions be processed separately'",
+      'is_required' => "DEFAULT 0 COMMENT 'Is membership sign up optional'",
+      'is_active' => "DEFAULT 1 COMMENT 'Is this membership_block enabled'",
+    ],
+    'civicrm_case' => [
+      'is_deleted' => "DEFAULT 0",
+    ],
+    'civicrm_report_instance' => [
+      'is_active' => "DEFAULT 0 COMMENT 'Is this entry active?'",
+      'is_reserved' => "DEFAULT 0",
+    ],
+    'civicrm_price_set' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is this price set active'",
+      'is_quick_config' => "DEFAULT 0 COMMENT 'Is set if edited on Contribution or Event Page rather than through Manage Price Sets'",
+      'is_reserved' => "DEFAULT 0 COMMENT 'Is this a predefined system price set  (i.e. it can not be deleted, edited)?'",
+    ],
+    'civicrm_dashboard_contact' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is this widget active?'",
+    ],
+    'civicrm_mailing' => [
+      'url_tracking' => "DEFAULT 0 COMMENT 'Should we track URL click-throughs for this mailing?'",
+      'forward_replies' => "DEFAULT 0 COMMENT 'Should we forward replies back to the author?'",
+      'auto_responder' => "DEFAULT 0 COMMENT 'Should we enable the auto-responder?'",
+      'open_tracking' => "DEFAULT 0 COMMENT 'Should we track when recipients open/read this mailing?'",
+      'is_completed' => "DEFAULT 0 COMMENT 'Has at least one job associated with this mailing finished?'",
+      'override_verp' => "DEFAULT 0 COMMENT 'Overwrite the VERP address in Reply-To'",
+      'is_archived' => "DEFAULT 0 COMMENT 'Is this mailing archived?'",
+      'dedupe_email' => "DEFAULT 0 COMMENT 'Remove duplicate emails?'",
+    ],
+    'civicrm_mailing_job' => [
+      'is_test' => "DEFAULT 0 COMMENT 'Is this job for a test mail?'",
+    ],
+    'civicrm_contribution_recur' => [
+      'is_test' => "DEFAULT 0",
+      'is_email_receipt' => "DEFAULT 1 COMMENT 'if true, receipt is automatically emailed to contact on each successful payment'",
+    ],
+    'civicrm_membership' => [
+      'is_override' => "DEFAULT 0 COMMENT 'Admin users may set a manual status which overrides the calculated status. When this flag is true, automated status update scripts should NOT modify status for the record.'",
+      'is_test' => "DEFAULT 0",
+      'is_pay_later' => "DEFAULT 0",
+    ],
+    'civicrm_activity' => [
+      'is_test' => "DEFAULT 0",
+      'is_auto' => "DEFAULT 0",
+      'is_current_revision' => "DEFAULT 1",
+      'is_deleted' => "DEFAULT 0",
+      'is_star' => "DEFAULT 0 COMMENT 'Activity marked as favorite.'",
+    ],
+    'civicrm_price_field' => [
+      'is_enter_qty' => "DEFAULT 0 COMMENT 'Enter a quantity for this field?'",
+      'is_display_amounts' => "DEFAULT 1 COMMENT 'Should the price be displayed next to the label for each option?'",
+      'is_active' => "DEFAULT 1 COMMENT 'Is this price field active'",
+      'is_required' => "DEFAULT 1 COMMENT 'Is this price field required (value must be > 1)'",
+    ],
+    'civicrm_price_field_value' => [
+      'is_default' => "DEFAULT 0 COMMENT 'Is this default price field option'",
+      'is_active' => "DEFAULT 1 COMMENT 'Is this price field value active'",
+    ],
+    'civicrm_pcp_block' => [
+      'is_approval_needed' => "DEFAULT 0 COMMENT 'Does Personal Campaign Page require manual activation by administrator? (is inactive by default after setup)?'",
+      'is_tellfriend_enabled' => "DEFAULT 0 COMMENT 'Does Personal Campaign Page allow using tell a friend?'",
+      'is_active' => "DEFAULT 1 COMMENT 'Is Personal Campaign Page Block enabled/active?'",
+    ],
+    'civicrm_contribution_soft' => [
+      'pcp_display_in_roll' => "DEFAULT 0",
+    ],
+    'civicrm_participant' => [
+      'is_test' => "DEFAULT 0",
+      'is_pay_later' => "DEFAULT 0",
+    ],
+    'civicrm_msg_template' => [
+      'is_active' => "DEFAULT 1",
+      'is_default' => "DEFAULT 1 COMMENT 'is this the default message template for the workflow referenced by workflow_id?'",
+      'is_reserved' => "DEFAULT 0 COMMENT 'is this the reserved message template which we ship for the workflow referenced by workflow_id?'",
+      'is_sms' => "DEFAULT 0 COMMENT 'Is this message template used for sms?'",
+    ],
+    'civicrm_prevnext_cache' => [
+      'is_selected' => "DEFAULT 0",
+    ],
+    'civicrm_contact' => [
+      'do_not_email' => "DEFAULT 0",
+      'do_not_phone' => "DEFAULT 0",
+      'do_not_mail' => "DEFAULT 0",
+      'do_not_sms' => "DEFAULT 0",
+      'do_not_trade' => "DEFAULT 0",
+    ],
+    'civicrm_relationship_type' => [
+      'is_reserved' => "DEFAULT 0 COMMENT 'Is this relationship type a predefined system type (can not be changed or de-activated)?'",
+      'is_active' => "DEFAULT 1 COMMENT 'Is this relationship type currently active (i.e. can be used when creating or editing relationships)?'",
+    ],
+    'civicrm_contact_type' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is this entry active?'",
+      'is_reserved' => "DEFAULT 0 COMMENT 'Is this contact type a predefined system type'",
+    ],
+    'civicrm_mailing_component' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is this property active?'",
+    ],
+    'civicrm_country' => [
+      'is_province_abbreviated' => "DEFAULT 0 COMMENT 'Should state/province be displayed as abbreviation for contacts from this country?'",
+      'is_active' => "DEFAULT 1 COMMENT 'Is this Country active?'",
+    ],
+    'civicrm_custom_group' => [
+      'collapse_display' => "DEFAULT 0 COMMENT 'Will this group be in collapsed or expanded mode on initial display ?'",
+      'is_active' => "DEFAULT 1 COMMENT 'Is this property active?'",
+      'is_multiple' => "DEFAULT 0 COMMENT 'Does this group hold multiple values?'",
+      'collapse_adv_display' => "DEFAULT 0 COMMENT 'Will this group be in collapsed or expanded mode on advanced search display ?'",
+      'is_reserved' => "DEFAULT 0 COMMENT 'Is this a reserved Custom Group?'",
+      'is_public' => "DEFAULT 1 COMMENT 'Is this property public?'",
+    ],
+    'civicrm_custom_field' => [
+      'is_required' => "DEFAULT 0 COMMENT 'Is a value required for this property.'",
+      'is_searchable' => "DEFAULT 0 COMMENT 'Is this property searchable.'",
+      'is_search_range' => "DEFAULT 0 COMMENT 'Is this property range searchable.'",
+      'is_view' => "DEFAULT 0 COMMENT 'Is this property set by PHP Code? A code field is viewable but not editable'",
+      'in_selector' => "DEFAULT 0 COMMENT 'Should the multi-record custom field values be displayed in tab table listing'",
+    ],
+    'civicrm_email' => [
+      'is_primary' => "DEFAULT 0 COMMENT 'Is this the primary email address'",
+      'is_billing' => "DEFAULT 0 COMMENT 'Is this the billing?'",
+    ],
+    'civicrm_im' => [
+      'is_primary' => "DEFAULT 0 COMMENT 'Is this the primary IM for this contact and location.'",
+      'is_billing' => "DEFAULT 0 COMMENT 'Is this the billing?'",
+    ],
+    'civicrm_job' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is this job active?'",
+    ],
+    'civicrm_mail_settings' => [
+      'is_default' => "DEFAULT 0 COMMENT 'whether this is the default set of settings for this domain'",
+      'is_ssl' => "DEFAULT 1 COMMENT 'whether to use SSL or not'",
+      'is_non_case_email_skipped' => "DEFAULT 0 COMMENT 'Enabling this option will have CiviCRM skip any emails that do not have the Case ID or Case Hash so that the system will only process emails that can be placed on case records. Any emails that are not processed will be moved to the ignored folder.'",
+      'is_contact_creation_disabled_if_no_match' => "DEFAULT 0",
+    ],
+    'civicrm_menu' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is this menu item active?'",
+      'is_public' => "DEFAULT 1 COMMENT 'Is this menu accessible to the public?'",
+      'is_exposed' => "DEFAULT 1 COMMENT 'Is this menu exposed to the navigation system?'",
+      'is_ssl' => "DEFAULT 1 COMMENT 'Should this menu be exposed via SSL if enabled?'",
+      'skipBreadcrumb' => "DEFAULT 0 COMMENT 'skip this url being exposed to breadcrumb'",
+    ],
+    'civicrm_phone' => [
+      'is_primary' => "DEFAULT 0 COMMENT 'Is this the primary phone for this contact and location.'",
+      'is_billing' => "DEFAULT 0 COMMENT 'Is this the billing?'",
+    ],
+    'civicrm_state_province' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is this StateProvince active?'",
+    ],
+    'civicrm_tag' => [
+      'is_selectable' => "DEFAULT 1 COMMENT 'Is this tag selectable / displayed'",
+      'is_reserved' => "DEFAULT 0",
+      'is_tagset' => "DEFAULT 0",
+    ],
+    'civicrm_openid' => [
+      'is_primary' => "DEFAULT 0 COMMENT 'Is this the primary email for this contact and location.'",
+    ],
+    'civicrm_setting' => [
+      'is_domain' => "DEFAULT 0 COMMENT 'Is this setting a contact specific or site wide setting?'",
+    ],
+    'civicrm_print_label' => [
+      'is_default' => "DEFAULT 1 COMMENT 'Is this default?'",
+      'is_active' => "DEFAULT 1 COMMENT 'Is this option active?'",
+      'is_reserved' => "DEFAULT 1 COMMENT 'Is this reserved label?'",
+    ],
+    'civicrm_word_replacement' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is this entry active?'",
+    ],
+    'civicrm_status_pref' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is this status check active?'",
+    ],
+    'civicrm_group' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is this entry active?'",
+      'is_hidden' => "DEFAULT 0 COMMENT 'Is this group hidden?'",
+      'is_reserved' => "DEFAULT 0",
+    ],
+    'civicrm_report_instance' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is this entry active?'",
+    ],
+    'civicrm_county' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is this County active?'",
+    ],
+    'civicrm_dashboard' => [
+      'is_active' => "DEFAULT 0 COMMENT 'Is this dashlet active?'",
+      'is_reserved' => "DEFAULT 0 COMMENT 'Is this dashlet reserved?'",
+    ],
+    'civicrm_uf_group' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is this form currently active? If false, hide all related fields for all sharing contexts.'",
+      'add_captcha' => "DEFAULT 0 COMMENT 'Should a CAPTCHA widget be included this Profile form.'",
+      'is_map' => "DEFAULT 0 COMMENT 'Do we want to map results from this profile.'",
+      'is_edit_link' => "DEFAULT 0 COMMENT 'Should edit link display in profile selector'",
+      'is_uf_link' => "DEFAULT 0 COMMENT 'Should we display a link to the website profile in profile selector'",
+      'is_update_dupe' => "DEFAULT 0 COMMENT 'Should we update the contact record if we find a duplicate'",
+      'is_cms_user' => "DEFAULT 0 COMMENT 'Should we create a cms user for this profile '",
+      'is_reserved' => "DEFAULT 0 COMMENT 'Is this group reserved for use by some other CiviCRM functionality?'",
+      'is_proximity_search' => "DEFAULT 0 COMMENT 'Should we include proximity search feature in this profile search form?'",
+      'add_cancel_button' => "DEFAULT 1 COMMENT 'Should a Cancel button be included in this Profile form.'",
+    ],
+    'civicrm_uf_field' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is this field currently shareable? If false, hide the field for all sharing contexts.'",
+      'is_view' => "DEFAULT 0 COMMENT 'the field is view only and not editable in user forms.'",
+      'is_required' => "DEFAULT 0 COMMENT 'Is this field required when included in a user or registration form?'",
+      'in_selector' => "DEFAULT 0 COMMENT 'Is this field included as a column in the selector table?'",
+      'is_searchable' => "DEFAULT 0 COMMENT 'Is this field included search form of profile?'",
+      'is_reserved' => "DEFAULT 0 COMMENT 'Is this field reserved for use by some other CiviCRM functionality?'",
+      'is_multi_summary' => "DEFAULT 0 COMMENT 'Include in multi-record listing?'",
+    ],
+    'civicrm_uf_join' => [
+      'is_active' => "DEFAULT 1 COMMENT 'Is this join currently active?'",
+    ],
+    'civicrm_action_schedule' => [
+      'limit_to' => "DEFAULT 1 COMMENT 'Is this the recipient criteria limited to OR in addition to?'",
+      'is_repeat' => "DEFAULT 0",
+      'is_active' => "DEFAULT 1 COMMENT 'Is this option active?'",
+      'record_activity' => "DEFAULT 0 COMMENT 'Record Activity for this reminder?'",
+    ],
+    'civicrm_action_log' => [
+      'is_error' => "DEFAULT 0 COMMENT 'Was there any error sending the reminder?'",
+    ],
+    'civicrm_relationship' => [
+      'is_active' => "DEFAULT 1 COMMENT 'is the relationship active ?'",
+    ],
+    'civicrm_relationship_cache' => [
+      'is_active' => "DEFAULT 1 COMMENT 'is the relationship active ?'",
+    ],
+    'civicrm_financial_trxn' => [
+      'is_payment' => "DEFAULT 0 COMMENT 'Is this entry either a payment or a reversal of a payment?'",
+    ],
+    'civicrm_address' => [
+      'is_primary' => "DEFAULT 0 COMMENT 'Is this the primary address.'",
+      'is_billing' => "DEFAULT 0 COMMENT 'Is this the billing address.'",
+      'manual_geo_code' => "DEFAULT 0 COMMENT 'Is this a manually entered geo code'",
+    ],
   ];
 
   /**

diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
index 0d1cc1dee1e94135ee8109dfbfc9b403e52cd782..cc934057883b97514b174868b1ebd6c947dc6362 100644 (file)
--- a/sql/civicrm_generated.mysql
+++ b/sql/civicrm_generated.mysql
@@ -4249,8 +4249,8 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_mail_settings` WRITE;
 /*!40000 ALTER TABLE `civicrm_mail_settings` DISABLE KEYS */;
-INSERT INTO `civicrm_mail_settings` (`id`, `domain_id`, `name`, `is_default`, `domain`, `localpart`, `return_path`, `protocol`, `server`, `port`, `username`, `password`, `is_ssl`, `source`, `activity_status`, `is_non_case_email_skipped`, `is_contact_creation_disabled_if_no_match`) VALUES
- (1,1,'default',1,'EXAMPLE.ORG',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0);
+INSERT INTO `civicrm_mail_settings` (`id`, `domain_id`, `name`, `is_default`, `domain`, `localpart`, `return_path`, `protocol`, `server`, `port`, `username`, `password`, `source`, `activity_status`, `is_non_case_email_skipped`, `is_contact_creation_disabled_if_no_match`) VALUES
+ (1,1,'default',1,'EXAMPLE.ORG',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0);
 /*!40000 ALTER TABLE `civicrm_mail_settings` ENABLE KEYS */;
 UNLOCK TABLES;
 

diff --git a/tests/phpunit/CRM/Member/BAO/MembershipTest.php b/tests/phpunit/CRM/Member/BAO/MembershipTest.php
index 8df9749e31f36b9bcacb12cba6445c29871053d5..616998c9c0b50ccfdb2b18e9a51d507192a7b39c 100644 (file)
--- a/tests/phpunit/CRM/Member/BAO/MembershipTest.php
+++ b/tests/phpunit/CRM/Member/BAO/MembershipTest.php
@@ -622,7 +622,6 @@ class CRM_Member_BAO_MembershipTest extends CiviUnitTestCase {
     ])['values'][0];
 
     $this->assertEquals($createdMembershipID, $membershipAfterProcess['id']);
-    $this->assertArrayNotHasKey('is_override', $membershipAfterProcess);
     $this->assertArrayNotHasKey('status_override_end_date', $membershipAfterProcess);
   }
 
@@ -654,7 +653,6 @@ class CRM_Member_BAO_MembershipTest extends CiviUnitTestCase {
     ])['values'][0];
 
     $this->assertEquals($createdMembershipID, $membershipAfterProcess['id']);
-    $this->assertArrayNotHasKey('is_override', $membershipAfterProcess);
     $this->assertArrayNotHasKey('status_override_end_date', $membershipAfterProcess);
   }
 

diff --git a/tests/phpunit/api/v3/dataset/location_type_data.xml b/tests/phpunit/api/v3/dataset/location_type_data.xml
index cabc6996c20b9901577cdf023e7e5967bd3a76d4..770cf05a5e0f5a8c65f6ab06f234b82766287fbf 100644 (file)
--- a/tests/phpunit/api/v3/dataset/location_type_data.xml
+++ b/tests/phpunit/api/v3/dataset/location_type_data.xml
@@ -25,7 +25,7 @@
       <value>Work location</value>             <!--  description  -->
       <value>0</value>                         <!--  is_reserved  -->
       <value>1</value>                         <!--  is_active  -->
-      <null />                                 <!--  is_default  -->
+      <value>0</value>                         <!--  is_default  -->
     </row>
     <row>
       <value>3</value>                         <!--  id  -->
@@ -34,7 +34,7 @@
       <value>Main office location</value>      <!--  description  -->
       <value>0</value>                         <!--  is_reserved  -->
       <value>1</value>                         <!--  is_active  -->
-      <null />                                 <!--  is_default  -->
+      <value>0</value>                         <!--  is_default  -->
     </row>
     <row>
       <value>4</value>                         <!--  id  -->
@@ -43,7 +43,7 @@
       <value>Other location</value>            <!--  description  -->
       <value>0</value>                         <!--  is_reserved  -->
       <value>0</value>                         <!--  is_active  -->
-      <null />                                 <!--  is_default  -->
+      <value>0</value>                         <!--  is_default  -->
     </row>
     <row>
       <value>5</value>                         <!--  id  -->
@@ -52,7 +52,7 @@
       <value>Billing Address location</value>  <!--  description  -->
       <value>1</value>                         <!--  is_reserved  -->
       <value>1</value>                         <!--  is_active  -->
-      <null />                                 <!--  is_default  -->
+      <value>0</value>                         <!--  is_default  -->
     </row>
   </table>
 </dataset>

diff --git a/xml/schema/ACL/ACLEntityRole.xml b/xml/schema/ACL/ACLEntityRole.xml
index f2648d445d634ad4d48a7a0d3b89daf2ebb2f8ac..d4bab2912e23b7ab8f5d670988fe630526461d57 100644 (file)
--- a/xml/schema/ACL/ACLEntityRole.xml
+++ b/xml/schema/ACL/ACLEntityRole.xml
@@ -62,6 +62,8 @@
     <title>ACL Entity Role is Active</title>
     <type>boolean</type>
     <comment>Is this property active?</comment>
+    <default>0</default>
+    <required>true</required>
     <add>1.6</add>
   </field>
   <index>

diff --git a/xml/schema/Activity/Activity.xml b/xml/schema/Activity/Activity.xml
index 7a3611411958fcaa196ea6b144ac409fbe7f1fef..cf4fce76fbf7f56b2f2bf9912598832d02e521d5 100644 (file)
--- a/xml/schema/Activity/Activity.xml
+++ b/xml/schema/Activity/Activity.xml
@@ -237,6 +237,7 @@
     <uniqueName>activity_is_test</uniqueName>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <import>true</import>
     <headerPattern>/(is.)?test(.activity)?/i</headerPattern>
     <add>2.0</add>
@@ -270,6 +271,7 @@
     <title>Auto</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <add>2.2</add>
   </field>
   <field>
@@ -294,6 +296,7 @@
     <title>Is this activity a current revision in versioning chain?</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <import>true</import>
     <headerPattern>/(is.)?(current.)?(revision|version(ing)?)/i</headerPattern>
     <add>2.2</add>
@@ -336,6 +339,7 @@
     <title>Activity is in the Trash</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <import>true</import>
     <headerPattern>/(activity.)?(trash|deleted)/i</headerPattern>
     <add>2.2</add>
@@ -400,6 +404,7 @@
     <title>Is Starred</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <import>true</import>
     <comment>Activity marked as favorite.</comment>
     <headerPattern>/(activity.)?(star|favorite)/i</headerPattern>

diff --git a/xml/schema/Campaign/Campaign.xml b/xml/schema/Campaign/Campaign.xml
index 0b6000960a36f7376fbf50f24b28d1dda816dd9a..ffd14e8e1344b8bcbaf5b52f88a14eaced061bcd 100644 (file)
--- a/xml/schema/Campaign/Campaign.xml
+++ b/xml/schema/Campaign/Campaign.xml
@@ -192,6 +192,7 @@
     <title>Is Campaign Active?</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Is this Campaign enabled or disabled/cancelled?</comment>
     <add>3.3</add>
     <html>

diff --git a/xml/schema/Campaign/Survey.xml b/xml/schema/Campaign/Survey.xml
index 0433f898b57cbe3ade2d90fe781bdee570803942..612af5993277eed326c8fe84a7d244e0d29beba7 100644 (file)
--- a/xml/schema/Campaign/Survey.xml
+++ b/xml/schema/Campaign/Survey.xml
@@ -142,6 +142,7 @@
     <title>Survey Is Active</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Is this survey enabled or disabled/cancelled?</comment>
     <add>3.3</add>
   </field>
@@ -151,6 +152,7 @@
     <title>Is Default Survey</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Is this default survey?</comment>
     <add>3.3</add>
   </field>
@@ -227,6 +229,7 @@
     <title>No Email Verification</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Bypass the email verification.</comment>
     <add>4.2</add>
   </field>
@@ -257,6 +260,7 @@
     <title>Is shared through social media</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Can people share the petition through social media?</comment>
     <add>4.4</add>
   </field>

diff --git a/xml/schema/Case/Case.xml b/xml/schema/Case/Case.xml
index acc66e4ede1f9eaf94268b1002c9a19ed17688d2..d26e06f56a96e9334405ad50bd023d999a48a696 100644 (file)
--- a/xml/schema/Case/Case.xml
+++ b/xml/schema/Case/Case.xml
@@ -131,6 +131,7 @@
     <uniqueName>case_deleted</uniqueName>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <import>true</import>
     <html>
       <type>CheckBox</type>

diff --git a/xml/schema/Case/CaseType.xml b/xml/schema/Case/CaseType.xml
index ba361ba9e1abe45e2f87f924b796e9ea9c09dd93..3c8a18ff5559d9f51b8b3cff315097d76e22fd93 100644 (file)
--- a/xml/schema/Case/CaseType.xml
+++ b/xml/schema/Case/CaseType.xml
@@ -62,12 +62,15 @@
     <type>boolean</type>
     <comment>Is this case type enabled?</comment>
     <default>1</default>
+    <required>true</required>
     <add>4.5</add>
   </field>
   <field>
     <name>is_reserved</name>
     <title>Case Type Is Reserved</title>
     <type>boolean</type>
+    <default>0</default>
+    <required>true</required>
     <comment>Is this case type a predefined system type?</comment>
     <add>4.5</add>
   </field>

diff --git a/xml/schema/Contact/Contact.xml b/xml/schema/Contact/Contact.xml
index 4030373fc27fdd767f921e1b2243658918b44497..6ebb5f7df9adb0c112032679bd594cd98f1e98b5 100644 (file)
--- a/xml/schema/Contact/Contact.xml
+++ b/xml/schema/Contact/Contact.xml
@@ -93,6 +93,7 @@
     <headerPattern>/d(o )?(not )?(email)/i</headerPattern>
     <dataPattern>/^\d{1,}$/</dataPattern>
     <default>0</default>
+    <required>true</required>
     <html>
       <type>CheckBox</type>
       <label>Do Not Email</label>
@@ -103,6 +104,7 @@
     <name>do_not_phone</name>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <import>true</import>
     <headerPattern>/d(o )?(not )?(call|phone)/i</headerPattern>
     <dataPattern>/^\d{1,}$/</dataPattern>
@@ -119,6 +121,7 @@
     <headerPattern>/^(d(o\s)?n(ot\s)?mail)|(\w*)?bulk\s?(\w*)$/i</headerPattern>
     <dataPattern>/^\d{1,}$/</dataPattern>
     <default>0</default>
+    <required>true</required>
     <add>1.1</add>
     <html>
       <type>CheckBox</type>
@@ -132,6 +135,7 @@
     <headerPattern>/d(o )?(not )?(sms)/i</headerPattern>
     <dataPattern>/^\d{1,}$/</dataPattern>
     <default>0</default>
+    <required>true</required>
     <add>3.0</add>
     <html>
       <type>CheckBox</type>
@@ -145,6 +149,7 @@
     <headerPattern>/d(o )?(not )?(trade)/i</headerPattern>
     <dataPattern>/^\d{1,}$/</dataPattern>
     <default>0</default>
+    <required>true</required>
     <add>1.1</add>
     <html>
       <type>CheckBox</type>
@@ -156,6 +161,7 @@
     <type>boolean</type>
     <title>No Bulk Emails (User Opt Out)</title>
     <default>0</default>
+    <required>true</required>
     <import>true</import>
     <required>true</required>
     <comment>Has the contact opted out from receiving all bulk email from the organization or site domain?</comment>

diff --git a/xml/schema/Contact/ContactType.xml b/xml/schema/Contact/ContactType.xml
index 264da30c3dc1e7735c2e287e71283bbb6ef4dda6..b9fe0b75b5720c0cb257a4eceb584ae59d69051b 100644 (file)
--- a/xml/schema/Contact/ContactType.xml
+++ b/xml/schema/Contact/ContactType.xml
@@ -104,6 +104,7 @@
     <title>Contact Type Is Active?</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Is this entry active?</comment>
     <add>3.1</add>
   </field>
@@ -112,6 +113,7 @@
     <title>Contact Type is Reserved?</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Is this contact type a predefined system type</comment>
     <add>3.1</add>
   </field>

diff --git a/xml/schema/Contact/DashboardContact.xml b/xml/schema/Contact/DashboardContact.xml
index 9a9a128e50e25ae131ba2bf4a11bf73c2ed9b3ec..eda7bb078fee5df353315a5bc0248a0f831faad8 100644 (file)
--- a/xml/schema/Contact/DashboardContact.xml
+++ b/xml/schema/Contact/DashboardContact.xml
@@ -79,6 +79,7 @@
     <title>Dashlet is Minimized?</title>
     <comment>Is Minimized?</comment>
     <default>0</default>
+    <required>true</required>
     <add>3.1</add>
     <drop>4.7</drop>
   </field>
@@ -88,6 +89,7 @@
     <title>Dashlet is FullScreen?</title>
     <comment>Is Fullscreen?</comment>
     <default>1</default>
+    <required>true</required>
     <add>3.1</add>
     <drop>4.7</drop>
   </field>
@@ -96,7 +98,8 @@
     <type>boolean</type>
     <title>Dashlet is Active?</title>
     <comment>Is this widget active?</comment>
-    <default>0</default>
+    <default>1</default>
+    <required>true</required>
     <add>3.1</add>
   </field>
   <field>

diff --git a/xml/schema/Contact/Group.xml b/xml/schema/Contact/Group.xml
index 945c805cf2de3a0774ead8f5953bfd16bce0444c..ad0a6569f2702f5f2234fd8a62db785a05b82c30 100644 (file)
--- a/xml/schema/Contact/Group.xml
+++ b/xml/schema/Contact/Group.xml
@@ -90,6 +90,8 @@
   <field>
     <name>is_active</name>
     <type>boolean</type>
+    <default>1</default>
+    <required>true</required>
     <title>Group Enabled</title>
     <comment>Is this entry active?</comment>
     <add>1.1</add>
@@ -193,6 +195,7 @@
     <type>boolean</type>
     <title>Group is Hidden</title>
     <default>0</default>
+    <required>true</required>
     <comment>Is this group hidden?</comment>
     <add>2.2</add>
   </field>
@@ -201,6 +204,7 @@
     <type>boolean</type>
     <title>Group is Reserved</title>
     <default>0</default>
+    <required>true</required>
     <add>4.2</add>
   </field>
   <index>

diff --git a/xml/schema/Contact/Relationship.xml b/xml/schema/Contact/Relationship.xml
index 141ae932c639a1f087e5a5e8a24d2e713bc57c92..384c45541102d0dea3cc63a946fb17ece8134da4 100644 (file)
--- a/xml/schema/Contact/Relationship.xml
+++ b/xml/schema/Contact/Relationship.xml
@@ -119,6 +119,7 @@
     <type>boolean</type>
     <title>Relationship Is Active</title>
     <default>1</default>
+    <required>true</required>
     <comment>is the relationship active ?</comment>
     <add>1.1</add>
     <html>

diff --git a/xml/schema/Contact/RelationshipCache.xml b/xml/schema/Contact/RelationshipCache.xml
index e53094d61a35ce888c4534bc9a8f04797fed5e3c..62d9ea1d2fbb1ca3b02dab2c924a70256a4a539e 100644 (file)
--- a/xml/schema/Contact/RelationshipCache.xml
+++ b/xml/schema/Contact/RelationshipCache.xml
@@ -194,6 +194,7 @@
     <type>boolean</type>
     <title>Relationship Is Active</title>
     <default>1</default>
+    <required>true</required>
     <comment>is the relationship active ?</comment>
     <add>5.29</add>
     <html>

diff --git a/xml/schema/Contact/RelationshipType.xml b/xml/schema/Contact/RelationshipType.xml
index c55db740c48b8fc7f3c6985657c34b2a90ba69b8..ba388a83689dbde6366cec21e796a4bdae9adcdf 100644 (file)
--- a/xml/schema/Contact/RelationshipType.xml
+++ b/xml/schema/Contact/RelationshipType.xml
@@ -151,12 +151,15 @@
       <type>CheckBox</type>
     </html>
     <add>1.1</add>
+    <default>0</default>
+    <required>true</required>
   </field>
   <field>
     <name>is_active</name>
     <title>Relationship Type is Active</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Is this relationship type currently active (i.e. can be used when creating or editing relationships)?</comment>
     <html>
       <type>CheckBox</type>

diff --git a/xml/schema/Contribute/ContributionPage.xml b/xml/schema/Contribute/ContributionPage.xml
index 3402bb63fb1750439ef5cb7c330a72c3e0512dfb..25d267f5596bd48ef4b7606f6ee31b53fac6dd7f 100644 (file)
--- a/xml/schema/Contribute/ContributionPage.xml
+++ b/xml/schema/Contribute/ContributionPage.xml
@@ -91,6 +91,7 @@
     <type>boolean</type>
     <comment>if true - processing logic must reject transaction at confirmation stage if pay method != credit card</comment>
     <default>0</default>
+    <required>true</required>
     <add>1.3</add>
   </field>
   <field>
@@ -98,6 +99,7 @@
     <title>Is Monetary</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>if true - allows real-time monetary transactions otherwise non-monetary transactions</comment>
     <add>1.6</add>
   </field>
@@ -106,6 +108,7 @@
     <title>Is Recurring</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>if true - allows recurring contributions, valid only for PayPal_Standard</comment>
     <add>1.6</add>
   </field>
@@ -114,6 +117,7 @@
     <title>Confirmation Page?</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>if false, the confirm page in contribution pages gets skipped</comment>
     <add>4.2</add>
   </field>
@@ -139,6 +143,7 @@
     <title>Support Recurring Intervals</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>if true - supports recurring intervals</comment>
     <add>2.1</add>
   </field>
@@ -147,6 +152,7 @@
     <title>Recurring Installments?</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>if true - asks user for recurring installments</comment>
     <add>4.3</add>
   </field>
@@ -155,6 +161,7 @@
     <title>Adjust Recurring Start Date</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>if true - user is able to adjust payment start date</comment>
     <add>4.7</add>
   </field>
@@ -163,6 +170,7 @@
     <title>Pay Later</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>if true - allows the user to send payment directly to the org later</comment>
     <add>2.0</add>
   </field>
@@ -226,6 +234,7 @@
     <type>boolean</type>
     <comment>if true, page will include an input text field where user can enter their own amount</comment>
     <default>0</default>
+    <required>true</required>
     <add>1.3</add>
   </field>
   <field>
@@ -299,6 +308,7 @@
     <type>boolean</type>
     <comment>if true, receipt is automatically emailed to contact on success</comment>
     <default>0</default>
+    <required>true</required>
     <add>1.3</add>
   </field>
   <field>
@@ -351,6 +361,8 @@
     <name>is_active</name>
     <title>Is Page Active?</title>
     <type>boolean</type>
+    <default>1</default>
+    <required>true</required>
     <comment>Is this property active?</comment>
     <add>1.3</add>
   </field>
@@ -373,6 +385,7 @@
     <type>boolean</type>
     <comment>Is this property active?</comment>
     <default>1</default>
+    <required>true</required>
     <add>1.5</add>
   </field>
   <field>
@@ -463,6 +476,7 @@
     <title>Is Contribution Page Shared?</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Can people share the contribution page through social media?</comment>
     <add>4.1</add>
   </field>
@@ -471,6 +485,7 @@
     <title>Is billing block required</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>if true - billing block is required for online contribution page</comment>
     <add>4.6</add>
   </field>

diff --git a/xml/schema/Contribute/ContributionRecur.xml b/xml/schema/Contribute/ContributionRecur.xml
index db0e56832b94c47bd6f8a3a13871f872cca5f421..d15272ffbf96243043fb3d2c64a8fb8173c315ec 100644 (file)
--- a/xml/schema/Contribute/ContributionRecur.xml
+++ b/xml/schema/Contribute/ContributionRecur.xml
@@ -283,6 +283,7 @@
     <title>Test</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <import>true</import>
     <html>
       <type>CheckBox</type>
@@ -447,6 +448,7 @@
     <type>boolean</type>
     <comment>if true, receipt is automatically emailed to contact on each successful payment</comment>
     <default>1</default>
+    <required>true</required>
     <add>4.1</add>
     <html>
       <type>CheckBox</type>

diff --git a/xml/schema/Contribute/ContributionSoft.xml b/xml/schema/Contribute/ContributionSoft.xml
index 8e251ff206ddf476d334ec7cbf1d22a9ba7f8486..6d081ca1ebb6b60e3c4f233ca7352d05c6d61ef5 100644 (file)
--- a/xml/schema/Contribute/ContributionSoft.xml
+++ b/xml/schema/Contribute/ContributionSoft.xml
@@ -131,6 +131,7 @@
     <type>boolean</type>
     <title>Soft Contribution Display on PCP</title>
     <default>0</default>
+    <required>true</required>
     <add>2.2</add>
   </field>
   <field>

diff --git a/xml/schema/Contribute/Premium.xml b/xml/schema/Contribute/Premium.xml
index 469b62450fc3b20bdbda5f35fdd0794f426e3b65..9a783c324e93db03cb1e8f0f26245c35f2f4cb72 100644 (file)
--- a/xml/schema/Contribute/Premium.xml
+++ b/xml/schema/Contribute/Premium.xml
@@ -89,6 +89,7 @@
     <name>premiums_display_min_contribution</name>
     <title>Display Minimum Contribution?</title>
     <type>boolean</type>
+    <default>0</default>
     <required>true</required>
     <comment>Boolean. Should we automatically display minimum contribution amount text after the premium descriptions.</comment>
     <add>1.4</add>

diff --git a/xml/schema/Contribute/Widget.xml b/xml/schema/Contribute/Widget.xml
index 8ced050633f2ac5fa65f337b2c6b603de0164d9f..1dd218329375c0d8bbb5eb24e775f874f29e4e49 100644 (file)
--- a/xml/schema/Contribute/Widget.xml
+++ b/xml/schema/Contribute/Widget.xml
@@ -43,6 +43,8 @@
     <name>is_active</name>
     <title>Enabled?</title>
     <type>boolean</type>
+    <default>1</default>
+    <required>true</required>
     <comment>Is this property active?</comment>
     <add>2.0</add>
   </field>

diff --git a/xml/schema/Core/ActionLog.xml b/xml/schema/Core/ActionLog.xml
index 5b948eed57bf0b40361e7e54681ade89f518b55e..7070ca638c68149b04acb9093fdf8f0992551ed2 100644 (file)
--- a/xml/schema/Core/ActionLog.xml
+++ b/xml/schema/Core/ActionLog.xml
@@ -88,6 +88,7 @@
     <title>Error?</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Was there any error sending the reminder?</comment>
     <add>3.4</add>
   </field>

diff --git a/xml/schema/Core/ActionSchedule.xml b/xml/schema/Core/ActionSchedule.xml
index 532d6dbc611f4e022e95bfc8b5ca28d5ea1c636e..8ea04d1b7a9075a9a0b99e3be98ce31624b2c00f 100644 (file)
--- a/xml/schema/Core/ActionSchedule.xml
+++ b/xml/schema/Core/ActionSchedule.xml
@@ -53,6 +53,8 @@
     <html>
       <label>Limit To</label>
     </html>
+    <default>1</default>
+    <required>true</required>
     <add>4.4</add>
   </field>
   <field>
@@ -126,6 +128,7 @@
     <title>Repeat?</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <add>3.4</add>
   </field>
   <field>
@@ -201,6 +204,7 @@
     <title>Schedule is Active?</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Is this option active?</comment>
     <add>3.4</add>
   </field>
@@ -254,7 +258,8 @@
     <name>record_activity</name>
     <title>Record Activity for Reminder?</title>
     <type>boolean</type>
-    <default>NULL</default>
+    <default>0</default>
+    <required>true</required>
     <comment>Record Activity for this reminder?</comment>
     <add>3.4</add>
   </field>

diff --git a/xml/schema/Core/Address.xml b/xml/schema/Core/Address.xml
index 1ee08b9816cd55ba566e3242f7470ace134de4c9..018390e5065c622f10c27247d8dfd82dec7a001b 100644 (file)
--- a/xml/schema/Core/Address.xml
+++ b/xml/schema/Core/Address.xml
@@ -67,6 +67,7 @@
     <title>Primary address</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Is this the primary address.</comment>
     <add>2.0</add>
     <html>
@@ -83,6 +84,7 @@
     <title>Is Billing Address</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Is this the billing address.</comment>
     <add>2.0</add>
     <html>
@@ -418,6 +420,7 @@
     <title>Is Manually Geocoded</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Is this a manually entered geo code</comment>
     <add>4.3</add>
     <html>

diff --git a/xml/schema/Core/Country.xml b/xml/schema/Core/Country.xml
index 546759fa250c42f8235b640c19e60dd5f7644ed8..639ac54baf09ad79c7e8ae1432a4bef78dc9fc1b 100644 (file)
--- a/xml/schema/Core/Country.xml
+++ b/xml/schema/Core/Country.xml
@@ -108,6 +108,7 @@
     <title>Abbreviate Province?</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Should state/province be displayed as abbreviation for contacts from this country?</comment>
     <add>3.1</add>
   </field>
@@ -116,6 +117,7 @@
     <title>Country Is Active</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Is this Country active?</comment>
     <add>5.35</add>
   </field>

diff --git a/xml/schema/Core/County.xml b/xml/schema/Core/County.xml
index 47a28a22ad9d2dc9a22616c6907e25e2c8c61142..21ec83e4fd3a665487547d976d2a750cf5315448 100644 (file)
--- a/xml/schema/Core/County.xml
+++ b/xml/schema/Core/County.xml
@@ -68,6 +68,7 @@
     <title>County Is Active</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Is this County active?</comment>
     <add>5.35</add>
   </field>

diff --git a/xml/schema/Core/CustomField.xml b/xml/schema/Core/CustomField.xml
index da1ba6fc0d72892bc8d05956474a638043564b34..40de350dcabd87208288d17c40c79a399c3cc24c 100644 (file)
--- a/xml/schema/Core/CustomField.xml
+++ b/xml/schema/Core/CustomField.xml
@@ -118,6 +118,7 @@
     <type>boolean</type>
     <comment>Is a value required for this property.</comment>
     <default>0</default>
+    <required>true</required>
     <add>1.1</add>
   </field>
   <field>
@@ -126,6 +127,7 @@
     <type>boolean</type>
     <comment>Is this property searchable.</comment>
     <default>0</default>
+    <required>true</required>
     <add>1.1</add>
   </field>
   <field>
@@ -135,6 +137,7 @@
     <comment>Is this property range searchable.</comment>
     <add>1.4</add>
     <default>0</default>
+    <required>true</required>
   </field>
   <field>
     <name>weight</name>
@@ -191,6 +194,7 @@
     <title>Custom Field Is Active?</title>
     <comment>Is this property active?</comment>
     <default>1</default>
+    <default>0</default>
     <add>1.1</add>
   </field>
   <field>
@@ -198,6 +202,7 @@
     <type>boolean</type>
     <title>Field is Viewable</title>
     <default>0</default>
+    <required>true</required>
     <comment>Is this property set by PHP Code? A code field is viewable but not editable</comment>
     <add>1.1</add>
   </field>
@@ -319,6 +324,7 @@
     <type>boolean</type>
     <title>Field Display</title>
     <default>0</default>
+    <required>true</required>
     <comment>Should the multi-record custom field values be displayed in tab table listing</comment>
     <add>4.5</add>
   </field>

diff --git a/xml/schema/Core/CustomGroup.xml b/xml/schema/Core/CustomGroup.xml
index cd38ce06701141465999b2cc3423f601a66cba80..7f644b54ab97d97589b733fcccaa839a304e4bb7 100644 (file)
--- a/xml/schema/Core/CustomGroup.xml
+++ b/xml/schema/Core/CustomGroup.xml
@@ -103,6 +103,7 @@
     <type>boolean</type>
     <title>Collapse Custom Group?</title>
     <default>0</default>
+    <required>true</required>
     <comment>Will this group be in collapsed or expanded mode on initial display ?</comment>
     <add>1.1</add>
   </field>
@@ -147,6 +148,7 @@
     <title>Custom Group Is Active?</title>
     <comment>Is this property active?</comment>
     <default>1</default>
+    <required>true</required>
     <add>1.1</add>
   </field>
   <field>
@@ -166,6 +168,7 @@
     <title>Supports Multiple Records</title>
     <comment>Does this group hold multiple values?</comment>
     <default>0</default>
+    <required>true</required>
     <add>2.0</add>
   </field>
   <field>
@@ -187,6 +190,7 @@
     <type>boolean</type>
     <title>Collapse Group Display</title>
     <default>0</default>
+    <required>true</required>
     <comment>Will this group be in collapsed or expanded mode on advanced search display ?</comment>
     <add>3.0</add>
   </field>
@@ -232,6 +236,7 @@
     <type>boolean</type>
     <title>Reserved Group?</title>
     <default>0</default>
+    <required>true</required>
     <comment>Is this a reserved Custom Group?</comment>
     <add>4.4</add>
   </field>
@@ -240,6 +245,7 @@
     <type>boolean</type>
     <title>Custom Group Is Public?</title>
     <default>1</default>
+    <required>true</required>
     <comment>Is this property public?</comment>
     <add>4.7</add>
   </field>

diff --git a/xml/schema/Core/Dashboard.xml b/xml/schema/Core/Dashboard.xml
index b68fe09b897e5d69838738203eed516dad167036..15effae4333a461c334bb29327a3b56022eb8ddd 100644 (file)
--- a/xml/schema/Core/Dashboard.xml
+++ b/xml/schema/Core/Dashboard.xml
@@ -94,6 +94,7 @@
     <title>Dashlet Column</title>
     <comment>column no for this dashlet</comment>
     <default>0</default>
+    <required>true</required>
     <add>3.1</add>
     <drop>4.7</drop>
   </field>
@@ -103,6 +104,7 @@
     <title>Minimize Dashlet?</title>
     <comment>Is Minimized?</comment>
     <default>0</default>
+    <required>true</required>
     <add>3.1</add>
     <drop>4.7</drop>
   </field>
@@ -120,6 +122,7 @@
     <title>Is Fullscreen?</title>
     <comment>Is Fullscreen?</comment>
     <default>1</default>
+    <required>true</required>
     <add>3.1</add>
     <drop>4.7</drop>
   </field>
@@ -129,6 +132,7 @@
     <title>Is Dashlet Active?</title>
     <comment>Is this dashlet active?</comment>
     <default>0</default>
+    <required>true</required>
     <add>3.1</add>
   </field>
   <field>
@@ -137,6 +141,7 @@
     <title>Is Dashlet Reserved?</title>
     <comment>Is this dashlet reserved?</comment>
     <default>0</default>
+    <required>true</required>
     <add>3.1</add>
   </field>
   <field>

diff --git a/xml/schema/Core/Email.xml b/xml/schema/Core/Email.xml
index ddb0678f61fdf16c73750f15b34cdff2a4dae364..7f01e31fc72966501aa96a1347163f59f9f8741f 100644 (file)
--- a/xml/schema/Core/Email.xml
+++ b/xml/schema/Core/Email.xml
@@ -87,6 +87,7 @@
     <title>Primary email</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Is this the primary email address</comment>
     <add>1.1</add>
     <html>
@@ -103,6 +104,7 @@
     <title>Is Billing Email?</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Is this the billing?</comment>
     <add>2.0</add>
   </field>

diff --git a/xml/schema/Core/IM.xml b/xml/schema/Core/IM.xml
index c37999b9c78055b928fcbdabca908c66cbf0a0f8..348e34eb25f95cf519c4a1fb927a37e65489eeaa 100644 (file)
--- a/xml/schema/Core/IM.xml
+++ b/xml/schema/Core/IM.xml
@@ -100,6 +100,7 @@
     <title>Primary IM</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <html>
       <type>Radio</type>
     </html>
@@ -116,6 +117,7 @@
     <title>Is IM Billing?</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Is this the billing?</comment>
     <add>2.0</add>
   </field>

diff --git a/xml/schema/Core/Job.xml b/xml/schema/Core/Job.xml
index ba8ab0bf473779f5cdb2ddebec4a03eaf33048a7..33847742c8fe861775652a5a8e35896d9d0a3839 100644 (file)
--- a/xml/schema/Core/Job.xml
+++ b/xml/schema/Core/Job.xml
@@ -130,6 +130,8 @@
     <title>Job Is Active?</title>
     <type>boolean</type>
     <comment>Is this job active?</comment>
+    <default>1</default>
+    <required>true</required>
     <add>4.1</add>
   </field>
 </table>

diff --git a/xml/schema/Core/MailSettings.xml b/xml/schema/Core/MailSettings.xml
index 0ce70437f7b2ab6a8bd0c96d3dfd92112899c72a..38833d69d7fb0a3673f3a0a7a594bcc959fc4870 100644 (file)
--- a/xml/schema/Core/MailSettings.xml
+++ b/xml/schema/Core/MailSettings.xml
@@ -54,6 +54,8 @@
     <name>is_default</name>
     <title>Is Default Mail Settings?</title>
     <type>boolean</type>
+    <default>0</default>
+    <required>true</required>
     <comment>whether this is the default set of settings for this domain</comment>
     <add>2.2</add>
   </field>
@@ -130,6 +132,8 @@
     <name>is_ssl</name>
     <title>Mail Account Uses SSL</title>
     <type>boolean</type>
+    <default>0</default>
+    <required>true</required>
     <comment>whether to use SSL or not</comment>
     <add>2.2</add>
   </field>
@@ -161,6 +165,7 @@
     <title>Skip emails which do not have a Case ID or Case hash</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <html>
       <type>CheckBox</type>
     </html>
@@ -172,6 +177,7 @@
     <type>boolean</type>
     <title>Do not create new contacts when filing emails</title>
     <default>0</default>
+    <required>true</required>
     <html>
       <type>CheckBox</type>
     </html>

diff --git a/xml/schema/Core/Menu.xml b/xml/schema/Core/Menu.xml
index 3dbb0447ee6c3d5ee9ce4684f30ffd3cd0fd9905..8b734010d7d2ff7b9540c0a9908a580aa3825ed1 100644 (file)
--- a/xml/schema/Core/Menu.xml
+++ b/xml/schema/Core/Menu.xml
@@ -154,6 +154,8 @@
     <name>is_active</name>
     <title>Enabled?</title>
     <type>boolean</type>
+    <default>1</default>
+    <required>true</required>
     <comment>Is this menu item active?</comment>
     <add>2.1</add>
   </field>
@@ -161,6 +163,8 @@
     <name>is_public</name>
     <title>Public?</title>
     <type>boolean</type>
+    <default>1</default>
+    <required>true</required>
     <comment>Is this menu accessible to the public?</comment>
     <add>2.1</add>
   </field>
@@ -168,6 +172,8 @@
     <name>is_exposed</name>
     <title>Exposed?</title>
     <type>boolean</type>
+    <default>1</default>
+    <required>true</required>
     <comment>Is this menu exposed to the navigation system?</comment>
     <add>2.1</add>
   </field>
@@ -175,6 +181,8 @@
     <name>is_ssl</name>
     <title>Use SSL?</title>
     <type>boolean</type>
+    <default>1</default>
+    <required>true</required>
     <comment>Should this menu be exposed via SSL if enabled?</comment>
     <add>2.1</add>
   </field>
@@ -209,6 +217,8 @@
     <name>skipBreadcrumb</name>
     <title>Hide Breadcrumb?</title>
     <type>boolean</type>
+    <default>0</default>
+    <required>true</required>
     <comment>skip this url being exposed to breadcrumb</comment>
     <add>2.2</add>
   </field>

diff --git a/xml/schema/Core/MessageTemplate.xml b/xml/schema/Core/MessageTemplate.xml
index c912a6abb0e393ff8dc830aee385000b9c03db3c..f16bda1e57f59e7761d6f2644a95f1d8da2bb3ad 100644 (file)
--- a/xml/schema/Core/MessageTemplate.xml
+++ b/xml/schema/Core/MessageTemplate.xml
@@ -68,6 +68,7 @@
     <title>Is Active</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <add>1.6</add>
   </field>
   <field>
@@ -89,6 +90,7 @@
     <title>Message Template Is Default?</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>is this the default message template for the workflow referenced by workflow_id?</comment>
     <add>3.1</add>
   </field>
@@ -97,6 +99,7 @@
     <title>Message Template Is Reserved?</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>is this the reserved message template which we ship for the workflow referenced by workflow_id?</comment>
     <add>3.1</add>
   </field>
@@ -105,6 +108,7 @@
     <title>Message Template is used for SMS?</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Is this message template used for sms?</comment>
     <add>4.5</add>
   </field>

diff --git a/xml/schema/Core/OpenID.xml b/xml/schema/Core/OpenID.xml
index 571b006aed90d161c4a650e536990a1944b145c8..efc30536ab4cde46c8513499c06901d4b86d6cfa 100644 (file)
--- a/xml/schema/Core/OpenID.xml
+++ b/xml/schema/Core/OpenID.xml
@@ -87,6 +87,7 @@
     <title>Primary ID</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <html>
       <type>Radio</type>
     </html>

diff --git a/xml/schema/Core/OptionGroup.xml b/xml/schema/Core/OptionGroup.xml
index 36c64076429b1381a1f91a3ca5e116f0bd489bc1..bd02b88a1e9491f6e7448232acfcfcccad93c6f0 100644 (file)
--- a/xml/schema/Core/OptionGroup.xml
+++ b/xml/schema/Core/OptionGroup.xml
@@ -81,8 +81,8 @@
     <name>is_locked</name>
     <title>Option Group Is Locked</title>
     <default>0</default>
-    <required>true</required>
     <type>boolean</type>
+    <required>true</required>
     <comment>A lock to remove the ability to add new options via the UI.</comment>
     <add>4.5</add>
   </field>

diff --git a/xml/schema/Core/Phone.xml b/xml/schema/Core/Phone.xml
index cb9f4e8e6d2c4df2da210c1ad8b5af35e5a7aea6..343f86f1b3fe9fbbd45c1f446dd909adf67065c5 100644 (file)
--- a/xml/schema/Core/Phone.xml
+++ b/xml/schema/Core/Phone.xml
@@ -67,6 +67,7 @@
     <title>Primary phone</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <html>
       <type>Radio</type>
     </html>
@@ -83,6 +84,7 @@
     <title>Is Billing Phone</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Is this the billing?</comment>
     <add>2.0</add>
   </field>

diff --git a/xml/schema/Core/PrevNextCache.xml b/xml/schema/Core/PrevNextCache.xml
index 9eea75ff34a6816004acf383c14136fc924abbb0..295f53a8e2b7218c1b81848c0a3526a4b89296ac 100644 (file)
--- a/xml/schema/Core/PrevNextCache.xml
+++ b/xml/schema/Core/PrevNextCache.xml
@@ -65,6 +65,7 @@
     <title>Is Selected</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <add>4.2</add>
   </field>
   <index>

diff --git a/xml/schema/Core/PrintLabel.xml b/xml/schema/Core/PrintLabel.xml
index a611548ecbc39ea8d8fb001634429bbe80b65538..019c151c941b7132437e514fadab50ddf25a9ff4 100644 (file)
--- a/xml/schema/Core/PrintLabel.xml
+++ b/xml/schema/Core/PrintLabel.xml
@@ -87,6 +87,7 @@
     <title>Label is Default?</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Is this default?</comment>
     <add>4.4</add>
   </field>
@@ -95,6 +96,7 @@
     <title>Label Is Active?</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Is this option active?</comment>
     <add>4.4</add>
   </field>
@@ -103,6 +105,7 @@
     <title>Is Label Reserved?</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Is this reserved label?</comment>
     <add>4.4</add>
   </field>

diff --git a/xml/schema/Core/RecurringEntity.xml b/xml/schema/Core/RecurringEntity.xml
index 86f6f8080871f409afbc809706ae552a44ce7ccb..f8a948c60a6fdb7a115e13716ffe5047d7eb49ac 100644 (file)
--- a/xml/schema/Core/RecurringEntity.xml
+++ b/xml/schema/Core/RecurringEntity.xml
@@ -51,6 +51,7 @@
       <name>mode</name>
       <type>boolean</type>
       <default>1</default>
+      <required>true</required>
       <title>Cascade Type</title>
       <required>true</required>
       <comment>1-this entity, 2-this and the following entities, 3-all the entities</comment>

diff --git a/xml/schema/Core/Setting.xml b/xml/schema/Core/Setting.xml
index b7a61b0acfee21b4bfc0faa678d359a64b001e86..203977af5d540c336871526d35a10556132c632a 100644 (file)
--- a/xml/schema/Core/Setting.xml
+++ b/xml/schema/Core/Setting.xml
@@ -99,6 +99,8 @@
     <name>is_domain</name>
     <title>Is Domain Setting?</title>
     <type>boolean</type>
+    <default>0</default>
+    <required>true</required>
     <comment>Is this setting a contact specific or site wide setting?</comment>
     <add>4.1</add>
   </field>

diff --git a/xml/schema/Core/StateProvince.xml b/xml/schema/Core/StateProvince.xml
index 3e3cd60a7493658b86937e7b29904375e2e4635e..ed61350f75994b950c2cc17787b8454997ec5f43 100644 (file)
--- a/xml/schema/Core/StateProvince.xml
+++ b/xml/schema/Core/StateProvince.xml
@@ -64,6 +64,7 @@
     <title>StateProvince Is Active</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Is this StateProvince active?</comment>
     <add>5.35</add>
   </field>

diff --git a/xml/schema/Core/StatusPreference.xml b/xml/schema/Core/StatusPreference.xml
index 464a581475bdae03aece12cdfc3de84a1a1cc7b5..e30ba01e649a90fee1f0ef5349e51eae54e9fd85 100644 (file)
--- a/xml/schema/Core/StatusPreference.xml
+++ b/xml/schema/Core/StatusPreference.xml
@@ -100,6 +100,7 @@
     <title>Check Is Active</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Is this status check active?</comment>
     <add>5.19</add>
   </field>

diff --git a/xml/schema/Core/Tag.xml b/xml/schema/Core/Tag.xml
index 6575eb566ac3b258a3bc2c487b97daefa0897e63..3d875d5346ed140be071bcdfcb912f2a69a2537e 100644 (file)
--- a/xml/schema/Core/Tag.xml
+++ b/xml/schema/Core/Tag.xml
@@ -62,6 +62,7 @@
     <title>Display Tag?</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Is this tag selectable / displayed</comment>
     <add>2.1</add>
   </field>
@@ -82,6 +83,7 @@
     <title>Reserved</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <add>3.2</add>
   </field>
   <field>
@@ -89,6 +91,7 @@
     <title>Tagset</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <add>3.2</add>
   </field>
   <field>

diff --git a/xml/schema/Core/UFField.xml b/xml/schema/Core/UFField.xml
index fde4410c2d799b3b9fd8eee1b1acb2245d893dfe..0a2aa118ee5d17b3fb651b2cd1b9ff59a0db9269 100644 (file)
--- a/xml/schema/Core/UFField.xml
+++ b/xml/schema/Core/UFField.xml
@@ -63,6 +63,7 @@
     <title>Profile Field Is Active</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Is this field currently shareable? If false, hide the field for all sharing contexts.</comment>
     <add>1.1</add>
   </field>
@@ -71,6 +72,7 @@
     <title>Profile Is View Only</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>the field is view only and not editable in user forms.</comment>
     <add>1.1</add>
   </field>
@@ -79,6 +81,7 @@
     <title>Profile Field Is Required</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Is this field required when included in a user or registration form?</comment>
     <add>1.1</add>
   </field>
@@ -127,6 +130,7 @@
     <title>Profile Field Is a Filter</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Is this field included as a column in the selector table?</comment>
     <add>1.2</add>
   </field>
@@ -135,6 +139,7 @@
     <title>Profile Field Is Searchable</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Is this field included search form of profile?</comment>
     <add>1.4</add>
   </field>
@@ -197,6 +202,8 @@
     <name>is_reserved</name>
     <title>Profile Field Is Reserved</title>
     <type>boolean</type>
+    <default>0</default>
+    <required>true</required>
     <comment>Is this field reserved for use by some other CiviCRM functionality?</comment>
     <add>3.0</add>
   </field>
@@ -205,6 +212,7 @@
     <title>Profile Field Supports Multiple</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Include in multi-record listing?</comment>
     <add>4.3</add>
   </field>

diff --git a/xml/schema/Core/UFGroup.xml b/xml/schema/Core/UFGroup.xml
index 49fdad55a3f38993b9668929978c14f96a049b4f..26f1075fa7da4bf0888fa86341bb80f2c495414a 100644 (file)
--- a/xml/schema/Core/UFGroup.xml
+++ b/xml/schema/Core/UFGroup.xml
@@ -27,6 +27,7 @@
     <title>Profile Is Active</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Is this form currently active? If false, hide all related fields for all sharing contexts.</comment>
     <add>1.1</add>
   </field>
@@ -150,6 +151,7 @@
     <title>Show Captcha On Profile</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Should a CAPTCHA widget be included this Profile form.</comment>
     <add>1.1</add>
   </field>
@@ -158,6 +160,7 @@
     <title>Map Profile</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Do we want to map results from this profile.</comment>
     <add>1.5</add>
   </field>
@@ -166,6 +169,7 @@
     <title>Show Edit Link?</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Should edit link display in profile selector</comment>
     <add>1.6</add>
   </field>
@@ -174,6 +178,7 @@
     <title>Show Link to CMS User</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Should we display a link to the website profile in profile selector</comment>
     <add>1.7</add>
   </field>
@@ -182,6 +187,7 @@
     <title>Update on Duplicate</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Should we update the contact record if we find a duplicate</comment>
     <add>1.7</add>
   </field>
@@ -198,6 +204,7 @@
     <title>Create CMS User?</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Should we create a cms user for this profile </comment>
     <add>1.8</add>
   </field>
@@ -211,6 +218,8 @@
     <name>is_reserved</name>
     <title>Profile Is Reserved</title>
     <type>boolean</type>
+    <default>0</default>
+    <required>true</required>
     <comment>Is this group reserved for use by some other CiviCRM functionality?</comment>
     <add>3.0</add>
   </field>
@@ -257,6 +266,7 @@
     <title>Include Proximity Search?</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Should we include proximity search feature in this profile search form?</comment>
     <add>3.2</add>
   </field>
@@ -291,6 +301,7 @@
     <title>Include Cancel Button</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Should a Cancel button be included in this Profile form.</comment>
     <add>5.0</add>
   </field>

diff --git a/xml/schema/Core/UFJoin.xml b/xml/schema/Core/UFJoin.xml
index db81d0dcee8a2819bd7c4ff529b7c8f14053248e..8470e3b080b2b18fa3f3d71fc93313da34e44705 100644 (file)
--- a/xml/schema/Core/UFJoin.xml
+++ b/xml/schema/Core/UFJoin.xml
@@ -27,6 +27,7 @@
     <title>Profile Use is active</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Is this join currently active?</comment>
     <add>1.3</add>
   </field>

diff --git a/xml/schema/Core/WordReplacement.xml b/xml/schema/Core/WordReplacement.xml
index fb18789c6c6209e60c45199ff0b17aeb8c56d052..ad0400f79a1873e038742f6b39a479d2c24b87cc 100644 (file)
--- a/xml/schema/Core/WordReplacement.xml
+++ b/xml/schema/Core/WordReplacement.xml
@@ -44,6 +44,7 @@
     <title>Word Replacement is Active</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Is this entry active?</comment>
     <add>4.4</add>
   </field>

diff --git a/xml/schema/Cxn/Cxn.xml b/xml/schema/Cxn/Cxn.xml
index 979dbcdb0492268c31d8f8e9c5b1f8573ef11cd7..0a19d3c000ff3a3c42f18bc2088d07c35cfa0c35 100644 (file)
--- a/xml/schema/Cxn/Cxn.xml
+++ b/xml/schema/Cxn/Cxn.xml
@@ -95,6 +95,7 @@
     <title>Is Active</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Is connection currently enabled?</comment>
     <add>4.6</add>
   </field>

diff --git a/xml/schema/Dedupe/DedupeRuleGroup.xml b/xml/schema/Dedupe/DedupeRuleGroup.xml
index 1a8722da3334a8b255f4a62418cd10dae638fd0f..ff77740d4ccc60f1049c60b6fa7e06b34983bee9 100644 (file)
--- a/xml/schema/Dedupe/DedupeRuleGroup.xml
+++ b/xml/schema/Dedupe/DedupeRuleGroup.xml
@@ -87,6 +87,8 @@
     <title>Reserved?</title>
     <type>boolean</type>
     <comment>Is this a reserved rule - a rule group that has been optimized and cannot be changed by the admin</comment>
+    <default>0</default>
+    <required>true</required>
     <add>4.1</add>
     <html>
       <type>CheckBox</type>

diff --git a/xml/schema/Event/Cart/Cart.xml b/xml/schema/Event/Cart/Cart.xml
index 5aae1932b05ae97239493d8ab60a2ae463d15e97..a7884aee2b6f7d09074993a8151f794c5f13d6be 100644 (file)
--- a/xml/schema/Event/Cart/Cart.xml
+++ b/xml/schema/Event/Cart/Cart.xml
@@ -37,6 +37,7 @@
     <title>Complete?</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <add>4.1</add>
   </field>
   <foreignKey>

diff --git a/xml/schema/Event/Participant.xml b/xml/schema/Event/Participant.xml
index 7f0ce2367eba202aa9fb0484f0277a19e7a913f5..9247cbb44191df73be50e0b40f9c941266051ea7 100644 (file)
--- a/xml/schema/Event/Participant.xml
+++ b/xml/schema/Event/Participant.xml
@@ -172,6 +172,7 @@
     <title>Test</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <import>true</import>
     <add>1.7</add>
   </field>
@@ -181,6 +182,7 @@
     <title>Is Pay Later</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <import>true</import>
     <headerPattern>/(is.)?(pay(.)?later)$/i</headerPattern>
     <add>2.1</add>

diff --git a/xml/schema/Event/ParticipantStatusType.xml b/xml/schema/Event/ParticipantStatusType.xml
index 9df2ce9c1c79943d664eaa85e2808bdd72551492..5899eafec9b324a1f5695b92b06068c5512c379f 100644 (file)
--- a/xml/schema/Event/ParticipantStatusType.xml
+++ b/xml/schema/Event/ParticipantStatusType.xml
@@ -62,6 +62,8 @@
     <title>Participant Status Is Reserved?></title>
     <type>boolean</type>
     <comment>whether this is a status type required by the system</comment>
+    <default>0</default>
+    <required>true</required>
     <add>3.0</add>
   </field>
   <field>
@@ -70,6 +72,8 @@
     <type>boolean</type>
     <default>1</default>
     <comment>whether this status type is active</comment>
+    <default>0</default>
+    <required>true</required>
     <add>3.0</add>
   </field>
   <field>
@@ -77,6 +81,8 @@
     <title>Participant Status Counts?</title>
     <type>boolean</type>
     <comment>whether this status type is counted against event size limit</comment>
+    <default>0</default>
+    <required>true</required>
     <add>3.0</add>
   </field>
   <field>

diff --git a/xml/schema/Financial/FinancialTrxn.xml b/xml/schema/Financial/FinancialTrxn.xml
index 515a78770ea0b2e8c5f4187a7d2d67188a83545e..f71027f61faf8ad2e60f6edf70ad9f91513b7b8d 100644 (file)
--- a/xml/schema/Financial/FinancialTrxn.xml
+++ b/xml/schema/Financial/FinancialTrxn.xml
@@ -126,6 +126,7 @@
     <title>Is Payment?</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <import>true</import>
     <comment>Is this entry either a payment or a reversal of a payment?</comment>
     <add>4.7</add>

diff --git a/xml/schema/Financial/PaymentProcessor.xml b/xml/schema/Financial/PaymentProcessor.xml
index cec449f4c468e4530c4059ba27f818db9e6024c9..d8393354902065bd0f30c557acf5eeeaaa06fd3e 100644 (file)
--- a/xml/schema/Financial/PaymentProcessor.xml
+++ b/xml/schema/Financial/PaymentProcessor.xml
@@ -106,6 +106,7 @@
     <comment>Is this processor active?</comment>
     <add>1.8</add>
     <default>1</default>
+    <required>true</required>
   </field>
   <field>
     <name>is_default</name>
@@ -114,6 +115,7 @@
     <comment>Is this processor the default?</comment>
     <add>1.8</add>
     <default>0</default>
+    <required>true</required>
   </field>
   <field>
     <name>is_test</name>
@@ -122,6 +124,7 @@
     <comment>Is this processor for a test site?</comment>
     <add>1.8</add>
     <default>0</default>
+    <required>true</required>
   </field>
   <index>
     <name>UI_name_test_domain_id</name>
@@ -231,6 +234,8 @@
     <name>is_recur</name>
     <title>Processor Supports Recurring?</title>
     <type>boolean</type>
+    <default>0</default>
+    <required>true</required>
     <comment>Can process recurring contributions</comment>
     <add>1.8</add>
   </field>

diff --git a/xml/schema/Financial/PaymentProcessorType.xml b/xml/schema/Financial/PaymentProcessorType.xml
index d5a3728c3bde6beeeac2036538cfe0f476c2751d..ab3e93b9ef6f074010e403f05edb020fb2311225 100644 (file)
--- a/xml/schema/Financial/PaymentProcessorType.xml
+++ b/xml/schema/Financial/PaymentProcessorType.xml
@@ -51,6 +51,8 @@
     <name>is_active</name>
     <title>Processor Type Is Active?</title>
     <type>boolean</type>
+    <default>1</default>
+    <required>true</required>
     <comment>Is this processor active?</comment>
     <add>1.8</add>
     <default>1</default>
@@ -59,6 +61,8 @@
     <name>is_default</name>
     <title>Processor Type is Default?</title>
     <type>boolean</type>
+    <default>0</default>
+    <required>true</required>
     <comment>Is this processor the default?</comment>
     <add>1.8</add>
     <default>0</default>
@@ -179,6 +183,8 @@
     <name>is_recur</name>
     <title>Processor Type Supports Recurring?</title>
     <type>boolean</type>
+    <default>0</default>
+    <required>true</required>
     <comment>Can process recurring contributions</comment>
     <add>1.8</add>
   </field>

diff --git a/xml/schema/Friend/Friend.xml b/xml/schema/Friend/Friend.xml
index 014aee536eb6234d458d1e7d5a06b2baf813af46..ff6360c94635ddbdfc4dccee2dd5c151056a9198 100644 (file)
--- a/xml/schema/Friend/Friend.xml
+++ b/xml/schema/Friend/Friend.xml
@@ -114,6 +114,8 @@
     <name>is_active</name>
     <title>Enabled?</title>
     <type>boolean</type>
+    <default>1</default>
+    <required>true</required>
     <add>2.0</add>
     <html>
       <type>CheckBox</type>

diff --git a/xml/schema/Mailing/Component.xml b/xml/schema/Mailing/Component.xml
index 54788c45ce85c47cb7994cfc4a4fea643114d20b..a716253366b24df84a683c7ecd7ab609a403c268 100644 (file)
--- a/xml/schema/Mailing/Component.xml
+++ b/xml/schema/Mailing/Component.xml
@@ -74,12 +74,15 @@
     <title>Mailing Component is Default?</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Is this the default component for this component_type?</comment>
   </field>
   <field>
     <name>is_active</name>
     <title>Mailing Component Is Active?</title>
     <type>boolean</type>
+    <required>true</required>
+    <default>1</default>
     <comment>Is this property active?</comment>
   </field>
 </table>

diff --git a/xml/schema/Mailing/Mailing.xml b/xml/schema/Mailing/Mailing.xml
index f7a9ebb848e5ef0137d656e6f238e86a7431ec62..666cf4e29acab164beced9c5050aa2e8ded113af 100644 (file)
--- a/xml/schema/Mailing/Mailing.xml
+++ b/xml/schema/Mailing/Mailing.xml
@@ -245,6 +245,8 @@
   <field>
     <name>url_tracking</name>
     <type>boolean</type>
+    <default>0</default>
+    <required>true</required>
     <comment>Should we track URL click-throughs for this mailing?</comment>
     <html>
       <type>CheckBox</type>
@@ -254,6 +256,8 @@
   <field>
     <name>forward_replies</name>
     <type>boolean</type>
+    <default>0</default>
+    <required>true</required>
     <comment>Should we forward replies back to the author?</comment>
     <html>
       <type>CheckBox</type>
@@ -263,6 +267,8 @@
   <field>
     <name>auto_responder</name>
     <type>boolean</type>
+    <default>0</default>
+    <required>true</required>
     <comment>Should we enable the auto-responder?</comment>
     <html>
       <type>CheckBox</type>
@@ -273,12 +279,16 @@
     <name>open_tracking</name>
     <title>Track Mailing?</title>
     <type>boolean</type>
+    <default>0</default>
+    <required>true</required>
     <comment>Should we track when recipients open/read this mailing?</comment>
   </field>
   <field>
     <name>is_completed</name>
     <title>Mailing Completed</title>
     <type>boolean</type>
+    <default>0</default>
+    <required>true</required>
     <comment>Has at least one job associated with this mailing finished?</comment>
     <html>
       <type>CheckBox</type>
@@ -303,6 +313,7 @@
     <name>override_verp</name>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <add>2.2</add>
     <comment>Overwrite the VERP address in Reply-To</comment>
     <html>
@@ -436,6 +447,7 @@
     <type>boolean</type>
     <title>Is Mailing Archived?</title>
     <default>0</default>
+    <required>true</required>
     <comment>Is this mailing archived?</comment>
     <html>
       <type>CheckBox</type>
@@ -486,6 +498,7 @@
     <type>boolean</type>
     <title>No Duplicate emails?</title>
     <default>0</default>
+    <required>true</required>
     <add>4.1</add>
     <comment>Remove duplicate emails?</comment>
     <html>

diff --git a/xml/schema/Mailing/MailingJob.xml b/xml/schema/Mailing/MailingJob.xml
index d657c80011f72cbf2648fad8f03b971e13d3b9e2..eb728a6aa0a2e5d2c3c8893d82756827b3a6050e 100644 (file)
--- a/xml/schema/Mailing/MailingJob.xml
+++ b/xml/schema/Mailing/MailingJob.xml
@@ -93,6 +93,7 @@
     <title>Mailing Job Is Test?</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Is this job for a test mail?</comment>
     <add>1.9</add>
   </field>

diff --git a/xml/schema/Member/Membership.xml b/xml/schema/Member/Membership.xml
index 3ed25d6adc84e82409eac9ef4d71ee979a7a7552..f2ed08d0ea1e4027454ac1dd1197fdf5ee6a07d8 100644 (file)
--- a/xml/schema/Member/Membership.xml
+++ b/xml/schema/Member/Membership.xml
@@ -182,6 +182,8 @@
     <html>
       <type>CheckBox</type>
     </html>
+    <default>0</default>
+    <required>true</required>
     <add>1.5</add>
   </field>
   <field>
@@ -237,6 +239,7 @@
     <uniqueName>member_is_test</uniqueName>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <import>true</import>
     <headerPattern>/(is.)?test(.member(ship)?)?/i</headerPattern>
     <html>
@@ -249,6 +252,7 @@
     <title>Is Pay Later</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <import>true</import>
     <headerPattern>/(is.)?(pay(.)?later)$/i</headerPattern>
     <add>2.1</add>

diff --git a/xml/schema/Member/MembershipBlock.xml b/xml/schema/Member/MembershipBlock.xml
index a31e85e413cccecddaf8e798f57b1561eae89be9..fc879463537f84e010957cb16fd9adf4c6e37dc1 100644 (file)
--- a/xml/schema/Member/MembershipBlock.xml
+++ b/xml/schema/Member/MembershipBlock.xml
@@ -80,6 +80,7 @@
     <title>Membership Block Display Minimum Fee</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Display minimum membership fee</comment>
     <add>1.5</add>
   </field>
@@ -88,6 +89,7 @@
     <title>Membership Block Is Separate Payment</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Should membership transactions be processed separately</comment>
     <add>1.5</add>
   </field>
@@ -130,6 +132,7 @@
     <title>Is Required</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Is membership sign up optional</comment>
     <add>1.5</add>
   </field>
@@ -138,6 +141,7 @@
     <title>Is Active</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Is this membership_block enabled</comment>
     <add>1.5</add>
   </field>

diff --git a/xml/schema/Member/MembershipStatus.xml b/xml/schema/Member/MembershipStatus.xml
index 2bf75d8ad6d792b9ad2eefc1f78bc884f0c923e3..782ed48bac14cf73681ffe37f38a2213bde8be01 100644 (file)
--- a/xml/schema/Member/MembershipStatus.xml
+++ b/xml/schema/Member/MembershipStatus.xml
@@ -125,6 +125,8 @@
     <name>is_current_member</name>
     <title>Current Membership?</title>
     <type>boolean</type>
+    <default>0</default>
+    <required>true</required>
     <comment>Does this status aggregate to current members (e.g. New, Renewed, Grace might all be TRUE... while Unrenewed, Lapsed, Inactive would be FALSE).</comment>
     <add>1.5</add>
   </field>
@@ -136,6 +138,8 @@
     <html>
       <type>CheckBox</type>
     </html>
+    <default>0</default>
+    <required>true</required>
     <add>1.5</add>
   </field>
   <field>
@@ -148,6 +152,8 @@
     <name>is_default</name>
     <title>Default Status?</title>
     <type>boolean</type>
+    <default>0</default>
+    <required>true</required>
     <html>
       <type>CheckBox</type>
     </html>
@@ -159,6 +165,7 @@
     <title>Is Active</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <html>
       <type>CheckBox</type>
     </html>
@@ -170,6 +177,7 @@
     <title>Is Reserved</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <html>
       <type>CheckBox</type>
     </html>

diff --git a/xml/schema/PCP/PCP.xml b/xml/schema/PCP/PCP.xml
index 5195a51e7c5d57e5fd2d788fac5f1972eb85310e..af8857717ad4eebdc08476bc91d11304dd3f4f2b 100644 (file)
--- a/xml/schema/PCP/PCP.xml
+++ b/xml/schema/PCP/PCP.xml
@@ -180,7 +180,8 @@
     <title>Enabled?</title>
     <type>boolean</type>
     <comment>Is Personal Campaign Page enabled/active?</comment>
-    <default>0</default>
+    <default>1</default>
+    <required>true</required>
     <add>2.2</add>
     <html>
       <type>CheckBox</type>
@@ -192,6 +193,7 @@
     <type>boolean</type>
     <comment>Notify owner via email when someone donates to page?</comment>
     <default>0</default>
+    <required>true</required>
     <add>4.6</add>
     <html>
       <type>CheckBox</type>

diff --git a/xml/schema/PCP/PCPBlock.xml b/xml/schema/PCP/PCPBlock.xml
index d067ec4b31557893fb4fb897c9710a1d085832d8..847145c00dfe7e02135acf7a06aebf82c5b3242c 100644 (file)
--- a/xml/schema/PCP/PCPBlock.xml
+++ b/xml/schema/PCP/PCPBlock.xml
@@ -104,7 +104,8 @@
     <title>Approval Required?</title>
     <type>boolean</type>
     <comment>Does Personal Campaign Page require manual activation by administrator? (is inactive by default after setup)?</comment>
-    <default>NULL</default>
+    <default>0</default>
+    <required>true</required>
     <add>2.2</add>
   </field>
   <field>
@@ -112,7 +113,8 @@
     <title>Tell a Friend Enabled?</title>
     <type>boolean</type>
     <comment>Does Personal Campaign Page allow using tell a friend?</comment>
-    <default>NULL</default>
+    <default>0</default>
+    <required>true</required>
     <add>2.2</add>
   </field>
   <field>
@@ -139,6 +141,7 @@
     <type>boolean</type>
     <comment>Is Personal Campaign Page Block enabled/active?</comment>
     <default>1</default>
+    <required>true</required>
     <add>2.2</add>
   </field>
   <field>

diff --git a/xml/schema/Pledge/PledgeBlock.xml b/xml/schema/Pledge/PledgeBlock.xml
index bee126c42349e47ffb1f99b0805d56075764994d..bd368741b3477bb4d2e14465dedc68c5894d4986 100644 (file)
--- a/xml/schema/Pledge/PledgeBlock.xml
+++ b/xml/schema/Pledge/PledgeBlock.xml
@@ -62,6 +62,7 @@
     <title>Expose Frequency Interval?</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Is frequency interval exposed on the contribution form.</comment>
     <add>2.1</add>
   </field>

diff --git a/xml/schema/Price/PriceField.xml b/xml/schema/Price/PriceField.xml
index b9c4edaf2b8d1f93b5a1b3994b470a6a37e29341..ef2739f321ac3b03b91799782f226a5c3d2abf07 100644 (file)
--- a/xml/schema/Price/PriceField.xml
+++ b/xml/schema/Price/PriceField.xml
@@ -95,6 +95,7 @@
     <title>Price Field Quantity Required?</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Enter a quantity for this field?</comment>
     <add>1.8</add>
     <html>
@@ -143,6 +144,7 @@
     <title>Price Field Show Amounts?</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Should the price be displayed next to the label for each option?</comment>
     <html>
       <type>CheckBox</type>
@@ -165,6 +167,7 @@
     <type>boolean</type>
     <comment>Is this price field active</comment>
     <default>1</default>
+    <required>true</required>
     <add>1.8</add>
     <html>
       <type>CheckBox</type>
@@ -176,6 +179,7 @@
     <type>boolean</type>
     <comment>Is this price field required (value must be > 1)</comment>
     <default>1</default>
+    <required>true</required>
     <add>1.8</add>
     <html>
       <type>CheckBox</type>

diff --git a/xml/schema/Price/PriceFieldValue.xml b/xml/schema/Price/PriceFieldValue.xml
index 8563ea3c2d48454a02c52d257cb375f7291ec0a8..28338f8aa7b0c8cce1682652d8d0d07a27de0296 100644 (file)
--- a/xml/schema/Price/PriceFieldValue.xml
+++ b/xml/schema/Price/PriceFieldValue.xml
@@ -187,6 +187,7 @@
     <type>boolean</type>
     <comment>Is this default price field option</comment>
     <default>0</default>
+    <required>true</required>
     <add>3.3</add>
     <html>
       <type>CheckBox</type>
@@ -198,6 +199,7 @@
     <type>boolean</type>
     <comment>Is this price field value active</comment>
     <default>1</default>
+    <required>true</required>
     <add>3.3</add>
   </field>
   <field>

diff --git a/xml/schema/Price/PriceSet.xml b/xml/schema/Price/PriceSet.xml
index 89d168abf0e7e91ffc7b5147a26c9d532e07aeb4..408b43d7b23411948241972c1208b4d927821821 100644 (file)
--- a/xml/schema/Price/PriceSet.xml
+++ b/xml/schema/Price/PriceSet.xml
@@ -81,6 +81,7 @@
     <title>Price Set Is Active?</title>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <comment>Is this price set active</comment>
     <add>1.8</add>
     <html>
@@ -170,6 +171,7 @@
     <title>Is Price Set Quick Config?</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Is set if edited on Contribution or Event Page rather than through Manage Price Sets</comment>
     <html>
       <type>CheckBox</type>
@@ -181,6 +183,7 @@
     <title>Price Set Is Reserved</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <comment>Is this a predefined system price set  (i.e. it can not be deleted, edited)?</comment>
     <add>4.2</add>
     <html>

diff --git a/xml/schema/Report/ReportInstance.xml b/xml/schema/Report/ReportInstance.xml
index e020ec3149aea51022fe76a5026988f81d04c73e..58cf3b8c4d2c206159045b2f1fcc4ec5db2a5af6 100644 (file)
--- a/xml/schema/Report/ReportInstance.xml
+++ b/xml/schema/Report/ReportInstance.xml
@@ -137,6 +137,8 @@
     <name>is_active</name>
     <title>Report Instance is Active</title>
     <type>boolean</type>
+    <default>1</default>
+    <required>true</required>
     <comment>Is this entry active?</comment>
     <html>
       <type>CheckBox</type>
@@ -272,6 +274,7 @@
     <title>Instance is Reserved</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <html>
       <type>CheckBox</type>
     </html>

diff --git a/xml/schema/SMS/Provider.xml b/xml/schema/SMS/Provider.xml
index 2c00293817c1e997faed47dac32c366172daf5b4..97f8aa6d7ee44636790527e1b3f477ed00c25fd9 100644 (file)
--- a/xml/schema/SMS/Provider.xml
+++ b/xml/schema/SMS/Provider.xml
@@ -99,6 +99,7 @@
     <title>SMS Provider is Default?</title>
     <type>boolean</type>
     <default>0</default>
+    <required>true</required>
     <add>4.2</add>
     <html>
       <type>CheckBox</type>
@@ -108,7 +109,8 @@
     <name>is_active</name>
     <title>SMS Provider is Active?</title>
     <type>boolean</type>
-    <default>0</default>
+    <default>1</default>
+    <required>true</required>
     <add>4.2</add>
     <html>
       <type>CheckBox</type>

diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl
index 945b189cf773a05f2e93281f3274b05e7d2b4d2d..462a10d5c1a0bf01100d76f90aacc52736c73f68 100644 (file)
--- a/xml/templates/civicrm_data.tpl
+++ b/xml/templates/civicrm_data.tpl
@@ -299,24 +299,24 @@ SELECT @mailCompId       := max(id) FROM civicrm_component where name = 'CiviMai
 INSERT INTO
    `civicrm_option_value` (`option_group_id`, `label`, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `description`, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `visibility_id`, `icon`)
 VALUES
-   (@option_group_id_pcm, '{ts escape="sql"}Phone{/ts}',       1, 'Phone', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_pcm, '{ts escape="sql"}Email{/ts}',       2, 'Email', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_pcm, '{ts escape="sql"}Postal Mail{/ts}', 3, 'Postal Mail', NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_pcm, '{ts escape="sql"}SMS{/ts}',         4, 'SMS', NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_pcm, '{ts escape="sql"}Fax{/ts}',         5, 'Fax', NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
-
-   (@option_group_id_act, '{ts escape="sql"}Meeting{/ts}',                1,  'Meeting',               NULL, 0, NULL, 1,  NULL,                                                                                         0, 1, 1, NULL, NULL, 'fa-slideshare'),
-   (@option_group_id_act, '{ts escape="sql"}Phone Call{/ts}',             2,  'Phone Call',            NULL, 0, NULL, 2,  NULL,                                                                                         0, 1, 1, NULL, NULL, 'fa-phone'),
-   (@option_group_id_act, '{ts escape="sql"}Email{/ts}',                  3,  'Email',                 NULL, 1, NULL, 3,  '{ts escape="sql"}Email sent.{/ts}',                                                          0, 1, 1, NULL, NULL, 'fa-envelope-o'),
-   (@option_group_id_act, '{ts escape="sql"}Outbound SMS{/ts}',           4,  'SMS',                   NULL, 1, NULL, 4,  '{ts escape="sql"}Text message (SMS) sent.{/ts}',                                             0, 1, 1, NULL, NULL, 'fa-mobile'),
-   (@option_group_id_act, '{ts escape="sql"}Event Registration{/ts}',     5,  'Event Registration',    NULL, 1, NULL, 5,  '{ts escape="sql"}Online or offline event registration.{/ts}',                                0, 1, 1, @eventCompId, NULL, NULL),
-   (@option_group_id_act, '{ts escape="sql"}Contribution{/ts}',           6,  'Contribution',          NULL, 1, NULL, 6,  '{ts escape="sql"}Online or offline contribution.{/ts}',                                      0, 1, 1, @contributeCompId, NULL, NULL),
-   (@option_group_id_act, '{ts escape="sql"}Membership Signup{/ts}',      7,  'Membership Signup',     NULL, 1, NULL, 7,  '{ts escape="sql"}Online or offline membership signup.{/ts}',                                 0, 1, 1, @memberCompId, NULL, NULL),
-   (@option_group_id_act, '{ts escape="sql"}Membership Renewal{/ts}',     8,  'Membership Renewal',    NULL, 1, NULL, 8,  '{ts escape="sql"}Online or offline membership renewal.{/ts}',                                0, 1, 1, @memberCompId, NULL, NULL),
-   (@option_group_id_act, '{ts escape="sql"}Tell a Friend{/ts}',          9,  'Tell a Friend',         NULL, 1, NULL, 9,  '{ts escape="sql"}Send information about a contribution campaign or event to a friend.{/ts}', 0, 1, 1, NULL, NULL, NULL),
-   (@option_group_id_act, '{ts escape="sql"}Pledge Acknowledgment{/ts}',  10, 'Pledge Acknowledgment', NULL, 1, NULL, 10, '{ts escape="sql"}Send Pledge Acknowledgment.{/ts}',                                          0, 1, 1, @pledgeCompId, NULL, NULL),
-   (@option_group_id_act, '{ts escape="sql"}Pledge Reminder{/ts}',        11, 'Pledge Reminder',       NULL, 1, NULL, 11, '{ts escape="sql"}Send Pledge Reminder.{/ts}',                                                0, 1, 1, @pledgeCompId, NULL, NULL),
-   (@option_group_id_act, '{ts escape="sql"}Inbound Email{/ts}',          12, 'Inbound Email',         NULL, 1, NULL, 12, '{ts escape="sql"}Inbound Email.{/ts}',                                                       0, 1, 1, NULL, NULL, NULL),
+   (@option_group_id_pcm, '{ts escape="sql"}Phone{/ts}',       1, 'Phone', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_pcm, '{ts escape="sql"}Email{/ts}',       2, 'Email', NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_pcm, '{ts escape="sql"}Postal Mail{/ts}', 3, 'Postal Mail', NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_pcm, '{ts escape="sql"}SMS{/ts}',         4, 'SMS', NULL, 0, 0, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_pcm, '{ts escape="sql"}Fax{/ts}',         5, 'Fax', NULL, 0, 0, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
+
+   (@option_group_id_act, '{ts escape="sql"}Meeting{/ts}',                1,  'Meeting',               NULL, 0, 0, 1,  NULL,                                                                                         0, 1, 1, NULL, NULL, 'fa-slideshare'),
+   (@option_group_id_act, '{ts escape="sql"}Phone Call{/ts}',             2,  'Phone Call',            NULL, 0, 0, 2,  NULL,                                                                                         0, 1, 1, NULL, NULL, 'fa-phone'),
+   (@option_group_id_act, '{ts escape="sql"}Email{/ts}',                  3,  'Email',                 NULL, 1, 0, 3,  '{ts escape="sql"}Email sent.{/ts}',                                                          0, 1, 1, NULL, NULL, 'fa-envelope-o'),
+   (@option_group_id_act, '{ts escape="sql"}Outbound SMS{/ts}',           4,  'SMS',                   NULL, 1, 0, 4,  '{ts escape="sql"}Text message (SMS) sent.{/ts}',                                             0, 1, 1, NULL, NULL, 'fa-mobile'),
+   (@option_group_id_act, '{ts escape="sql"}Event Registration{/ts}',     5,  'Event Registration',    NULL, 1, 0, 5,  '{ts escape="sql"}Online or offline event registration.{/ts}',                                0, 1, 1, @eventCompId, NULL, NULL),
+   (@option_group_id_act, '{ts escape="sql"}Contribution{/ts}',           6,  'Contribution',          NULL, 1, 0, 6,  '{ts escape="sql"}Online or offline contribution.{/ts}',                                      0, 1, 1, @contributeCompId, NULL, NULL),
+   (@option_group_id_act, '{ts escape="sql"}Membership Signup{/ts}',      7,  'Membership Signup',     NULL, 1, 0, 7,  '{ts escape="sql"}Online or offline membership signup.{/ts}',                                 0, 1, 1, @memberCompId, NULL, NULL),
+   (@option_group_id_act, '{ts escape="sql"}Membership Renewal{/ts}',     8,  'Membership Renewal',    NULL, 1, 0, 8,  '{ts escape="sql"}Online or offline membership renewal.{/ts}',                                0, 1, 1, @memberCompId, NULL, NULL),
+   (@option_group_id_act, '{ts escape="sql"}Tell a Friend{/ts}',          9,  'Tell a Friend',         NULL, 1, 0, 9,  '{ts escape="sql"}Send information about a contribution campaign or event to a friend.{/ts}', 0, 1, 1, NULL, NULL, NULL),
+   (@option_group_id_act, '{ts escape="sql"}Pledge Acknowledgment{/ts}',  10, 'Pledge Acknowledgment', NULL, 1, 0, 10, '{ts escape="sql"}Send Pledge Acknowledgment.{/ts}',                                          0, 1, 1, @pledgeCompId, NULL, NULL),
+   (@option_group_id_act, '{ts escape="sql"}Pledge Reminder{/ts}',        11, 'Pledge Reminder',       NULL, 1, 0, 11, '{ts escape="sql"}Send Pledge Reminder.{/ts}',                                                0, 1, 1, @pledgeCompId, NULL, NULL),
+   (@option_group_id_act, '{ts escape="sql"}Inbound Email{/ts}',          12, 'Inbound Email',         NULL, 1, 0, 12, '{ts escape="sql"}Inbound Email.{/ts}',                                                       0, 1, 1, NULL, NULL, NULL),
 
 -- Activity Types for case activities
    (@option_group_id_act, '{ts escape="sql"}Open Case{/ts}',          13, 'Open Case',          NULL, 0,  0, 13, '', 0, 1, 1, @caseCompId, NULL, 'fa-folder-open-o'),
@@ -326,15 +326,15 @@ VALUES
    (@option_group_id_act, '{ts escape="sql"}Change Case Subject{/ts}',53, 'Change Case Subject',NULL, 0,  0, 53, '', 0, 1, 1, @caseCompId, NULL, 'fa-pencil-square-o'),
    (@option_group_id_act, '{ts escape="sql"}Change Custom Data{/ts}', 33, 'Change Custom Data', NULL, 0,  0, 33, '', 0, 1, 1, @caseCompId, NULL, 'fa-table'),
 
-   (@option_group_id_act, '{ts escape="sql"}Membership Renewal Reminder{/ts}',        17, 'Membership Renewal Reminder',  NULL, 1, NULL, 17, '{ts escape="sql"}offline membership renewal reminder.{/ts}',                      0, 1, 1, @memberCompId, NULL, NULL),
+   (@option_group_id_act, '{ts escape="sql"}Membership Renewal Reminder{/ts}',        17, 'Membership Renewal Reminder',  NULL, 1, 0, 17, '{ts escape="sql"}offline membership renewal reminder.{/ts}',                      0, 1, 1, @memberCompId, NULL, NULL),
    (@option_group_id_act, '{ts escape="sql"}Change Case Start Date{/ts}',             18, 'Change Case Start Date',         NULL, 0,  0, 18, '', 0, 1, 1, @caseCompId, NULL , 'fa-calendar'),
-   (@option_group_id_act, '{ts escape="sql"}Bulk Email{/ts}',                         19, 'Bulk Email',         NULL, 1, NULL, 19, '{ts escape="sql"}Bulk Email Sent.{/ts}',                                                    0, 1, 1, NULL, NULL, NULL),
+   (@option_group_id_act, '{ts escape="sql"}Bulk Email{/ts}',                         19, 'Bulk Email',         NULL, 1, 0, 19, '{ts escape="sql"}Bulk Email Sent.{/ts}',                                                    0, 1, 1, NULL, NULL, NULL),
    (@option_group_id_act, '{ts escape="sql"}Assign Case Role{/ts}',                   20, 'Assign Case Role', NULL,0, 0, 20, '', 0, 1, 1, @caseCompId, NULL, 'fa-user-plus'),
    (@option_group_id_act, '{ts escape="sql"}Remove Case Role{/ts}',                   21, 'Remove Case Role', NULL,0, 0, 21, '', 0, 1, 1, @caseCompId, NULL, 'fa-user-times'),
-   (@option_group_id_act, '{ts escape="sql"}Print/Merge Document{/ts}',               22, 'Print PDF Letter',    NULL, 0, NULL, 22, '{ts escape="sql"}Export letters and other printable documents.{/ts}',                     0, 1, 1, NULL, NULL, 'fa-file-pdf-o'),
-   (@option_group_id_act, '{ts escape="sql"}Merge Case{/ts}',                         23, 'Merge Case', NULL, 0,  NULL, 23, '', 0, 1, 1, @caseCompId, NULL , 'fa-compress'),
-   (@option_group_id_act, '{ts escape="sql"}Reassigned Case{/ts}',                    24, 'Reassigned Case', NULL, 0,  NULL, 24, '', 0, 1, 1, @caseCompId, NULL , 'fa-user-circle-o'),
-   (@option_group_id_act, '{ts escape="sql"}Link Cases{/ts}',                         25, 'Link Cases', NULL, 0,  NULL, 25, '', 0, 1, 1, @caseCompId, NULL , 'fa-link'),
+   (@option_group_id_act, '{ts escape="sql"}Print/Merge Document{/ts}',               22, 'Print PDF Letter',    NULL, 0, 0, 22, '{ts escape="sql"}Export letters and other printable documents.{/ts}',                     0, 1, 1, NULL, NULL, 'fa-file-pdf-o'),
+   (@option_group_id_act, '{ts escape="sql"}Merge Case{/ts}',                         23, 'Merge Case', NULL, 0,  0, 23, '', 0, 1, 1, @caseCompId, NULL , 'fa-compress'),
+   (@option_group_id_act, '{ts escape="sql"}Reassigned Case{/ts}',                    24, 'Reassigned Case', NULL, 0,  0, 24, '', 0, 1, 1, @caseCompId, NULL , 'fa-user-circle-o'),
+   (@option_group_id_act, '{ts escape="sql"}Link Cases{/ts}',                         25, 'Link Cases', NULL, 0,  0, 25, '', 0, 1, 1, @caseCompId, NULL , 'fa-link'),
    (@option_group_id_act, '{ts escape="sql"}Change Case Tags{/ts}',                   26, 'Change Case Tags', NULL,0, 0, 26, '', 0, 1, 1, @caseCompId, NULL, 'fa-tags'),
    (@option_group_id_act, '{ts escape="sql"}Add Client To Case{/ts}',                 27, 'Add Client To Case', NULL,0, 0, 26, '', 0, 1, 1, @caseCompId, NULL, 'fa-users'),
 
@@ -344,11 +344,11 @@ VALUES
    (@option_group_id_act, '{ts escape="sql"}PhoneBank{/ts}',                          30, 'PhoneBank', NULL,0, 0, 29, '', 0, 1, 1, @campaignCompId, NULL, NULL),
    (@option_group_id_act, '{ts escape="sql"}WalkList{/ts}',                           31, 'WalkList', NULL,0, 0, 30, '', 0, 1, 1, @campaignCompId, NULL, NULL),
    (@option_group_id_act, '{ts escape="sql"}Petition Signature{/ts}',                 32, 'Petition', NULL,0, 0, 31, '', 0, 1, 1, @campaignCompId, NULL, NULL),
-   (@option_group_id_act, '{ts escape="sql"}Mass SMS{/ts}',                           34, 'Mass SMS',         NULL, 1, NULL, 34, '{ts escape="sql"}Mass SMS{/ts}',                                                    0, 1, 1, NULL, NULL, NULL),
+   (@option_group_id_act, '{ts escape="sql"}Mass SMS{/ts}',                           34, 'Mass SMS',         NULL, 1, 0, 34, '{ts escape="sql"}Mass SMS{/ts}',                                                    0, 1, 1, NULL, NULL, NULL),
 
 -- Additional Membership-related Activity Types
-   (@option_group_id_act, '{ts escape="sql"}Change Membership Status{/ts}',           35, 'Change Membership Status',   NULL, 1, NULL, 35, '{ts escape="sql"}Change Membership Status.{/ts}',                         0, 1, 1, @memberCompId, NULL, NULL),
-   (@option_group_id_act, '{ts escape="sql"}Change Membership Type{/ts}',             36, 'Change Membership Type',     NULL, 1, NULL, 36, '{ts escape="sql"}Change Membership Type.{/ts}',                           0, 1, 1, @memberCompId, NULL, NULL),
+   (@option_group_id_act, '{ts escape="sql"}Change Membership Status{/ts}',           35, 'Change Membership Status',   NULL, 1, 0, 35, '{ts escape="sql"}Change Membership Status.{/ts}',                         0, 1, 1, @memberCompId, NULL, NULL),
+   (@option_group_id_act, '{ts escape="sql"}Change Membership Type{/ts}',             36, 'Change Membership Type',     NULL, 1, 0, 36, '{ts escape="sql"}Change Membership Type.{/ts}',                           0, 1, 1, @memberCompId, NULL, NULL),
 
    (@option_group_id_act, '{ts escape="sql"}Cancel Recurring Contribution{/ts}',      37, 'Cancel Recurring Contribution', NULL,1, 0, 37, '', 0, 1, 1, @contributeCompId, NULL, NULL),
    (@option_group_id_act, '{ts escape="sql"}Update Recurring Contribution Billing Details{/ts}',      38, 'Update Recurring Contribution Billing Details', NULL,1, 0, 38, '', 0, 1, 1, @contributeCompId, NULL, NULL),
@@ -362,30 +362,30 @@ VALUES
    (@option_group_id_act, '{ts escape="sql"}Edit Batch{/ts}', 43, 'Edit Batch', NULL, 1, 0, 43, 'Edit Batch', 0, 1, 1, @contributeCompId, NULL, NULL),
 
 -- new sms options
-   (@option_group_id_act, '{ts escape="sql"}SMS delivery{/ts}', 44, 'SMS delivery', NULL, 1, NULL, 44, '{ts escape="sql"}SMS delivery{/ts}', 0, 1, 1, NULL, NULL, NULL),
-   (@option_group_id_act, '{ts escape="sql"}Inbound SMS{/ts}',  45, 'Inbound SMS', NULL, 1, NULL,  45, '{ts escape="sql"}Inbound SMS{/ts}', 0, 1, 1, NULL, NULL, NULL),
+   (@option_group_id_act, '{ts escape="sql"}SMS delivery{/ts}', 44, 'SMS delivery', NULL, 1, 0, 44, '{ts escape="sql"}SMS delivery{/ts}', 0, 1, 1, NULL, NULL, NULL),
+   (@option_group_id_act, '{ts escape="sql"}Inbound SMS{/ts}',  45, 'Inbound SMS', NULL, 1, 0,  45, '{ts escape="sql"}Inbound SMS{/ts}', 0, 1, 1, NULL, NULL, NULL),
 
 
  -- Activity types for particial payment
-   (@option_group_id_act, '{ts escape="sql"}Payment{/ts}', 46, 'Payment', NULL, 1, NULL, 46, '{ts escape="sql"}Additional payment recorded for event or membership fee.{/ts}', 0, 1, 1, @contributeCompId, NULL, NULL),
-   (@option_group_id_act, '{ts escape="sql"}Refund{/ts}', 47, 'Refund', NULL, 1, NULL, 47, '{ts escape="sql"}Refund recorded for event or membership fee.{/ts}', 0, 1, 1, @contributeCompId, NULL, NULL),
+   (@option_group_id_act, '{ts escape="sql"}Payment{/ts}', 46, 'Payment', NULL, 1, 0, 46, '{ts escape="sql"}Additional payment recorded for event or membership fee.{/ts}', 0, 1, 1, @contributeCompId, NULL, NULL),
+   (@option_group_id_act, '{ts escape="sql"}Refund{/ts}', 47, 'Refund', NULL, 1, 0, 47, '{ts escape="sql"}Refund recorded for event or membership fee.{/ts}', 0, 1, 1, @contributeCompId, NULL, NULL),
 
  -- for selection changes
-   (@option_group_id_act, '{ts escape="sql"}Change Registration{/ts}', 48, 'Change Registration', NULL, 1, NULL, 48, '{ts escape="sql"}Changes to an existing event registration.{/ts}', 0, 1, 1, @eventCompId, NULL, NULL),
+   (@option_group_id_act, '{ts escape="sql"}Change Registration{/ts}', 48, 'Change Registration', NULL, 1, 0, 48, '{ts escape="sql"}Changes to an existing event registration.{/ts}', 0, 1, 1, @eventCompId, NULL, NULL),
  -- for Print or Email Contribution Invoices
-   (@option_group_id_act, '{ts escape="sql"}Downloaded Invoice{/ts}', 49, 'Downloaded Invoice',      NULL, 1, NULL, 49, '{ts escape="sql"}Downloaded Invoice.{/ts}',0, 1, 1, NULL, NULL, NULL),
-   (@option_group_id_act, '{ts escape="sql"}Emailed Invoice{/ts}', 50, 'Emailed Invoice',      NULL, 1, NULL, 50, '{ts escape="sql"}Emailed Invoice.{/ts}',0, 1, 1, NULL, NULL, NULL),
+   (@option_group_id_act, '{ts escape="sql"}Downloaded Invoice{/ts}', 49, 'Downloaded Invoice',      NULL, 1, 0, 49, '{ts escape="sql"}Downloaded Invoice.{/ts}',0, 1, 1, NULL, NULL, NULL),
+   (@option_group_id_act, '{ts escape="sql"}Emailed Invoice{/ts}', 50, 'Emailed Invoice',      NULL, 1, 0, 50, '{ts escape="sql"}Emailed Invoice.{/ts}',0, 1, 1, NULL, NULL, NULL),
 
   -- for manual contact merge
-   (@option_group_id_act, '{ts escape="sql"}Contact Merged{/ts}', 51, 'Contact Merged', NULL, 1, NULL, 51, '{ts escape="sql"}Contact Merged{/ts}',0, 1, 1, NULL, NULL, NULL),
-   (@option_group_id_act, '{ts escape="sql"}Contact Deleted by Merge{/ts}', 52, 'Contact Deleted by Merge', NULL, 1, NULL, 52, '{ts escape="sql"}Contact was merged into another contact{/ts}',0, 1, 1, NULL, NULL, NULL),
+   (@option_group_id_act, '{ts escape="sql"}Contact Merged{/ts}', 51, 'Contact Merged', NULL, 1, 0, 51, '{ts escape="sql"}Contact Merged{/ts}',0, 1, 1, NULL, NULL, NULL),
+   (@option_group_id_act, '{ts escape="sql"}Contact Deleted by Merge{/ts}', 52, 'Contact Deleted by Merge', NULL, 1, 0, 52, '{ts escape="sql"}Contact was merged into another contact{/ts}',0, 1, 1, NULL, NULL, NULL),
 
   -- Activity Type for failed payment
    (@option_group_id_act, 'Failed Payment', 54, 'Failed Payment', NULL, 1, 0, 54, 'Failed Payment', 0, 1, 1, @contributeCompId, NULL, NULL),
 
-   (@option_group_id_gender, '{ts escape="sql"}Female{/ts}', 1, 'Female', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_gender, '{ts escape="sql"}Male{/ts}',   2, 'Male',   NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_gender, '{ts escape="sql"}Other{/ts}',  3, 'Other',  NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_gender, '{ts escape="sql"}Female{/ts}', 1, 'Female', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_gender, '{ts escape="sql"}Male{/ts}',   2, 'Male',   NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_gender, '{ts escape="sql"}Other{/ts}',  3, 'Other',  NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
 
    (@option_group_id_IMProvider, 'Yahoo', 1, 'Yahoo', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
    (@option_group_id_IMProvider, 'MSN',   2, 'Msn',   NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
@@ -394,31 +394,31 @@ VALUES
    (@option_group_id_IMProvider, 'Jabber',5, 'Jabber',NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
    (@option_group_id_IMProvider, 'Skype', 6, 'Skype', NULL, 0, NULL, 6, NULL, 0, 0, 1, NULL, NULL, NULL),
 
-   (@option_group_id_mobileProvider, 'Sprint'  , 1, 'Sprint'  , NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_mobileProvider, 'Verizon' , 2, 'Verizon' , NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_mobileProvider, 'Cingular', 3, 'Cingular', NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_mobileProvider, 'Sprint'  , 1, 'Sprint'  , NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_mobileProvider, 'Verizon' , 2, 'Verizon' , NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_mobileProvider, 'Cingular', 3, 'Cingular', NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
 
-   (@option_group_id_prefix, '{ts escape="sql"}Mrs.{/ts}', 1, 'Mrs.', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_prefix, '{ts escape="sql"}Ms.{/ts}',  2, 'Ms.',  NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_prefix, '{ts escape="sql"}Mr.{/ts}',  3, 'Mr.',  NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_prefix, '{ts escape="sql"}Dr.{/ts}',  4, 'Dr.',  NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_prefix, '{ts escape="sql"}Mrs.{/ts}', 1, 'Mrs.', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_prefix, '{ts escape="sql"}Ms.{/ts}',  2, 'Ms.',  NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_prefix, '{ts escape="sql"}Mr.{/ts}',  3, 'Mr.',  NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_prefix, '{ts escape="sql"}Dr.{/ts}',  4, 'Dr.',  NULL, 0, 0, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
 
-   (@option_group_id_suffix, '{ts escape="sql"}Jr.{/ts}',  1, 'Jr.', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_suffix, '{ts escape="sql"}Sr.{/ts}',  2, 'Sr.', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_suffix, 'II',  3, 'II',  NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_suffix, 'III', 4, 'III', NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_suffix, 'IV',  5, 'IV',  NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_suffix, 'V',   6, 'V',   NULL, 0, NULL, 6, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_suffix, 'VI',  7, 'VI',  NULL, 0, NULL, 7, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_suffix, 'VII', 8, 'VII', NULL, 0, NULL, 8, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_suffix, '{ts escape="sql"}Jr.{/ts}',  1, 'Jr.', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_suffix, '{ts escape="sql"}Sr.{/ts}',  2, 'Sr.', NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_suffix, 'II',  3, 'II',  NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_suffix, 'III', 4, 'III', NULL, 0, 0, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_suffix, 'IV',  5, 'IV',  NULL, 0, 0, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_suffix, 'V',   6, 'V',   NULL, 0, 0, 6, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_suffix, 'VI',  7, 'VI',  NULL, 0, 0, 7, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_suffix, 'VII', 8, 'VII', NULL, 0, 0, 8, NULL, 0, 0, 1, NULL, NULL, NULL),
 
-   (@option_group_id_aclRole, '{ts escape="sql"}Administrator{/ts}',  1, 'Admin', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_aclRole, '{ts escape="sql"}Authenticated{/ts}',  2, 'Auth' , NULL, 0, NULL, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
+   (@option_group_id_aclRole, '{ts escape="sql"}Administrator{/ts}',  1, 'Admin', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_aclRole, '{ts escape="sql"}Authenticated{/ts}',  2, 'Auth' , NULL, 0, 0, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
 
-   (@option_group_id_acc, 'Visa'      ,  1, 'Visa'      , NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_acc, 'MasterCard',  2, 'MasterCard', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_acc, 'Amex'      ,  3, 'Amex'      , NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_acc, 'Discover'  ,  4, 'Discover'  , NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_acc, 'Visa'      ,  1, 'Visa'      , NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_acc, 'MasterCard',  2, 'MasterCard', NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_acc, 'Amex'      ,  3, 'Amex'      , NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_acc, 'Discover'  ,  4, 'Discover'  , NULL, 0, 0, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
 
   (@option_group_id_pi, '{ts escape="sql"}Credit Card{/ts}',  1, 'Credit Card', NULL, 0, 0, 1, NULL, 0, 1, 1, NULL, NULL, NULL),
   (@option_group_id_pi, '{ts escape="sql"}Debit Card{/ts}',   2, 'Debit Card',  NULL, 0, 0, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
@@ -426,213 +426,213 @@ VALUES
   (@option_group_id_pi, '{ts escape="sql"}Check{/ts}',        4, 'Check',       NULL, 0, 1, 4, NULL, 0, 1, 1, NULL, NULL, NULL),
   (@option_group_id_pi, '{ts escape="sql"}EFT{/ts}',          5, 'EFT',         NULL, 0, 0, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
 
-  (@option_group_id_cs, '{ts escape="sql"}Completed{/ts}'  , 1, 'Completed'  , NULL, 0, NULL, 1, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_cs, '{ts escape="sql"}Pending{/ts}'    , 2, 'Pending'    , NULL, 0, NULL, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_cs, '{ts escape="sql"}Cancelled{/ts}'  , 3, 'Cancelled'  , NULL, 0, NULL, 3, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_cs, '{ts escape="sql"}Failed{/ts}'     , 4, 'Failed'     , NULL, 0, NULL, 4, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_cs, '{ts escape="sql"}In Progress{/ts}', 5, 'In Progress', NULL, 0, NULL, 5, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_cs, '{ts escape="sql"}Overdue{/ts}'    , 6, 'Overdue'    , NULL, 0, NULL, 6, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_cs, '{ts escape="sql"}Refunded{/ts}'   , 7, 'Refunded'   , NULL, 0, NULL, 7, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_cs, '{ts escape="sql"}Partially paid{/ts}', 8, 'Partially paid', NULL, 0, NULL, 8, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_cs, '{ts escape="sql"}Pending refund{/ts}', 9, 'Pending refund', NULL, 0, NULL, 9, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_cs, '{ts escape="sql"}Chargeback{/ts}', 10, 'Chargeback', NULL, 0, NULL, 10, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_cs, '{ts escape="sql"}Template{/ts}'  , 11, 'Template',   NULL, 0, NULL, 11, '{ts escape="sql"}Status for contribution records which represent a template for a recurring contribution rather than an actual contribution. This status is transitional, to ensure that said contributions don\'t appear in reports. The is_template field is the preferred way to find and filter these contributions.{/ts}', 0, 1, 1, NULL, NULL, NULL),
-
-  (@option_group_id_pcp, '{ts escape="sql"}Waiting Review{/ts}', 1, 'Waiting Review', NULL, 0, NULL, 1, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_pcp, '{ts escape="sql"}Approved{/ts}'      , 2, 'Approved'      , NULL, 0, NULL, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_pcp, '{ts escape="sql"}Not Approved{/ts}'  , 3, 'Not Approved'  , NULL, 0, NULL, 3, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_cs, '{ts escape="sql"}Completed{/ts}'  , 1, 'Completed'  , NULL, 0, 0, 1, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_cs, '{ts escape="sql"}Pending{/ts}'    , 2, 'Pending'    , NULL, 0, 0, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_cs, '{ts escape="sql"}Cancelled{/ts}'  , 3, 'Cancelled'  , NULL, 0, 0, 3, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_cs, '{ts escape="sql"}Failed{/ts}'     , 4, 'Failed'     , NULL, 0, 0, 4, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_cs, '{ts escape="sql"}In Progress{/ts}', 5, 'In Progress', NULL, 0, 0, 5, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_cs, '{ts escape="sql"}Overdue{/ts}'    , 6, 'Overdue'    , NULL, 0, 0, 6, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_cs, '{ts escape="sql"}Refunded{/ts}'   , 7, 'Refunded'   , NULL, 0, 0, 7, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_cs, '{ts escape="sql"}Partially paid{/ts}', 8, 'Partially paid', NULL, 0, 0, 8, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_cs, '{ts escape="sql"}Pending refund{/ts}', 9, 'Pending refund', NULL, 0, 0, 9, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_cs, '{ts escape="sql"}Chargeback{/ts}', 10, 'Chargeback', NULL, 0, 0, 10, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_cs, '{ts escape="sql"}Template{/ts}'  , 11, 'Template',   NULL, 0, 0, 11, '{ts escape="sql"}Status for contribution records which represent a template for a recurring contribution rather than an actual contribution. This status is transitional, to ensure that said contributions don\'t appear in reports. The is_template field is the preferred way to find and filter these contributions.{/ts}', 0, 1, 1, NULL, NULL, NULL),
+
+  (@option_group_id_pcp, '{ts escape="sql"}Waiting Review{/ts}', 1, 'Waiting Review', NULL, 0, 0, 1, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_pcp, '{ts escape="sql"}Approved{/ts}'      , 2, 'Approved'      , NULL, 0, 0, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_pcp, '{ts escape="sql"}Not Approved{/ts}'  , 3, 'Not Approved'  , NULL, 0, 0, 3, NULL, 0, 1, 1, NULL, NULL, NULL),
 
   (@option_group_id_pcpOwnerNotify, '{ts escape="sql"}Owner chooses whether to receive notifications{/ts}', 1, 'owner_chooses', NULL, 0, 1, 1, NULL, 0, 1, 1, NULL, NULL, NULL),
   (@option_group_id_pcpOwnerNotify, '{ts escape="sql"}Notifications are sent to ALL owners{/ts}'      , 2, 'all_owners'      , NULL, 0, 0, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
   (@option_group_id_pcpOwnerNotify, '{ts escape="sql"}Notifications are NOT available{/ts}'  , 3, 'no_notifications'  , NULL, 0, 0, 3, NULL, 0, 1, 1, NULL, NULL, NULL),
 
-  (@option_group_id_pRole, '{ts escape="sql"}Attendee{/ts}',  1, 'Attendee',  NULL, 1, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_pRole, '{ts escape="sql"}Volunteer{/ts}', 2, 'Volunteer', NULL, 1, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_pRole, '{ts escape="sql"}Host{/ts}',      3, 'Host',      NULL, 1, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_pRole, '{ts escape="sql"}Speaker{/ts}',   4, 'Speaker',   NULL, 1, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_pRole, '{ts escape="sql"}Attendee{/ts}',  1, 'Attendee',  NULL, 1, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_pRole, '{ts escape="sql"}Volunteer{/ts}', 2, 'Volunteer', NULL, 1, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_pRole, '{ts escape="sql"}Host{/ts}',      3, 'Host',      NULL, 1, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_pRole, '{ts escape="sql"}Speaker{/ts}',   4, 'Speaker',   NULL, 1, 0, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
 
-  (@option_group_id_etype, '{ts escape="sql"}Conference{/ts}', 1, 'Conference',  NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_etype, '{ts escape="sql"}Exhibition{/ts}', 2, 'Exhibition',  NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_etype, '{ts escape="sql"}Fundraiser{/ts}', 3, 'Fundraiser',  NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_etype, '{ts escape="sql"}Meeting{/ts}',    4, 'Meeting',     NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_etype, '{ts escape="sql"}Performance{/ts}',5, 'Performance', NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_etype, '{ts escape="sql"}Workshop{/ts}',   6, 'Workshop',    NULL, 0, NULL, 6, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_etype, '{ts escape="sql"}Conference{/ts}', 1, 'Conference',  NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_etype, '{ts escape="sql"}Exhibition{/ts}', 2, 'Exhibition',  NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_etype, '{ts escape="sql"}Fundraiser{/ts}', 3, 'Fundraiser',  NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_etype, '{ts escape="sql"}Meeting{/ts}',    4, 'Meeting',     NULL, 0, 0, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_etype, '{ts escape="sql"}Performance{/ts}',5, 'Performance', NULL, 0, 0, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_etype, '{ts escape="sql"}Workshop{/ts}',   6, 'Workshop',    NULL, 0, 0, 6, NULL, 0, 0, 1, NULL, NULL, NULL),
 
 -- note that these are not ts'ed since they are used for logic in most cases and not display
 -- they are used for display only in the prefernces field settings
-  (@option_group_id_cvOpt, '{ts escape="sql"}Activities{/ts}'   ,   1, 'activity', NULL, 0, NULL,  1,  NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_cvOpt, '{ts escape="sql"}Relationships{/ts}',   2, 'rel', NULL, 0, NULL,  2,  NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_cvOpt, '{ts escape="sql"}Groups{/ts}'       ,   3, 'group', NULL, 0, NULL,  3,  NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_cvOpt, '{ts escape="sql"}Notes{/ts}'        ,   4, 'note', NULL, 0, NULL,  4,  NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_cvOpt, '{ts escape="sql"}Tags{/ts}'         ,   5, 'tag', NULL, 0, NULL,  5,  NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_cvOpt, '{ts escape="sql"}Change Log{/ts}'   ,   6, 'log', NULL, 0, NULL,  6,  NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_cvOpt, '{ts escape="sql"}Contributions{/ts}',   7, 'CiviContribute', NULL, 0, NULL,  7,  NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_cvOpt, '{ts escape="sql"}Memberships{/ts}'  ,   8, 'CiviMember', NULL, 0, NULL,  8,  NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_cvOpt, '{ts escape="sql"}Events{/ts}'       ,   9, 'CiviEvent', NULL, 0, NULL,  9,  NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_cvOpt, '{ts escape="sql"}Cases{/ts}'        ,  10, 'CiviCase', NULL, 0, NULL,  10, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_cvOpt, '{ts escape="sql"}Pledges{/ts}'      ,  13, 'CiviPledge', NULL, 0, NULL,  13, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_cvOpt, '{ts escape="sql"}Mailings{/ts}'     ,  14, 'CiviMail', NULL, 0, NULL,  14, NULL, 0, 0, 1, NULL, NULL, NULL),
-
-
-  (@option_group_id_csgOpt, '{ts escape="sql"}Show Smart Groups on Demand{/ts}',1, 'showondemand', NULL, 0, NULL,  1,  NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_csgOpt, '{ts escape="sql"}Always Show Smart Groups{/ts}',   2, 'alwaysshow', NULL, 0, NULL,  2,  NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_csgOpt, '{ts escape="sql"}Hide Smart Groups{/ts}'       ,   3, 'hide', NULL, 0, NULL,  3,  NULL, 0, 0, 1, NULL, NULL, NULL),
-
-  (@option_group_id_ceOpt, '{ts escape="sql"}Custom Data{/ts}'              ,   1, 'CustomData', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_ceOpt, '{ts escape="sql"}Address{/ts}'                  ,   2, 'Address', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_ceOpt, '{ts escape="sql"}Communication Preferences{/ts}',   3, 'CommunicationPreferences', NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_ceOpt, '{ts escape="sql"}Notes{/ts}'                    ,   4, 'Notes', NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_ceOpt, '{ts escape="sql"}Demographics{/ts}'             ,   5, 'Demographics', NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_ceOpt, '{ts escape="sql"}Tags and Groups{/ts}'          ,   6, 'TagsAndGroups', NULL, 0, NULL, 6, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_ceOpt, '{ts escape="sql"}Email{/ts}'                    ,   7, 'Email', NULL, 1, NULL, 7, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_ceOpt, '{ts escape="sql"}Phone{/ts}'                    ,   8, 'Phone', NULL, 1, NULL, 8, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_ceOpt, '{ts escape="sql"}Instant Messenger{/ts}'        ,   9, 'IM', NULL, 1, NULL, 9, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_ceOpt, '{ts escape="sql"}Open ID{/ts}'                  ,   10, 'OpenID', NULL, 1, NULL, 10, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_ceOpt, '{ts escape="sql"}Website{/ts}'                  ,   11, 'Website', NULL, 1, NULL, 11, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_ceOpt, '{ts escape="sql"}Prefix{/ts}'                   ,   12, 'Prefix', NULL, 2, NULL, 12, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_ceOpt, '{ts escape="sql"}Formal Title{/ts}'             ,   13, 'Formal Title', NULL, 2, NULL, 13, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_ceOpt, '{ts escape="sql"}First Name{/ts}'               ,   14, 'First Name', NULL, 2, NULL, 14, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_ceOpt, '{ts escape="sql"}Middle Name{/ts}'              ,   15, 'Middle Name', NULL, 2, NULL, 15, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_ceOpt, '{ts escape="sql"}Last Name{/ts}'                ,   16, 'Last Name', NULL, 2, NULL, 16, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_ceOpt, '{ts escape="sql"}Suffix{/ts}'                   ,   17, 'Suffix', NULL, 2, NULL, 17, NULL, 0, 0, 1, NULL, NULL, NULL),
-
-  (@option_group_id_asOpt, '{ts escape="sql"}Address Fields{/ts}'          ,   1, 'location', NULL, 0, NULL,  1, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_asOpt, '{ts escape="sql"}Custom Fields{/ts}'           ,   2, 'custom', NULL, 0, NULL,  2, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_asOpt, '{ts escape="sql"}Activities{/ts}'              ,   3, 'activity', NULL, 0, NULL,  4, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_asOpt, '{ts escape="sql"}Relationships{/ts}'           ,   4, 'relationship', NULL, 0, NULL,  5, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_asOpt, '{ts escape="sql"}Notes{/ts}'                   ,   5, 'notes', NULL, 0, NULL,  6, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_asOpt, '{ts escape="sql"}Change Log{/ts}'              ,   6, 'changeLog', NULL, 0, NULL,  7, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_asOpt, '{ts escape="sql"}Contributions{/ts}'           ,   7, 'CiviContribute', NULL, 0, NULL,  8, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_asOpt, '{ts escape="sql"}Memberships{/ts}'             ,   8, 'CiviMember', NULL, 0, NULL,  9, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_asOpt, '{ts escape="sql"}Events{/ts}'                  ,   9, 'CiviEvent', NULL, 0, NULL, 10, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_asOpt, '{ts escape="sql"}Cases{/ts}'                   ,  10, 'CiviCase', NULL, 0, NULL, 11, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_asOpt, '{ts escape="sql"}Demographics{/ts}'            ,  13, 'demographics', NULL, 0, NULL, 15, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_asOpt, '{ts escape="sql"}Pledges{/ts}'                 ,  15, 'CiviPledge', NULL, 0, NULL, 17, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_asOpt, '{ts escape="sql"}Contact Type{/ts}'            ,  16, 'contactType', NULL, 0, NULL, 18, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_asOpt, '{ts escape="sql"}Groups{/ts}'                  ,  17, 'groups', NULL, 0, NULL, 19, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_asOpt, '{ts escape="sql"}Tags{/ts}'                    ,  18, 'tags', NULL, 0, NULL, 20, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_asOpt, '{ts escape="sql"}Mailing{/ts}'                 ,  19, 'CiviMail', NULL, 0, NULL, 21, NULL, 0, 0, 1, NULL, NULL, NULL),
-
-  (@option_group_id_udOpt, '{ts escape="sql"}Groups{/ts}'                     , 1, 'Groups', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_udOpt, '{ts escape="sql"}Contributions{/ts}'              , 2, 'CiviContribute', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_udOpt, '{ts escape="sql"}Memberships{/ts}'                , 3, 'CiviMember', NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_udOpt, '{ts escape="sql"}Events{/ts}'                     , 4, 'CiviEvent', NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_udOpt, '{ts escape="sql"}My Contacts / Organizations{/ts}', 5, 'Permissioned Orgs', NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_udOpt, '{ts escape="sql"}Pledges{/ts}'                    , 7, 'CiviPledge', NULL, 0, NULL, 7, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_udOpt, '{ts escape="sql"}Personal Campaign Pages{/ts}'    , 8, 'PCP', NULL, 0, NULL, 8, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_udOpt, '{ts escape="sql"}Assigned Activities{/ts}'        , 9, 'Assigned Activities', NULL, 0, NULL, 9, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_udOpt, '{ts escape="sql"}Invoices / Credit Notes{/ts}'     , 10, 'Invoices / Credit Notes', NULL, 0, NULL, 10, NULL, 0, 0, 1, NULL, NULL, NULL),
-
-  (@option_group_id_acsOpt, '{ts escape="sql"}Email Address{/ts}'   , 2, 'email'         , NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_acsOpt, '{ts escape="sql"}Phone{/ts}'           , 3, 'phone'         , NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_acsOpt, '{ts escape="sql"}Street Address{/ts}'  , 4, 'street_address', NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_acsOpt, '{ts escape="sql"}City{/ts}'            , 5, 'city'          , NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_acsOpt, '{ts escape="sql"}State/Province{/ts}'  , 6, 'state_province', NULL, 0, NULL, 6, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_acsOpt, '{ts escape="sql"}Country{/ts}'         , 7, 'country'       , NULL, 0, NULL, 7, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_acsOpt, '{ts escape="sql"}Postal Code{/ts}'     , 8, 'postal_code'   , NULL, 0, NULL, 8, NULL, 0, 0, 1, NULL, NULL, NULL),
-
-  (@option_group_id_acConRef, '{ts escape="sql"}Email Address{/ts}'   , 2, 'email'         , NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_acConRef, '{ts escape="sql"}Phone{/ts}'           , 3, 'phone'         , NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_acConRef, '{ts escape="sql"}Street Address{/ts}'  , 4, 'street_address', NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_acConRef, '{ts escape="sql"}City{/ts}'            , 5, 'city'          , NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_acConRef, '{ts escape="sql"}State/Province{/ts}'  , 6, 'state_province', NULL, 0, NULL, 6, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_acConRef, '{ts escape="sql"}Country{/ts}'         , 7, 'country'       , NULL, 0, NULL, 7, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_acConRef, '{ts escape="sql"}Postal Code{/ts}'     , 8, 'postal_code'   , NULL, 0, NULL, 8, NULL, 0, 0, 1, NULL, NULL, NULL),
-
-  (@option_group_id_adOpt, '{ts escape="sql"}Street Address{/ts}'    ,  1, 'street_address', NULL, 0, NULL,  1, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_adOpt, '{ts escape="sql"}Supplemental Address 1{/ts}'  ,  2, 'supplemental_address_1', NULL, 0, NULL,  2, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_adOpt, '{ts escape="sql"}Supplemental Address 2{/ts}'  ,  3, 'supplemental_address_2', NULL, 0, NULL,  3, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_adOpt, '{ts escape="sql"}Supplemental Address 3{/ts}'  ,  4, 'supplemental_address_3', NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_adOpt, '{ts escape="sql"}City{/ts}'              ,  5, 'city'          , NULL, 0, NULL,  5, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_adOpt, '{ts escape="sql"}Postal Code{/ts}' ,  6, 'postal_code'   , NULL, 0, NULL,  6, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_adOpt, '{ts escape="sql"}Postal Code Suffix{/ts}',  7, 'postal_code_suffix', NULL, 0, NULL,  7, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_adOpt, '{ts escape="sql"}County{/ts}'            ,  8, 'county'        , NULL, 0, NULL,  8, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_adOpt, '{ts escape="sql"}State/Province{/ts}'  ,  9, 'state_province', NULL, 0, NULL,  9, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_adOpt, '{ts escape="sql"}Country{/ts}'           , 10, 'country'       , NULL, 0, NULL, 10, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_adOpt, '{ts escape="sql"}Latitude{/ts}'          , 11, 'geo_code_1'    , NULL, 0, NULL, 11, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_adOpt, '{ts escape="sql"}Longitude{/ts}'         , 12, 'geo_code_2', NULL, 0, NULL, 12, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_adOpt, '{ts escape="sql"}Address Name{/ts}'      , 13, 'address_name', NULL, 0, NULL, 13, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_adOpt, '{ts escape="sql"}Street Address Parsing{/ts}', 14, 'street_address_parsing', NULL, 0, NULL, 14, NULL, 0, 0, 1, NULL, NULL, NULL),
-
-  (@option_group_id_gType, '{ts escape="sql"}Access Control{/ts}', 1, 'Access Control', NULL, 0, NULL, 1, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_gType, '{ts escape="sql"}Mailing List{/ts}',   2, 'Mailing List',   NULL, 0, NULL, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
-
-  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_Sample'               , 1, 'CRM_Contact_Form_Search_Custom_Sample'      , NULL, 0, NULL, 1, '{ts escape="sql"}Household Name and State{/ts}', 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_ContributionAggregate', 2, 'CRM_Contact_Form_Search_Custom_ContributionAggregate', NULL, 0, NULL, 2, '{ts escape="sql"}Contribution Aggregate{/ts}', 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_Group'                , 4, 'CRM_Contact_Form_Search_Custom_Group'       , NULL, 0, NULL, 4, '{ts escape="sql"}Include / Exclude Search{/ts}', 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_PostalMailing'        , 5, 'CRM_Contact_Form_Search_Custom_PostalMailing', NULL, 0, NULL, 5, '{ts escape="sql"}Postal Mailing{/ts}', 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_Proximity'            , 6, 'CRM_Contact_Form_Search_Custom_Proximity', NULL, 0, NULL, 6, '{ts escape="sql"}Proximity Search{/ts}', 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_EventAggregate'       , 7, 'CRM_Contact_Form_Search_Custom_EventAggregate', NULL, 0, NULL, 7, '{ts escape="sql"}Event Aggregate{/ts}', 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_ActivitySearch'       , 8, 'CRM_Contact_Form_Search_Custom_ActivitySearch', NULL, 0, NULL, 8, '{ts escape="sql"}Activity Search{/ts}', 0, 0, 0, NULL, NULL, NULL),
-  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_PriceSet'             , 9, 'CRM_Contact_Form_Search_Custom_PriceSet', NULL, 0, NULL, 9, '{ts escape="sql"}Price Set Details for Event Participants{/ts}', 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_ZipCodeRange'         ,10, 'CRM_Contact_Form_Search_Custom_ZipCodeRange', NULL, 0, NULL, 10, '{ts escape="sql"}Zip Code Range{/ts}', 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_DateAdded'            ,11, 'CRM_Contact_Form_Search_Custom_DateAdded', NULL, 0, NULL, 11, '{ts escape="sql"}Date Added to CiviCRM{/ts}', 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_MultipleValues'       ,12, 'CRM_Contact_Form_Search_Custom_MultipleValues', NULL, 0, NULL, 12, '{ts escape="sql"}Custom Group Multiple Values Listing{/ts}', 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_ContribSYBNT'         ,13, 'CRM_Contact_Form_Search_Custom_ContribSYBNT', NULL, 0, NULL, 13, '{ts escape="sql"}Contributions made in Year X and not Year Y{/ts}', 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_TagContributions'     ,14, 'CRM_Contact_Form_Search_Custom_TagContributions', NULL, 0, NULL, 14, '{ts escape="sql"}Find Contribution Amounts by Tag{/ts}', 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_FullText'             ,15, 'CRM_Contact_Form_Search_Custom_FullText', NULL, 0, NULL, 15, '{ts escape="sql"}Full-text Search{/ts}', 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_cvOpt, '{ts escape="sql"}Activities{/ts}'   ,   1, 'activity', NULL, 0, 0,  1,  NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_cvOpt, '{ts escape="sql"}Relationships{/ts}',   2, 'rel', NULL, 0, 0,  2,  NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_cvOpt, '{ts escape="sql"}Groups{/ts}'       ,   3, 'group', NULL, 0, 0,  3,  NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_cvOpt, '{ts escape="sql"}Notes{/ts}'        ,   4, 'note', NULL, 0, 0,  4,  NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_cvOpt, '{ts escape="sql"}Tags{/ts}'         ,   5, 'tag', NULL, 0, 0,  5,  NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_cvOpt, '{ts escape="sql"}Change Log{/ts}'   ,   6, 'log', NULL, 0, 0,  6,  NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_cvOpt, '{ts escape="sql"}Contributions{/ts}',   7, 'CiviContribute', NULL, 0, 0,  7,  NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_cvOpt, '{ts escape="sql"}Memberships{/ts}'  ,   8, 'CiviMember', NULL, 0, 0,  8,  NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_cvOpt, '{ts escape="sql"}Events{/ts}'       ,   9, 'CiviEvent', NULL, 0, 0,  9,  NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_cvOpt, '{ts escape="sql"}Cases{/ts}'        ,  10, 'CiviCase', NULL, 0, 0,  10, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_cvOpt, '{ts escape="sql"}Pledges{/ts}'      ,  13, 'CiviPledge', NULL, 0, 0,  13, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_cvOpt, '{ts escape="sql"}Mailings{/ts}'     ,  14, 'CiviMail', NULL, 0, 0,  14, NULL, 0, 0, 1, NULL, NULL, NULL),
+
+
+  (@option_group_id_csgOpt, '{ts escape="sql"}Show Smart Groups on Demand{/ts}',1, 'showondemand', NULL, 0, 0,  1,  NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_csgOpt, '{ts escape="sql"}Always Show Smart Groups{/ts}',   2, 'alwaysshow', NULL, 0, 0,  2,  NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_csgOpt, '{ts escape="sql"}Hide Smart Groups{/ts}'       ,   3, 'hide', NULL, 0, 0,  3,  NULL, 0, 0, 1, NULL, NULL, NULL),
+
+  (@option_group_id_ceOpt, '{ts escape="sql"}Custom Data{/ts}'              ,   1, 'CustomData', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_ceOpt, '{ts escape="sql"}Address{/ts}'                  ,   2, 'Address', NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_ceOpt, '{ts escape="sql"}Communication Preferences{/ts}',   3, 'CommunicationPreferences', NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_ceOpt, '{ts escape="sql"}Notes{/ts}'                    ,   4, 'Notes', NULL, 0, 0, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_ceOpt, '{ts escape="sql"}Demographics{/ts}'             ,   5, 'Demographics', NULL, 0, 0, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_ceOpt, '{ts escape="sql"}Tags and Groups{/ts}'          ,   6, 'TagsAndGroups', NULL, 0, 0, 6, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_ceOpt, '{ts escape="sql"}Email{/ts}'                    ,   7, 'Email', NULL, 1, 0, 7, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_ceOpt, '{ts escape="sql"}Phone{/ts}'                    ,   8, 'Phone', NULL, 1, 0, 8, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_ceOpt, '{ts escape="sql"}Instant Messenger{/ts}'        ,   9, 'IM', NULL, 1, 0, 9, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_ceOpt, '{ts escape="sql"}Open ID{/ts}'                  ,   10, 'OpenID', NULL, 1, 0, 10, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_ceOpt, '{ts escape="sql"}Website{/ts}'                  ,   11, 'Website', NULL, 1, 0, 11, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_ceOpt, '{ts escape="sql"}Prefix{/ts}'                   ,   12, 'Prefix', NULL, 2, 0, 12, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_ceOpt, '{ts escape="sql"}Formal Title{/ts}'             ,   13, 'Formal Title', NULL, 2, 0, 13, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_ceOpt, '{ts escape="sql"}First Name{/ts}'               ,   14, 'First Name', NULL, 2, 0, 14, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_ceOpt, '{ts escape="sql"}Middle Name{/ts}'              ,   15, 'Middle Name', NULL, 2, 0, 15, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_ceOpt, '{ts escape="sql"}Last Name{/ts}'                ,   16, 'Last Name', NULL, 2, 0, 16, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_ceOpt, '{ts escape="sql"}Suffix{/ts}'                   ,   17, 'Suffix', NULL, 2, 0, 17, NULL, 0, 0, 1, NULL, NULL, NULL),
+
+  (@option_group_id_asOpt, '{ts escape="sql"}Address Fields{/ts}'          ,   1, 'location', NULL, 0, 0,  1, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_asOpt, '{ts escape="sql"}Custom Fields{/ts}'           ,   2, 'custom', NULL, 0, 0,  2, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_asOpt, '{ts escape="sql"}Activities{/ts}'              ,   3, 'activity', NULL, 0, 0,  4, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_asOpt, '{ts escape="sql"}Relationships{/ts}'           ,   4, 'relationship', NULL, 0, 0,  5, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_asOpt, '{ts escape="sql"}Notes{/ts}'                   ,   5, 'notes', NULL, 0, 0,  6, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_asOpt, '{ts escape="sql"}Change Log{/ts}'              ,   6, 'changeLog', NULL, 0, 0,  7, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_asOpt, '{ts escape="sql"}Contributions{/ts}'           ,   7, 'CiviContribute', NULL, 0, 0,  8, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_asOpt, '{ts escape="sql"}Memberships{/ts}'             ,   8, 'CiviMember', NULL, 0, 0,  9, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_asOpt, '{ts escape="sql"}Events{/ts}'                  ,   9, 'CiviEvent', NULL, 0, 0, 10, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_asOpt, '{ts escape="sql"}Cases{/ts}'                   ,  10, 'CiviCase', NULL, 0, 0, 11, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_asOpt, '{ts escape="sql"}Demographics{/ts}'            ,  13, 'demographics', NULL, 0, 0, 15, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_asOpt, '{ts escape="sql"}Pledges{/ts}'                 ,  15, 'CiviPledge', NULL, 0, 0, 17, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_asOpt, '{ts escape="sql"}Contact Type{/ts}'            ,  16, 'contactType', NULL, 0, 0, 18, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_asOpt, '{ts escape="sql"}Groups{/ts}'                  ,  17, 'groups', NULL, 0, 0, 19, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_asOpt, '{ts escape="sql"}Tags{/ts}'                    ,  18, 'tags', NULL, 0, 0, 20, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_asOpt, '{ts escape="sql"}Mailing{/ts}'                 ,  19, 'CiviMail', NULL, 0, 0, 21, NULL, 0, 0, 1, NULL, NULL, NULL),
+
+  (@option_group_id_udOpt, '{ts escape="sql"}Groups{/ts}'                     , 1, 'Groups', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_udOpt, '{ts escape="sql"}Contributions{/ts}'              , 2, 'CiviContribute', NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_udOpt, '{ts escape="sql"}Memberships{/ts}'                , 3, 'CiviMember', NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_udOpt, '{ts escape="sql"}Events{/ts}'                     , 4, 'CiviEvent', NULL, 0, 0, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_udOpt, '{ts escape="sql"}My Contacts / Organizations{/ts}', 5, 'Permissioned Orgs', NULL, 0, 0, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_udOpt, '{ts escape="sql"}Pledges{/ts}'                    , 7, 'CiviPledge', NULL, 0, 0, 7, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_udOpt, '{ts escape="sql"}Personal Campaign Pages{/ts}'    , 8, 'PCP', NULL, 0, 0, 8, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_udOpt, '{ts escape="sql"}Assigned Activities{/ts}'        , 9, 'Assigned Activities', NULL, 0, 0, 9, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_udOpt, '{ts escape="sql"}Invoices / Credit Notes{/ts}'     , 10, 'Invoices / Credit Notes', NULL, 0, 0, 10, NULL, 0, 0, 1, NULL, NULL, NULL),
+
+  (@option_group_id_acsOpt, '{ts escape="sql"}Email Address{/ts}'   , 2, 'email'         , NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_acsOpt, '{ts escape="sql"}Phone{/ts}'           , 3, 'phone'         , NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_acsOpt, '{ts escape="sql"}Street Address{/ts}'  , 4, 'street_address', NULL, 0, 0, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_acsOpt, '{ts escape="sql"}City{/ts}'            , 5, 'city'          , NULL, 0, 0, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_acsOpt, '{ts escape="sql"}State/Province{/ts}'  , 6, 'state_province', NULL, 0, 0, 6, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_acsOpt, '{ts escape="sql"}Country{/ts}'         , 7, 'country'       , NULL, 0, 0, 7, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_acsOpt, '{ts escape="sql"}Postal Code{/ts}'     , 8, 'postal_code'   , NULL, 0, 0, 8, NULL, 0, 0, 1, NULL, NULL, NULL),
+
+  (@option_group_id_acConRef, '{ts escape="sql"}Email Address{/ts}'   , 2, 'email'         , NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_acConRef, '{ts escape="sql"}Phone{/ts}'           , 3, 'phone'         , NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_acConRef, '{ts escape="sql"}Street Address{/ts}'  , 4, 'street_address', NULL, 0, 0, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_acConRef, '{ts escape="sql"}City{/ts}'            , 5, 'city'          , NULL, 0, 0, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_acConRef, '{ts escape="sql"}State/Province{/ts}'  , 6, 'state_province', NULL, 0, 0, 6, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_acConRef, '{ts escape="sql"}Country{/ts}'         , 7, 'country'       , NULL, 0, 0, 7, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_acConRef, '{ts escape="sql"}Postal Code{/ts}'     , 8, 'postal_code'   , NULL, 0, 0, 8, NULL, 0, 0, 1, NULL, NULL, NULL),
+
+  (@option_group_id_adOpt, '{ts escape="sql"}Street Address{/ts}'    ,  1, 'street_address', NULL, 0, 0,  1, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_adOpt, '{ts escape="sql"}Supplemental Address 1{/ts}'  ,  2, 'supplemental_address_1', NULL, 0, 0,  2, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_adOpt, '{ts escape="sql"}Supplemental Address 2{/ts}'  ,  3, 'supplemental_address_2', NULL, 0, 0,  3, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_adOpt, '{ts escape="sql"}Supplemental Address 3{/ts}'  ,  4, 'supplemental_address_3', NULL, 0, 0, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_adOpt, '{ts escape="sql"}City{/ts}'              ,  5, 'city'          , NULL, 0, 0,  5, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_adOpt, '{ts escape="sql"}Postal Code{/ts}' ,  6, 'postal_code'   , NULL, 0, 0,  6, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_adOpt, '{ts escape="sql"}Postal Code Suffix{/ts}',  7, 'postal_code_suffix', NULL, 0, 0,  7, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_adOpt, '{ts escape="sql"}County{/ts}'            ,  8, 'county'        , NULL, 0, 0,  8, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_adOpt, '{ts escape="sql"}State/Province{/ts}'  ,  9, 'state_province', NULL, 0, 0,  9, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_adOpt, '{ts escape="sql"}Country{/ts}'           , 10, 'country'       , NULL, 0, 0, 10, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_adOpt, '{ts escape="sql"}Latitude{/ts}'          , 11, 'geo_code_1'    , NULL, 0, 0, 11, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_adOpt, '{ts escape="sql"}Longitude{/ts}'         , 12, 'geo_code_2', NULL, 0, 0, 12, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_adOpt, '{ts escape="sql"}Address Name{/ts}'      , 13, 'address_name', NULL, 0, 0, 13, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_adOpt, '{ts escape="sql"}Street Address Parsing{/ts}', 14, 'street_address_parsing', NULL, 0, 0, 14, NULL, 0, 0, 1, NULL, NULL, NULL),
+
+  (@option_group_id_gType, '{ts escape="sql"}Access Control{/ts}', 1, 'Access Control', NULL, 0, 0, 1, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_gType, '{ts escape="sql"}Mailing List{/ts}',   2, 'Mailing List',   NULL, 0, 0, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
+
+  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_Sample'               , 1, 'CRM_Contact_Form_Search_Custom_Sample'      , NULL, 0, 0, 1, '{ts escape="sql"}Household Name and State{/ts}', 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_ContributionAggregate', 2, 'CRM_Contact_Form_Search_Custom_ContributionAggregate', NULL, 0, 0, 2, '{ts escape="sql"}Contribution Aggregate{/ts}', 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_Group'                , 4, 'CRM_Contact_Form_Search_Custom_Group'       , NULL, 0, 0, 4, '{ts escape="sql"}Include / Exclude Search{/ts}', 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_PostalMailing'        , 5, 'CRM_Contact_Form_Search_Custom_PostalMailing', NULL, 0, 0, 5, '{ts escape="sql"}Postal Mailing{/ts}', 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_Proximity'            , 6, 'CRM_Contact_Form_Search_Custom_Proximity', NULL, 0, 0, 6, '{ts escape="sql"}Proximity Search{/ts}', 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_EventAggregate'       , 7, 'CRM_Contact_Form_Search_Custom_EventAggregate', NULL, 0, 0, 7, '{ts escape="sql"}Event Aggregate{/ts}', 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_ActivitySearch'       , 8, 'CRM_Contact_Form_Search_Custom_ActivitySearch', NULL, 0, 0, 8, '{ts escape="sql"}Activity Search{/ts}', 0, 0, 0, NULL, NULL, NULL),
+  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_PriceSet'             , 9, 'CRM_Contact_Form_Search_Custom_PriceSet', NULL, 0, 0, 9, '{ts escape="sql"}Price Set Details for Event Participants{/ts}', 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_ZipCodeRange'         ,10, 'CRM_Contact_Form_Search_Custom_ZipCodeRange', NULL, 0, 0, 10, '{ts escape="sql"}Zip Code Range{/ts}', 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_DateAdded'            ,11, 'CRM_Contact_Form_Search_Custom_DateAdded', NULL, 0, 0, 11, '{ts escape="sql"}Date Added to CiviCRM{/ts}', 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_MultipleValues'       ,12, 'CRM_Contact_Form_Search_Custom_MultipleValues', NULL, 0, 0, 12, '{ts escape="sql"}Custom Group Multiple Values Listing{/ts}', 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_ContribSYBNT'         ,13, 'CRM_Contact_Form_Search_Custom_ContribSYBNT', NULL, 0, 0, 13, '{ts escape="sql"}Contributions made in Year X and not Year Y{/ts}', 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_TagContributions'     ,14, 'CRM_Contact_Form_Search_Custom_TagContributions', NULL, 0, 0, 14, '{ts escape="sql"}Find Contribution Amounts by Tag{/ts}', 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_csearch , 'CRM_Contact_Form_Search_Custom_FullText'             ,15, 'CRM_Contact_Form_Search_Custom_FullText', NULL, 0, 0, 15, '{ts escape="sql"}Full-text Search{/ts}', 0, 0, 1, NULL, NULL, NULL),
 
 -- report templates
-  (@option_group_id_report , '{ts escape="sql"}Constituent Report (Summary){/ts}',            'contact/summary',                'CRM_Report_Form_Contact_Summary',                NULL, 0, NULL, 1,  '{ts escape="sql"}Provides a list of address and telephone information for constituent records in your system.{/ts}', 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Constituent Report (Detail){/ts}',             'contact/detail',                 'CRM_Report_Form_Contact_Detail',                 NULL, 0, NULL, 2,  '{ts escape="sql"}Provides contact-related information on contributions, memberships, events and activities.{/ts}',   0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Activity Details Report{/ts}',                 'activity',                       'CRM_Report_Form_Activity',                       NULL, 0, NULL, 3,  '{ts escape="sql"}Provides a list of constituent activity including activity statistics for one/all contacts during a given date range(required){/ts}', 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Walk / Phone List Report{/ts}',                'walklist',                       'CRM_Report_Form_Walklist_Walklist',                       NULL, 0, NULL, 4,  '{ts escape="sql"}Provides a detailed report for your walk/phonelist for targeted contacts{/ts}', 0, 0, 0, NULL, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Current Employer Report{/ts}',                 'contact/currentEmployer',        'CRM_Report_Form_Contact_CurrentEmployer',        NULL, 0, NULL, 5,  '{ts escape="sql"}Provides detail list of employer employee relationships along with employment details Ex Join Date{/ts}', 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Contribution Summary Report{/ts}',             'contribute/summary',             'CRM_Report_Form_Contribute_Summary',             NULL, 0, NULL, 6,  '{ts escape="sql"}Groups and totals contributions by criteria including contact, time period, financial type, contributor location, etc.{/ts}', 0, 0, 1, @contributeCompId, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Contribution Detail Report{/ts}',              'contribute/detail',              'CRM_Report_Form_Contribute_Detail',              NULL, 0, NULL, 7,  '{ts escape="sql"}Lists specific contributions by criteria including contact, time period, financial type, contributor location, etc. Contribution summary report points to this report for contribution details.{/ts}', 0, 0, 1, @contributeCompId, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Repeat Contributions Report{/ts}',             'contribute/repeat',              'CRM_Report_Form_Contribute_Repeat',              NULL, 0, NULL, 8,  '{ts escape="sql"}Given two date ranges, shows contacts who contributed in both the date ranges with the amount contributed in each and the percentage increase / decrease.{/ts}', 0, 0, 1, @contributeCompId, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Contributions by Organization Report{/ts}',    'contribute/organizationSummary', 'CRM_Report_Form_Contribute_OrganizationSummary', NULL, 0, NULL, 9,  '{ts escape="sql"}Displays a detailed list of contributions grouped by organization, which includes contributions made by employees for the organisation.{/ts}', 0, 0, 1, @contributeCompId, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Contributions by Household Report{/ts}',       'contribute/householdSummary',    'CRM_Report_Form_Contribute_HouseholdSummary',    NULL, 0, NULL, 10, '{ts escape="sql"}Displays a detailed list of contributions grouped by household which includes contributions made by members of the household.{/ts}', 0, 0, 1, @contributeCompId, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Top Donors Report{/ts}',                       'contribute/topDonor',            'CRM_Report_Form_Contribute_TopDonor',            NULL, 0, NULL, 11, '{ts escape="sql"}Provides a list of the top donors during a time period you define. You can include as many donors as you want (for example, top 100 of your donors).{/ts}', 0, 0, 1, @contributeCompId, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}SYBUNT Report{/ts}',                           'contribute/sybunt',              'CRM_Report_Form_Contribute_Sybunt',              NULL, 0, NULL, 12, '{ts escape="sql"}SYBUNT means some year(s) but not this year. Provides a list of constituents who donated at some time in the history of your organization but did not donate during the time period you specify.{/ts}', 0, 0, 1, @contributeCompId, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}LYBUNT Report{/ts}',                           'contribute/lybunt',              'CRM_Report_Form_Contribute_Lybunt',              NULL, 0, NULL, 13, '{ts escape="sql"}LYBUNT means last year but not this year. Provides a list of constituents who donated last year but did not donate during the time period you specify as the current year.{/ts}', 0, 0, 1, @contributeCompId, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Soft Credit Report{/ts}',                      'contribute/softcredit',          'CRM_Report_Form_Contribute_SoftCredit',          NULL, 0, NULL, 14, '{ts escape="sql"}Shows contributions made by contacts that have been soft-credited to other contacts.{/ts}', 0, 0, 1,@contributeCompId, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Membership Report (Summary){/ts}',             'member/summary',                 'CRM_Report_Form_Member_Summary',                 NULL, 0, NULL, 15, '{ts escape="sql"}Provides a summary of memberships by type and join date.{/ts}', 0, 0, 1, @memberCompId, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Membership Report (Detail){/ts}',              'member/detail',                  'CRM_Report_Form_Member_Detail',                  NULL, 0, NULL, 16, '{ts escape="sql"}Provides a list of members along with their membership status and membership details (Join Date, Start Date, End Date). Can also display contributions (payments) associated with each membership.{/ts}', 0, 0, 1, @memberCompId, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Membership Report (Lapsed){/ts}',              'member/lapse',                   'CRM_Report_Form_Member_Lapse',                   NULL, 0, NULL, 17, '{ts escape="sql"}Provides a list of memberships that lapsed or will lapse before the date you specify.{/ts}', 0, 0, 1, @memberCompId, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Event Participant Report (List){/ts}',         'event/participantListing',       'CRM_Report_Form_Event_ParticipantListing',       NULL, 0, NULL, 18, '{ts escape="sql"}Provides lists of participants for an event.{/ts}', 0, 0, 1, @eventCompId, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Event Income Report (Summary){/ts}',           'event/summary',                  'CRM_Report_Form_Event_Summary',                  NULL, 0, NULL, 19, '{ts escape="sql"}Provides an overview of event income. You can include key information such as event ID, registration, attendance, and income generated to help you determine the success of an event.{/ts}', 0, 0, 1, @eventCompId, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Event Income Report (Detail){/ts}',            'event/income',                   'CRM_Report_Form_Event_Income',                   NULL, 0, NULL, 20, '{ts escape="sql"}Helps you to analyze the income generated by an event. The report can include details by participant type, status and payment method.{/ts}', 0, 0, 1, @eventCompId, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Pledge Detail Report{/ts}',                    'pledge/detail',                  'CRM_Report_Form_Pledge_Detail',                  NULL, 0, NULL, 21, '{ts escape="sql"}List of pledges including amount pledged, pledge status, next payment date, balance due, total amount paid etc.{/ts}', 0, 0, 1, @pledgeCompId, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Pledged but not Paid Report{/ts}',             'pledge/pbnp',                    'CRM_Report_Form_Pledge_Pbnp',                    NULL, 0, NULL, 22, '{ts escape="sql"}Pledged but not Paid Report{/ts}', 0, 0, 1, @pledgeCompId, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Relationship Report{/ts}',                     'contact/relationship',           'CRM_Report_Form_Contact_Relationship',           NULL, 0, NULL, 23, '{ts escape="sql"}Relationship Report{/ts}', 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Case Summary Report{/ts}',                     'case/summary',                   'CRM_Report_Form_Case_Summary',                   NULL, 0, NULL, 24, '{ts escape="sql"}Provides a summary of cases and their duration by date range, status, staff member and / or case role.{/ts}', 0, 0, 1, @caseCompId, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Case Time Spent Report{/ts}',                  'case/timespent',                 'CRM_Report_Form_Case_TimeSpent',                 NULL, 0, NULL, 25, '{ts escape="sql"}Aggregates time spent on case and / or non-case activities by activity type and contact.{/ts}', 0, 0, 1, @caseCompId, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Contact Demographics Report{/ts}',             'case/demographics',              'CRM_Report_Form_Case_Demographics',              NULL, 0, NULL, 26, '{ts escape="sql"}Demographic breakdown for case clients (and or non-case contacts) in your database. Includes custom contact fields.{/ts}', 0, 0, 1, @caseCompId, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Database Log Report{/ts}',                     'contact/log',                    'CRM_Report_Form_Contact_Log',                    NULL, 0, NULL, 27, '{ts escape="sql"}Log of contact and activity records created or updated in a given date range.{/ts}', 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Activity Summary Report{/ts}',                 'activitySummary',                'CRM_Report_Form_ActivitySummary',                NULL, 0, NULL, 28, '{ts escape="sql"}Shows activity statistics by type / date{/ts}', 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Constituent Report (Summary){/ts}',            'contact/summary',                'CRM_Report_Form_Contact_Summary',                NULL, 0, 0, 1,  '{ts escape="sql"}Provides a list of address and telephone information for constituent records in your system.{/ts}', 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Constituent Report (Detail){/ts}',             'contact/detail',                 'CRM_Report_Form_Contact_Detail',                 NULL, 0, 0, 2,  '{ts escape="sql"}Provides contact-related information on contributions, memberships, events and activities.{/ts}',   0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Activity Details Report{/ts}',                 'activity',                       'CRM_Report_Form_Activity',                       NULL, 0, 0, 3,  '{ts escape="sql"}Provides a list of constituent activity including activity statistics for one/all contacts during a given date range(required){/ts}', 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Walk / Phone List Report{/ts}',                'walklist',                       'CRM_Report_Form_Walklist_Walklist',                       NULL, 0, 0, 4,  '{ts escape="sql"}Provides a detailed report for your walk/phonelist for targeted contacts{/ts}', 0, 0, 0, NULL, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Current Employer Report{/ts}',                 'contact/currentEmployer',        'CRM_Report_Form_Contact_CurrentEmployer',        NULL, 0, 0, 5,  '{ts escape="sql"}Provides detail list of employer employee relationships along with employment details Ex Join Date{/ts}', 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Contribution Summary Report{/ts}',             'contribute/summary',             'CRM_Report_Form_Contribute_Summary',             NULL, 0, 0, 6,  '{ts escape="sql"}Groups and totals contributions by criteria including contact, time period, financial type, contributor location, etc.{/ts}', 0, 0, 1, @contributeCompId, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Contribution Detail Report{/ts}',              'contribute/detail',              'CRM_Report_Form_Contribute_Detail',              NULL, 0, 0, 7,  '{ts escape="sql"}Lists specific contributions by criteria including contact, time period, financial type, contributor location, etc. Contribution summary report points to this report for contribution details.{/ts}', 0, 0, 1, @contributeCompId, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Repeat Contributions Report{/ts}',             'contribute/repeat',              'CRM_Report_Form_Contribute_Repeat',              NULL, 0, 0, 8,  '{ts escape="sql"}Given two date ranges, shows contacts who contributed in both the date ranges with the amount contributed in each and the percentage increase / decrease.{/ts}', 0, 0, 1, @contributeCompId, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Contributions by Organization Report{/ts}',    'contribute/organizationSummary', 'CRM_Report_Form_Contribute_OrganizationSummary', NULL, 0, 0, 9,  '{ts escape="sql"}Displays a detailed list of contributions grouped by organization, which includes contributions made by employees for the organisation.{/ts}', 0, 0, 1, @contributeCompId, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Contributions by Household Report{/ts}',       'contribute/householdSummary',    'CRM_Report_Form_Contribute_HouseholdSummary',    NULL, 0, 0, 10, '{ts escape="sql"}Displays a detailed list of contributions grouped by household which includes contributions made by members of the household.{/ts}', 0, 0, 1, @contributeCompId, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Top Donors Report{/ts}',                       'contribute/topDonor',            'CRM_Report_Form_Contribute_TopDonor',            NULL, 0, 0, 11, '{ts escape="sql"}Provides a list of the top donors during a time period you define. You can include as many donors as you want (for example, top 100 of your donors).{/ts}', 0, 0, 1, @contributeCompId, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}SYBUNT Report{/ts}',                           'contribute/sybunt',              'CRM_Report_Form_Contribute_Sybunt',              NULL, 0, 0, 12, '{ts escape="sql"}SYBUNT means some year(s) but not this year. Provides a list of constituents who donated at some time in the history of your organization but did not donate during the time period you specify.{/ts}', 0, 0, 1, @contributeCompId, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}LYBUNT Report{/ts}',                           'contribute/lybunt',              'CRM_Report_Form_Contribute_Lybunt',              NULL, 0, 0, 13, '{ts escape="sql"}LYBUNT means last year but not this year. Provides a list of constituents who donated last year but did not donate during the time period you specify as the current year.{/ts}', 0, 0, 1, @contributeCompId, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Soft Credit Report{/ts}',                      'contribute/softcredit',          'CRM_Report_Form_Contribute_SoftCredit',          NULL, 0, 0, 14, '{ts escape="sql"}Shows contributions made by contacts that have been soft-credited to other contacts.{/ts}', 0, 0, 1,@contributeCompId, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Membership Report (Summary){/ts}',             'member/summary',                 'CRM_Report_Form_Member_Summary',                 NULL, 0, 0, 15, '{ts escape="sql"}Provides a summary of memberships by type and join date.{/ts}', 0, 0, 1, @memberCompId, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Membership Report (Detail){/ts}',              'member/detail',                  'CRM_Report_Form_Member_Detail',                  NULL, 0, 0, 16, '{ts escape="sql"}Provides a list of members along with their membership status and membership details (Join Date, Start Date, End Date). Can also display contributions (payments) associated with each membership.{/ts}', 0, 0, 1, @memberCompId, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Membership Report (Lapsed){/ts}',              'member/lapse',                   'CRM_Report_Form_Member_Lapse',                   NULL, 0, 0, 17, '{ts escape="sql"}Provides a list of memberships that lapsed or will lapse before the date you specify.{/ts}', 0, 0, 1, @memberCompId, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Event Participant Report (List){/ts}',         'event/participantListing',       'CRM_Report_Form_Event_ParticipantListing',       NULL, 0, 0, 18, '{ts escape="sql"}Provides lists of participants for an event.{/ts}', 0, 0, 1, @eventCompId, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Event Income Report (Summary){/ts}',           'event/summary',                  'CRM_Report_Form_Event_Summary',                  NULL, 0, 0, 19, '{ts escape="sql"}Provides an overview of event income. You can include key information such as event ID, registration, attendance, and income generated to help you determine the success of an event.{/ts}', 0, 0, 1, @eventCompId, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Event Income Report (Detail){/ts}',            'event/income',                   'CRM_Report_Form_Event_Income',                   NULL, 0, 0, 20, '{ts escape="sql"}Helps you to analyze the income generated by an event. The report can include details by participant type, status and payment method.{/ts}', 0, 0, 1, @eventCompId, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Pledge Detail Report{/ts}',                    'pledge/detail',                  'CRM_Report_Form_Pledge_Detail',                  NULL, 0, 0, 21, '{ts escape="sql"}List of pledges including amount pledged, pledge status, next payment date, balance due, total amount paid etc.{/ts}', 0, 0, 1, @pledgeCompId, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Pledged but not Paid Report{/ts}',             'pledge/pbnp',                    'CRM_Report_Form_Pledge_Pbnp',                    NULL, 0, 0, 22, '{ts escape="sql"}Pledged but not Paid Report{/ts}', 0, 0, 1, @pledgeCompId, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Relationship Report{/ts}',                     'contact/relationship',           'CRM_Report_Form_Contact_Relationship',           NULL, 0, 0, 23, '{ts escape="sql"}Relationship Report{/ts}', 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Case Summary Report{/ts}',                     'case/summary',                   'CRM_Report_Form_Case_Summary',                   NULL, 0, 0, 24, '{ts escape="sql"}Provides a summary of cases and their duration by date range, status, staff member and / or case role.{/ts}', 0, 0, 1, @caseCompId, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Case Time Spent Report{/ts}',                  'case/timespent',                 'CRM_Report_Form_Case_TimeSpent',                 NULL, 0, 0, 25, '{ts escape="sql"}Aggregates time spent on case and / or non-case activities by activity type and contact.{/ts}', 0, 0, 1, @caseCompId, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Contact Demographics Report{/ts}',             'case/demographics',              'CRM_Report_Form_Case_Demographics',              NULL, 0, 0, 26, '{ts escape="sql"}Demographic breakdown for case clients (and or non-case contacts) in your database. Includes custom contact fields.{/ts}', 0, 0, 1, @caseCompId, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Database Log Report{/ts}',                     'contact/log',                    'CRM_Report_Form_Contact_Log',                    NULL, 0, 0, 27, '{ts escape="sql"}Log of contact and activity records created or updated in a given date range.{/ts}', 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Activity Summary Report{/ts}',                 'activitySummary',                'CRM_Report_Form_ActivitySummary',                NULL, 0, 0, 28, '{ts escape="sql"}Shows activity statistics by type / date{/ts}', 0, 0, 1, NULL, NULL, NULL),
   (@option_group_id_report, '{ts escape="sql"}Bookkeeping Transactions Report{/ts}',          'contribute/bookkeeping',         'CRM_Report_Form_Contribute_Bookkeeping',         NULL, 0, 0, 29,    '{ts escape="sql"}Shows Bookkeeping Transactions Report{/ts}', 0, 0, 1, 2, NULL, NULL),
   (@option_group_id_report, {localize}'{ts escape="sql"}Participant list Count Report{/ts}'{/localize}, 'event/participantlist', 'CRM_Report_Form_Event_ParticipantListCount', NULL, 0, 0, 31, {localize}'{ts escape="sql"}Shows the Participant list with Participant Count.{/ts}'{/localize}, 0, 0, 1, @eventCompId, NULL, NULL),
   (@option_group_id_report, {localize}'{ts escape="sql"}Income Count Summary Report{/ts}'{/localize}, 'event/incomesummary', 'CRM_Report_Form_Event_IncomeCountSummary', NULL, 0, 0, 32, {localize}'{ts escape="sql"}Shows the Income Summary of events with Count.{/ts}'{/localize}, 0, 0, 1, @eventCompId, NULL, NULL),
   (@option_group_id_report, {localize}'{ts escape="sql"}Case Detail Report{/ts}'{/localize}, 'case/detail', 'CRM_Report_Form_Case_Detail', NULL, 0, 0, 33, {localize}'{ts escape="sql"}Case Details{/ts}'{/localize}, 0, 0, 1, @caseCompId, NULL, NULL),
-  (@option_group_id_report, {localize}'{ts escape="sql"}Mail Bounce Report{/ts}'{/localize}, 'Mailing/bounce', 'CRM_Report_Form_Mailing_Bounce', NULL, 0, NULL, 34, {localize}'{ts escape="sql"}Bounce Report for mailings{/ts}'{/localize}, 0, 0, 1, @mailCompId, NULL, NULL),
-  (@option_group_id_report, {localize}'{ts escape="sql"}Mail Summary Report{/ts}'{/localize}, 'Mailing/summary', 'CRM_Report_Form_Mailing_Summary', NULL, 0, NULL, 35, {localize}'{ts escape="sql"}Summary statistics for mailings{/ts}'{/localize}, 0, 0, 1, @mailCompId, NULL, NULL),
-  (@option_group_id_report, {localize}'{ts escape="sql"}Mail Opened Report{/ts}'{/localize}, 'Mailing/opened', 'CRM_Report_Form_Mailing_Opened', NULL, 0, NULL, 36, {localize}'{ts escape="sql"}Display contacts who opened emails from a mailing{/ts}'{/localize}, 0, 0, 1, @mailCompId, NULL, NULL),
-  (@option_group_id_report, {localize}'{ts escape="sql"}Mail Click-Through Report{/ts}'{/localize}, 'Mailing/clicks', 'CRM_Report_Form_Mailing_Clicks', NULL, 0, NULL, 37, {localize}'{ts escape="sql"}Display clicks from each mailing{/ts}'{/localize}, 0, 0, 1, @mailCompId, NULL, NULL),
-  (@option_group_id_report, {localize}'{ts escape="sql"}Contact Logging Report (Summary){/ts}'{/localize}, 'logging/contact/summary', 'CRM_Report_Form_Contact_LoggingSummary', NULL, 0, NULL, 38, {localize}'{ts escape="sql"}Contact modification report for the logging infrastructure (summary).{/ts}'{/localize}, 0, 0, 0, NULL, NULL, NULL),
-  (@option_group_id_report, {localize}'{ts escape="sql"}Contact Logging Report (Detail){/ts}'{/localize}, 'logging/contact/detail', 'CRM_Report_Form_Contact_LoggingDetail', NULL, 0, NULL, 39, {localize}'{ts escape="sql"}Contact modification report for the logging infrastructure (detail).{/ts}'{/localize}, 0, 0, 0, NULL, NULL, NULL),
-  (@option_group_id_report, {localize}'{ts escape="sql"}Survey Report (Detail){/ts}'{/localize},    'survey/detail', 'CRM_Report_Form_Campaign_SurveyDetails',  NULL, 0, NULL, 43, {localize}'{ts escape="sql"}Detailed report for canvassing, phone-banking, walk lists or other surveys.{/ts}'{/localize}, 0, 0, 1, @campaignCompId, NULL, NULL),
-  (@option_group_id_report, {localize}'{ts escape="sql"}Personal Campaign Page Report{/ts}'{/localize}, 'contribute/pcp', 'CRM_Report_Form_Contribute_PCP', NULL, 0, NULL, 44, {localize}'{ts escape="sql"}Summarizes amount raised and number of contributors for each Personal Campaign Page.{/ts}'{/localize}, 0, 0, 1, @contributeCompId, NULL, NULL),
-  (@option_group_id_report , {localize}'{ts escape="sql"}Pledge Summary Report{/ts}'{/localize}, 'pledge/summary', 'CRM_Report_Form_Pledge_Summary', NULL, 0, NULL, 45, {localize}'{ts escape="sql"}Groups and totals pledges by criteria including contact, time period, pledge status, location, etc.{/ts}'{/localize}, 0, 0, 1, @pledgeCompId, NULL, NULL),
-  (@option_group_id_report , '{ts escape="sql"}Contribution Aggregate by Relationship{/ts}',                   'contribute/history',              'CRM_Report_Form_Contribute_History',              NULL, 0, NULL, 46,  '{ts escape="sql"}List contact's donation history, grouped by year, along with contributions attributed to any of the contact's related contacts.{/ts}', 0, 0, 1, @contributeCompId, NULL, NULL),
-  (@option_group_id_report,  {localize}'{ts escape="sql"}Mail Detail Report{/ts}'{/localize},                                            'mailing/detail',     'CRM_Report_Form_Mailing_Detail',          NULL, 0, NULL, 47,  {localize}'{ts escape="sql"}Provides reporting on Intended and Successful Deliveries, Unsubscribes and Opt-outs, Replies and Forwards.{/ts}'{/localize},   0, 0, 1, @mailCompId, NULL, NULL),
-  (@option_group_id_report, {localize}'{ts escape="sql"}Contribution and Membership Details{/ts}'{/localize}, 'member/contributionDetail', 'CRM_Report_Form_Member_ContributionDetail', NULL, 0, NULL, 48, {localize}'{ts escape="sql"}Contribution details for any type of contribution, plus associated membership information for contributions which are in payment for memberships.{/ts}'{/localize}, 0, 0, 1, @memberCompId, NULL, NULL),
-  (@option_group_id_report, {localize}'{ts escape="sql"}Recurring Contributions Report{/ts}'{/localize}, 'contribute/recur', 'CRM_Report_Form_Contribute_Recur',               NULL, 0, NULL, 49, {localize}'{ts escape="sql"}Provides information about the status of recurring contributions{/ts}'{/localize}, 0, 0, 1, @contributeCompId, NULL, NULL),
-  (@option_group_id_report, {localize}'{ts escape="sql"}Recurring Contributions Summary{/ts}'{/localize}, 'contribute/recursummary', 'CRM_Report_Form_Contribute_RecurSummary',               NULL, 0, NULL, 49, {localize}'{ts escape="sql"}Provides simple summary for each payment instrument for which there are recurring contributions (e.g. Credit Card, Standing Order, Direct Debit, etc., NULL), showing within a given date range.{/ts}'{/localize}, 0, 0, 1, @contributeCompId, NULL, NULL),
-  (@option_group_id_report, {localize}'{ts escape="sql"}Deferred Revenue Details{/ts}'{/localize}, 'contribute/deferredrevenue', 'CRM_Report_Form_Contribute_DeferredRevenue', NULL, 0, NULL, 50, {localize}'{ts escape="sql"}Deferred Revenue Details Report{/ts}'{/localize}, 0, 0, 1, @contributeCompId, NULL, NULL),
+  (@option_group_id_report, {localize}'{ts escape="sql"}Mail Bounce Report{/ts}'{/localize}, 'Mailing/bounce', 'CRM_Report_Form_Mailing_Bounce', NULL, 0, 0, 34, {localize}'{ts escape="sql"}Bounce Report for mailings{/ts}'{/localize}, 0, 0, 1, @mailCompId, NULL, NULL),
+  (@option_group_id_report, {localize}'{ts escape="sql"}Mail Summary Report{/ts}'{/localize}, 'Mailing/summary', 'CRM_Report_Form_Mailing_Summary', NULL, 0, 0, 35, {localize}'{ts escape="sql"}Summary statistics for mailings{/ts}'{/localize}, 0, 0, 1, @mailCompId, NULL, NULL),
+  (@option_group_id_report, {localize}'{ts escape="sql"}Mail Opened Report{/ts}'{/localize}, 'Mailing/opened', 'CRM_Report_Form_Mailing_Opened', NULL, 0, 0, 36, {localize}'{ts escape="sql"}Display contacts who opened emails from a mailing{/ts}'{/localize}, 0, 0, 1, @mailCompId, NULL, NULL),
+  (@option_group_id_report, {localize}'{ts escape="sql"}Mail Click-Through Report{/ts}'{/localize}, 'Mailing/clicks', 'CRM_Report_Form_Mailing_Clicks', NULL, 0, 0, 37, {localize}'{ts escape="sql"}Display clicks from each mailing{/ts}'{/localize}, 0, 0, 1, @mailCompId, NULL, NULL),
+  (@option_group_id_report, {localize}'{ts escape="sql"}Contact Logging Report (Summary){/ts}'{/localize}, 'logging/contact/summary', 'CRM_Report_Form_Contact_LoggingSummary', NULL, 0, 0, 38, {localize}'{ts escape="sql"}Contact modification report for the logging infrastructure (summary).{/ts}'{/localize}, 0, 0, 0, NULL, NULL, NULL),
+  (@option_group_id_report, {localize}'{ts escape="sql"}Contact Logging Report (Detail){/ts}'{/localize}, 'logging/contact/detail', 'CRM_Report_Form_Contact_LoggingDetail', NULL, 0, 0, 39, {localize}'{ts escape="sql"}Contact modification report for the logging infrastructure (detail).{/ts}'{/localize}, 0, 0, 0, NULL, NULL, NULL),
+  (@option_group_id_report, {localize}'{ts escape="sql"}Survey Report (Detail){/ts}'{/localize},    'survey/detail', 'CRM_Report_Form_Campaign_SurveyDetails',  NULL, 0, 0, 43, {localize}'{ts escape="sql"}Detailed report for canvassing, phone-banking, walk lists or other surveys.{/ts}'{/localize}, 0, 0, 1, @campaignCompId, NULL, NULL),
+  (@option_group_id_report, {localize}'{ts escape="sql"}Personal Campaign Page Report{/ts}'{/localize}, 'contribute/pcp', 'CRM_Report_Form_Contribute_PCP', NULL, 0, 0, 44, {localize}'{ts escape="sql"}Summarizes amount raised and number of contributors for each Personal Campaign Page.{/ts}'{/localize}, 0, 0, 1, @contributeCompId, NULL, NULL),
+  (@option_group_id_report , {localize}'{ts escape="sql"}Pledge Summary Report{/ts}'{/localize}, 'pledge/summary', 'CRM_Report_Form_Pledge_Summary', NULL, 0, 0, 45, {localize}'{ts escape="sql"}Groups and totals pledges by criteria including contact, time period, pledge status, location, etc.{/ts}'{/localize}, 0, 0, 1, @pledgeCompId, NULL, NULL),
+  (@option_group_id_report , '{ts escape="sql"}Contribution Aggregate by Relationship{/ts}',                   'contribute/history',              'CRM_Report_Form_Contribute_History',              NULL, 0, 0, 46,  '{ts escape="sql"}List contact's donation history, grouped by year, along with contributions attributed to any of the contact's related contacts.{/ts}', 0, 0, 1, @contributeCompId, NULL, NULL),
+  (@option_group_id_report,  {localize}'{ts escape="sql"}Mail Detail Report{/ts}'{/localize},                                            'mailing/detail',     'CRM_Report_Form_Mailing_Detail',          NULL, 0, 0, 47,  {localize}'{ts escape="sql"}Provides reporting on Intended and Successful Deliveries, Unsubscribes and Opt-outs, Replies and Forwards.{/ts}'{/localize},   0, 0, 1, @mailCompId, NULL, NULL),
+  (@option_group_id_report, {localize}'{ts escape="sql"}Contribution and Membership Details{/ts}'{/localize}, 'member/contributionDetail', 'CRM_Report_Form_Member_ContributionDetail', NULL, 0, 0, 48, {localize}'{ts escape="sql"}Contribution details for any type of contribution, plus associated membership information for contributions which are in payment for memberships.{/ts}'{/localize}, 0, 0, 1, @memberCompId, NULL, NULL),
+  (@option_group_id_report, {localize}'{ts escape="sql"}Recurring Contributions Report{/ts}'{/localize}, 'contribute/recur', 'CRM_Report_Form_Contribute_Recur',               NULL, 0, 0, 49, {localize}'{ts escape="sql"}Provides information about the status of recurring contributions{/ts}'{/localize}, 0, 0, 1, @contributeCompId, NULL, NULL),
+  (@option_group_id_report, {localize}'{ts escape="sql"}Recurring Contributions Summary{/ts}'{/localize}, 'contribute/recursummary', 'CRM_Report_Form_Contribute_RecurSummary',               NULL, 0, 0, 49, {localize}'{ts escape="sql"}Provides simple summary for each payment instrument for which there are recurring contributions (e.g. Credit Card, Standing Order, Direct Debit, etc., NULL), showing within a given date range.{/ts}'{/localize}, 0, 0, 1, @contributeCompId, NULL, NULL),
+  (@option_group_id_report, {localize}'{ts escape="sql"}Deferred Revenue Details{/ts}'{/localize}, 'contribute/deferredrevenue', 'CRM_Report_Form_Contribute_DeferredRevenue', NULL, 0, 0, 50, {localize}'{ts escape="sql"}Deferred Revenue Details Report{/ts}'{/localize}, 0, 0, 1, @contributeCompId, NULL, NULL),
 
   (@option_group_id_acs, '{ts escape="sql"}Scheduled{/ts}',    1, 'Scheduled',    NULL, 0, 1,    1, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_acs, '{ts escape="sql"}Completed{/ts}',    2, 'Completed',    NULL, 1, NULL, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_acs, '{ts escape="sql"}Cancelled{/ts}',    3, 'Cancelled',    NULL, 2, NULL, 3, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_acs, '{ts escape="sql"}Left Message{/ts}', 4, 'Left Message', NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_acs, '{ts escape="sql"}Unreachable{/ts}',  5, 'Unreachable',  NULL, 2, NULL, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_acs, '{ts escape="sql"}Not Required{/ts}', 6, 'Not Required', NULL, 2, NULL, 6, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_acs, '{ts escape="sql"}Available{/ts}',    7, 'Available',    NULL, 0, NULL, 7, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_acs, '{ts escape="sql"}No-show{/ts}',      8, 'No_show',      NULL, 2, NULL, 8, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_acs, '{ts escape="sql"}Completed{/ts}',    2, 'Completed',    NULL, 1, 0, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_acs, '{ts escape="sql"}Cancelled{/ts}',    3, 'Cancelled',    NULL, 2, 0, 3, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_acs, '{ts escape="sql"}Left Message{/ts}', 4, 'Left Message', NULL, 0, 0, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_acs, '{ts escape="sql"}Unreachable{/ts}',  5, 'Unreachable',  NULL, 2, 0, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_acs, '{ts escape="sql"}Not Required{/ts}', 6, 'Not Required', NULL, 2, 0, 6, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_acs, '{ts escape="sql"}Available{/ts}',    7, 'Available',    NULL, 0, 0, 7, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_acs, '{ts escape="sql"}No-show{/ts}',      8, 'No_show',      NULL, 2, 0, 8, NULL, 0, 0, 1, NULL, NULL, NULL),
 
   (@option_group_id_cas, '{ts escape="sql"}Ongoing{/ts}' , 1, 'Open'  ,  'Opened', 0, 1,    1, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_cas, '{ts escape="sql"}Resolved{/ts}', 2, 'Closed',  'Closed', 0, NULL, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_cas, '{ts escape="sql"}Urgent{/ts}'  , 3, 'Urgent',  'Opened', 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_cas, '{ts escape="sql"}Resolved{/ts}', 2, 'Closed',  'Closed', 0, 0, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_cas, '{ts escape="sql"}Urgent{/ts}'  , 3, 'Urgent',  'Opened', 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
 
   (@option_group_id_pl, '{ts escape="sql"}Name Only{/ts}'     , 1, 'Name Only'      ,  NULL, 0, 0, 1, 'CRM_Event_Page_ParticipantListing_Name', 0, 1, 1, NULL, NULL, NULL),
   (@option_group_id_pl, '{ts escape="sql"}Name and Email{/ts}', 2, 'Name and Email' ,  NULL, 0, 0, 2, 'CRM_Event_Page_ParticipantListing_NameAndEmail', 0, 1, 1, NULL, NULL, NULL),
@@ -655,8 +655,8 @@ VALUES
   (@option_group_id_sfe, 'ics',  15, 'ics',   NULL, 0, 0, 15, NULL, 0, 0, 1, NULL, NULL, NULL),
   (@option_group_id_sfe, 'pptx',  16, 'pptx',   NULL, 0, 0, 16, NULL, 0, 0, 1, NULL, NULL, NULL),
 
-  (@option_group_id_we, '{ts escape="sql"}Textarea{/ts}', 1, 'Textarea', NULL, 0, NULL, 1, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_we, '{ts escape="sql"}CKEditor 4{/ts}', 2, 'CKEditor', NULL, 0, NULL, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_we, '{ts escape="sql"}Textarea{/ts}', 1, 'Textarea', NULL, 0, 0, 1, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_we, '{ts escape="sql"}CKEditor 4{/ts}', 2, 'CKEditor', NULL, 0, 0, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
 
   (@option_group_id_mt, '{ts escape="sql"}Search Builder{/ts}',      1, 'Search Builder',      NULL, 0, 0,    1, NULL, 0, 1, 1, NULL, NULL, NULL),
   (@option_group_id_mt, '{ts escape="sql"}Import Contact{/ts}',      2, 'Import Contact',      NULL, 0, 0,    2, NULL, 0, 1, 1, NULL, NULL, NULL),
@@ -672,41 +672,41 @@ VALUES
   (@option_group_id_mt, '{ts escape="sql"}Export Case{/ts}',        12, 'Export Case',         NULL, 0, 0,   12, NULL, 0, 1, 1, NULL, NULL, NULL),
   (@option_group_id_mt, '{ts escape="sql"}Export Activity{/ts}',    14, 'Export Activity',     NULL, 0, 0,   14, NULL, 0, 1, 1, NULL, NULL, NULL),
 
-  (@option_group_id_fu, '{ts escape="sql"}day{/ts}'    , 'day'  ,    'day',  NULL, 0, NULL, 1, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_fu, '{ts escape="sql"}week{/ts}'   , 'week' ,   'week',  NULL, 0, NULL, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_fu, '{ts escape="sql"}month{/ts}'  , 'month',  'month',  NULL, 0, NULL, 3, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_fu, '{ts escape="sql"}year{/ts}'   , 'year' ,   'year',  NULL, 0, NULL, 4, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_fu, '{ts escape="sql"}day{/ts}'    , 'day'  ,    'day',  NULL, 0, 0, 1, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_fu, '{ts escape="sql"}week{/ts}'   , 'week' ,   'week',  NULL, 0, 0, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_fu, '{ts escape="sql"}month{/ts}'  , 'month',  'month',  NULL, 0, 0, 3, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_fu, '{ts escape="sql"}year{/ts}'   , 'year' ,   'year',  NULL, 0, 0, 4, NULL, 0, 1, 1, NULL, NULL, NULL),
 
 -- phone types.
-  (@option_group_id_pht, '{ts escape="sql"}Phone{/ts}' ,        1, 'Phone'      , NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_pht, '{ts escape="sql"}Mobile{/ts}',        2, 'Mobile'     , NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_pht, '{ts escape="sql"}Fax{/ts}'   ,        3, 'Fax'        , NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_pht, '{ts escape="sql"}Pager{/ts}' ,        4, 'Pager'      , NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_pht, '{ts escape="sql"}Voicemail{/ts}' ,    5, 'Voicemail'  , NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_pht, '{ts escape="sql"}Phone{/ts}' ,        1, 'Phone'      , NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_pht, '{ts escape="sql"}Mobile{/ts}',        2, 'Mobile'     , NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_pht, '{ts escape="sql"}Fax{/ts}'   ,        3, 'Fax'        , NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_pht, '{ts escape="sql"}Pager{/ts}' ,        4, 'Pager'      , NULL, 0, 0, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_pht, '{ts escape="sql"}Voicemail{/ts}' ,    5, 'Voicemail'  , NULL, 0, 0, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
 
 -- custom data types.
-  (@option_group_id_cdt, 'Participant Role',       '1', 'ParticipantRole',      NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL , NULL),
-  (@option_group_id_cdt, 'Participant Event Name', '2', 'ParticipantEventName', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL , NULL),
-  (@option_group_id_cdt, 'Participant Event Type', '3', 'ParticipantEventType', NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL , NULL),
+  (@option_group_id_cdt, 'Participant Role',       '1', 'ParticipantRole',      NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL , NULL),
+  (@option_group_id_cdt, 'Participant Event Name', '2', 'ParticipantEventName', NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL , NULL),
+  (@option_group_id_cdt, 'Participant Event Type', '3', 'ParticipantEventType', NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL , NULL),
 
 -- visibility.
-  (@option_group_id_vis, 'Public', 1, 'public', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL , NULL),
-  (@option_group_id_vis, 'Admin', 2, 'admin', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL , NULL),
+  (@option_group_id_vis, 'Public', 1, 'public', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL , NULL),
+  (@option_group_id_vis, 'Admin', 2, 'admin', NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL , NULL),
 
 -- mail protocol.
-  (@option_group_id_mp, 'IMAP',    1, 'IMAP',    NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL , NULL),
-  (@option_group_id_mp, 'Maildir', 2, 'Maildir', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL , NULL),
-  (@option_group_id_mp, 'POP3',    3, 'POP3',    NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL , NULL),
-  (@option_group_id_mp, 'Localdir', 4, 'Localdir', NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL , NULL),
+  (@option_group_id_mp, 'IMAP',    1, 'IMAP',    NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL , NULL),
+  (@option_group_id_mp, 'Maildir', 2, 'Maildir', NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL , NULL),
+  (@option_group_id_mp, 'POP3',    3, 'POP3',    NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL , NULL),
+  (@option_group_id_mp, 'Localdir', 4, 'Localdir', NULL, 0, 0, 4, NULL, 0, 0, 1, NULL, NULL , NULL),
 
 -- priority
-  (@option_group_id_priority, '{ts escape="sql"}Urgent{/ts}', 1, 'Urgent', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_priority, '{ts escape="sql"}Normal{/ts}', 2, 'Normal', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_priority, '{ts escape="sql"}Low{/ts}',    3, 'Low',    NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_priority, '{ts escape="sql"}Urgent{/ts}', 1, 'Urgent', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_priority, '{ts escape="sql"}Normal{/ts}', 2, 'Normal', NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_priority, '{ts escape="sql"}Low{/ts}',    3, 'Low',    NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
 
 -- redaction rule FIXME: should this be in sample data instead?
-  (@option_group_id_rr, 'Vancouver', 'city_', 'city_', NULL, 0, NULL, 1, NULL, 0, 0, 0, NULL, NULL, NULL),
-  (@option_group_id_rr, '{literal}/(19|20)(\\d{2})-(\\d{1,2})-(\\d{1,2})/{/literal}', 'date_', 'date_', NULL, 1, NULL, 2, NULL, 0, 0, 0, NULL, NULL, NULL),
+  (@option_group_id_rr, 'Vancouver', 'city_', 'city_', NULL, 0, 0, 1, NULL, 0, 0, 0, NULL, NULL, NULL),
+  (@option_group_id_rr, '{literal}/(19|20)(\\d{2})-(\\d{1,2})-(\\d{1,2})/{/literal}', 'date_', 'date_', NULL, 1, 0, 2, NULL, 0, 0, 0, NULL, NULL, NULL),
 
 -- email greeting.
   (@option_group_id_emailGreeting, '{literal}Dear {contact.first_name}{/literal}',                                                 1, '{literal}Dear {contact.first_name}{/literal}',                                                 NULL,    1, 1, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
@@ -729,28 +729,28 @@ VALUES
 
 -- website type
    (@option_group_id_website, 'Work',     1, 'Work',     NULL, 0, 1, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_website, 'Main',     2, 'Main',     NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_website, 'Facebook', 3, 'Facebook', NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_website, 'Instagram',  5, 'Instagram',  NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_website, 'LinkedIn',  6, 'LinkedIn',  NULL, 0, NULL, 6, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_website, 'MySpace',  7, 'MySpace',  NULL, 0, NULL, 7, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_website, 'Pinterest',  8, 'Pinterest',  NULL, 0, NULL, 8, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_website, 'SnapChat',  9, 'SnapChat',  NULL, 0, NULL, 9, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_website, 'Tumblr',  10, 'Tumblr',  NULL, 0, NULL, 10, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_website, 'Twitter',  11, 'Twitter',  NULL, 0, NULL, 11, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_website, 'Vine',  12, 'Vine ',  NULL, 0, NULL, 12, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_website, 'Main',     2, 'Main',     NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_website, 'Facebook', 3, 'Facebook', NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_website, 'Instagram',  5, 'Instagram',  NULL, 0, 0, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_website, 'LinkedIn',  6, 'LinkedIn',  NULL, 0, 0, 6, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_website, 'MySpace',  7, 'MySpace',  NULL, 0, 0, 7, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_website, 'Pinterest',  8, 'Pinterest',  NULL, 0, 0, 8, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_website, 'SnapChat',  9, 'SnapChat',  NULL, 0, 0, 9, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_website, 'Tumblr',  10, 'Tumblr',  NULL, 0, 0, 10, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_website, 'Twitter',  11, 'Twitter',  NULL, 0, 0, 11, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_website, 'Vine',  12, 'Vine ',  NULL, 0, 0, 12, NULL, 0, 0, 1, NULL, NULL, NULL),
 
 -- Tag used for
-   (@option_group_id_tuf, '{ts escape="sql"}Contacts{/ts}',    'civicrm_contact',  'Contact',  NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_tuf, '{ts escape="sql"}Activities{/ts}',  'civicrm_activity', 'Activity', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_tuf, '{ts escape="sql"}Cases{/ts}',       'civicrm_case',     'Case',     NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_tuf, '{ts escape="sql"}Attachments{/ts}', 'civicrm_file',     'File',     NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_tuf, '{ts escape="sql"}Contacts{/ts}',    'civicrm_contact',  'Contact',  NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_tuf, '{ts escape="sql"}Activities{/ts}',  'civicrm_activity', 'Activity', NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_tuf, '{ts escape="sql"}Cases{/ts}',       'civicrm_case',     'Case',     NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_tuf, '{ts escape="sql"}Attachments{/ts}', 'civicrm_file',     'File',     NULL, 0, 0, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
 
 -- Note used for
-   (@option_group_id_nuf, '{ts escape="sql"}Contacts{/ts}',      'civicrm_contact',      'Contact',      NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_nuf, '{ts escape="sql"}Relationships{/ts}', 'civicrm_relationship', 'Relationship', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_nuf, '{ts escape="sql"}Participants{/ts}',  'civicrm_participant',  'Participant',  NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_nuf, '{ts escape="sql"}Contributions{/ts}', 'civicrm_contribution', 'Contribution', NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_nuf, '{ts escape="sql"}Contacts{/ts}',      'civicrm_contact',      'Contact',      NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_nuf, '{ts escape="sql"}Relationships{/ts}', 'civicrm_relationship', 'Relationship', NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_nuf, '{ts escape="sql"}Participants{/ts}',  'civicrm_participant',  'Participant',  NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_nuf, '{ts escape="sql"}Contributions{/ts}', 'civicrm_contribution', 'Contribution', NULL, 0, 0, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
 
 -- Available currencies.
    (@option_group_id_currency, 'USD ($)',      'USD',     'USD',       NULL, 0, 1, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
@@ -770,22 +770,22 @@ VALUES
   (@option_group_id_notePrivacy, '{ts escape="sql"}Author Only{/ts}', 1, 'Author Only', NULL, 0, 0, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
 
 -- Compaign Types
-  (@option_group_id_campaignType, '{ts escape="sql"}Direct Mail{/ts}', 1, 'Direct Mail',  NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_campaignType, '{ts escape="sql"}Referral Program{/ts}', 2, 'Referral Program',  NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_campaignType, '{ts escape="sql"}Constituent Engagement{/ts}', 3, 'Constituent Engagement',  NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_campaignType, '{ts escape="sql"}Direct Mail{/ts}', 1, 'Direct Mail',  NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_campaignType, '{ts escape="sql"}Referral Program{/ts}', 2, 'Referral Program',  NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_campaignType, '{ts escape="sql"}Constituent Engagement{/ts}', 3, 'Constituent Engagement',  NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
 
 -- Campaign Status
-  (@option_group_id_campaignStatus, '{ts escape="sql"}Planned{/ts}', 1, 'Planned',  NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_campaignStatus, '{ts escape="sql"}In Progress{/ts}', 2, 'In Progress',  NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_campaignStatus, '{ts escape="sql"}Completed{/ts}', 3, 'Completed',  NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_campaignStatus, '{ts escape="sql"}Cancelled{/ts}', 4, 'Cancelled',  NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_campaignStatus, '{ts escape="sql"}Planned{/ts}', 1, 'Planned',  NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_campaignStatus, '{ts escape="sql"}In Progress{/ts}', 2, 'In Progress',  NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_campaignStatus, '{ts escape="sql"}Completed{/ts}', 3, 'Completed',  NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_campaignStatus, '{ts escape="sql"}Cancelled{/ts}', 4, 'Cancelled',  NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
 
 -- Engagement Level
-  (@option_group_id_engagement_index, '{ts escape="sql"}1{/ts}', 1, '1',  NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL , NULL),
-  (@option_group_id_engagement_index, '{ts escape="sql"}2{/ts}', 2, '2',  NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL , NULL),
-  (@option_group_id_engagement_index, '{ts escape="sql"}3{/ts}', 3, '3',  NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL , NULL),
-  (@option_group_id_engagement_index, '{ts escape="sql"}4{/ts}', 4, '4',  NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL , NULL),
-  (@option_group_id_engagement_index, '{ts escape="sql"}5{/ts}', 5, '5',  NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL , NULL),
+  (@option_group_id_engagement_index, '{ts escape="sql"}1{/ts}', 1, '1',  NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL , NULL),
+  (@option_group_id_engagement_index, '{ts escape="sql"}2{/ts}', 2, '2',  NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL , NULL),
+  (@option_group_id_engagement_index, '{ts escape="sql"}3{/ts}', 3, '3',  NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL , NULL),
+  (@option_group_id_engagement_index, '{ts escape="sql"}4{/ts}', 4, '4',  NULL, 0, 0, 4, NULL, 0, 0, 1, NULL, NULL , NULL),
+  (@option_group_id_engagement_index, '{ts escape="sql"}5{/ts}', 5, '5',  NULL, 0, 0, 5, NULL, 0, 0, 1, NULL, NULL , NULL),
 
 -- Paper Sizes
   (@option_group_id_paperSize, '{ts escape="sql"}Letter{/ts}',          '{literal}{"metric":"in","width":8.5,"height":11}{/literal}',          'letter',      NULL, NULL, 1, 1,  NULL, 0, 0, 1, NULL, NULL, NULL),
@@ -852,9 +852,9 @@ VALUES
   (@option_group_id_paperSize, '{ts escape="sql"}ISO SRA4{/ts}',        '{literal}{"metric":"pt","width":637.8,"height":907.09}{/literal}',    'sra4',        NULL, NULL, 0, 62, NULL, 0, 0, 1, NULL, NULL, NULL),
 
 -- activity_contacts
-   (@option_group_id_aco, '{ts escape="sql"}Activity Assignees{/ts}', 1, 'Activity Assignees', NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_aco, '{ts escape="sql"}Activity Source{/ts}', 2, 'Activity Source', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_aco, '{ts escape="sql"}Activity Targets{/ts}', 3, 'Activity Targets', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_aco, '{ts escape="sql"}Activity Assignees{/ts}', 1, 'Activity Assignees', NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_aco, '{ts escape="sql"}Activity Source{/ts}', 2, 'Activity Source', NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_aco, '{ts escape="sql"}Activity Targets{/ts}', 3, 'Activity Targets', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
 
 -- financial_account_type
 -- grouping field is specific to Quickbooks for mapping to .iif format
@@ -879,23 +879,23 @@ VALUES
      (@option_group_id_arel, '{ts escape="sql"}Deferred Revenue Account is{/ts}', 12, 'Deferred Revenue Account is', NULL, 0, 0, 12, 'Deferred Revenue Account is', 0, 1, 1, 2, NULL, NULL),
 
 -- event_contacts
-   (@option_group_id_ere, '{ts escape="sql"}Participant Role{/ts}', 1, 'participant_role', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_ere, '{ts escape="sql"}Participant Role{/ts}', 1, 'participant_role', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
 
 -- default conference slots
-   (@option_group_id_conference_slot, '{ts escape="sql"}Morning Sessions{/ts}', 1, 'Morning Sessions', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_conference_slot, '{ts escape="sql"}Evening Sessions{/ts}', 2, 'Evening Sessions', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_conference_slot, '{ts escape="sql"}Morning Sessions{/ts}', 1, 'Morning Sessions', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_conference_slot, '{ts escape="sql"}Evening Sessions{/ts}', 2, 'Evening Sessions', NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
 
 -- default batch types
-   (@option_group_id_batch_type, '{ts escape="sql"}Contribution{/ts}', 1, 'Contribution', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_batch_type, '{ts escape="sql"}Membership{/ts}', 2, 'Membership', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_batch_type, '{ts escape="sql"}Pledge Payment{/ts}', 3, 'Pledge Payment', NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_batch_type, '{ts escape="sql"}Contribution{/ts}', 1, 'Contribution', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_batch_type, '{ts escape="sql"}Membership{/ts}', 2, 'Membership', NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_batch_type, '{ts escape="sql"}Pledge Payment{/ts}', 3, 'Pledge Payment', NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
 
 -- default batch statuses
-   (@option_group_id_batch_status, '{ts escape="sql"}Open{/ts}', 1, 'Open', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_batch_status, '{ts escape="sql"}Closed{/ts}', 2, 'Closed', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_batch_status, '{ts escape="sql"}Data Entry{/ts}', 3, 'Data Entry', NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_batch_status, '{ts escape="sql"}Reopened{/ts}', 4, 'Reopened', NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_batch_status, '{ts escape="sql"}Exported{/ts}', 5, 'Exported', NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_batch_status, '{ts escape="sql"}Open{/ts}', 1, 'Open', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_batch_status, '{ts escape="sql"}Closed{/ts}', 2, 'Closed', NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_batch_status, '{ts escape="sql"}Data Entry{/ts}', 3, 'Data Entry', NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_batch_status, '{ts escape="sql"}Reopened{/ts}', 4, 'Reopened', NULL, 0, 0, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_batch_status, '{ts escape="sql"}Exported{/ts}', 5, 'Exported', NULL, 0, 0, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
 
 -- default batch modes
    (@option_group_id_batch_mode, '{ts escape="sql"}Manual Batch{/ts}', 1, 'Manual Batch', NULL, 0, 0, 1, 'Manual Batch', 0, 1, 1, 2, NULL, NULL),
@@ -920,10 +920,10 @@ VALUES
    (@option_group_id_label_type, '{ts escape="sql"}Event Badge{/ts}', 1, 'Event Badge', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
 
 -- Name Label format
-   (@option_group_id_name_badge, '{ts escape="sql"}Avery 5395{/ts}', '{literal}{"name":"Avery 5395","paper-size":"a4","metric":"mm","lMargin":15,"tMargin":26,"NX":2,"NY":4,"SpaceX":10,"SpaceY":5,"width":83,"height":57,"font-size":12,"orientation":"portrait","font-name":"helvetica","font-style":"","lPadding":3,"tPadding":3}{/literal}', 'Avery 5395', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_name_badge, '{ts escape="sql"}A6 Badge Portrait 150x106{/ts}', '{literal}{"paper-size":"a4","orientation":"landscape","font-name":"times","font-size":6,"font-style":"","NX":2,"NY":1,"metric":"mm","lMargin":25,"tMargin":27,"SpaceX":0,"SpaceY":35,"width":106,"height":150,"lPadding":5,"tPadding":5}{/literal}', 'A6 Badge Portrait 150x106', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_name_badge, '{ts escape="sql"}Fattorini Name Badge 100x65{/ts}', '{literal}{"paper-size":"a4","orientation":"portrait","font-name":"times","font-size":6,"font-style":"","NX":2,"NY":4,"metric":"mm","lMargin":6,"tMargin":19,"SpaceX":0,"SpaceY":0,"width":100,"height":65,"lPadding":0,"tPadding":0}{/literal}', 'Fattorini Name Badge 100x65', NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_name_badge, '{ts escape="sql"}Hanging Badge 3-3/4" x 4-3"/4{/ts}', '{literal}{"paper-size":"a4","orientation":"portrait","font-name":"times","font-size":6,"font-style":"","NX":2,"NY":2,"metric":"mm","lMargin":10,"tMargin":28,"SpaceX":0,"SpaceY":0,"width":96,"height":121,"lPadding":5,"tPadding":5}{/literal}', 'Hanging Badge 3-3/4" x 4-3"/4', NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_name_badge, '{ts escape="sql"}Avery 5395{/ts}', '{literal}{"name":"Avery 5395","paper-size":"a4","metric":"mm","lMargin":15,"tMargin":26,"NX":2,"NY":4,"SpaceX":10,"SpaceY":5,"width":83,"height":57,"font-size":12,"orientation":"portrait","font-name":"helvetica","font-style":"","lPadding":3,"tPadding":3}{/literal}', 'Avery 5395', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_name_badge, '{ts escape="sql"}A6 Badge Portrait 150x106{/ts}', '{literal}{"paper-size":"a4","orientation":"landscape","font-name":"times","font-size":6,"font-style":"","NX":2,"NY":1,"metric":"mm","lMargin":25,"tMargin":27,"SpaceX":0,"SpaceY":35,"width":106,"height":150,"lPadding":5,"tPadding":5}{/literal}', 'A6 Badge Portrait 150x106', NULL, 0, 0, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_name_badge, '{ts escape="sql"}Fattorini Name Badge 100x65{/ts}', '{literal}{"paper-size":"a4","orientation":"portrait","font-name":"times","font-size":6,"font-style":"","NX":2,"NY":4,"metric":"mm","lMargin":6,"tMargin":19,"SpaceX":0,"SpaceY":0,"width":100,"height":65,"lPadding":0,"tPadding":0}{/literal}', 'Fattorini Name Badge 100x65', NULL, 0, 0, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_name_badge, '{ts escape="sql"}Hanging Badge 3-3/4" x 4-3"/4{/ts}', '{literal}{"paper-size":"a4","orientation":"portrait","font-name":"times","font-size":6,"font-style":"","NX":2,"NY":2,"metric":"mm","lMargin":10,"tMargin":28,"SpaceX":0,"SpaceY":0,"width":96,"height":121,"lPadding":5,"tPadding":5}{/literal}', 'Hanging Badge 3-3/4" x 4-3"/4', NULL, 0, 0, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
 
 -- Mailing Label Formats
   (@option_group_id_label, '{ts escape="sql"}Avery 3475{/ts}', '{literal}{"paper-size":"a4","orientation":"portrait","font-name":"dejavusans","font-size":10,"font-style":"","metric":"mm","lMargin":0,"tMargin":5,"NX":3,"NY":8,"SpaceX":0,"SpaceY":0,"width":70,"height":36,"lPadding":5.08,"tPadding":5.08}{/literal}',                   '3475',  'Avery', NULL, 0, 1,  NULL, 0, 1, 1, NULL, NULL, NULL),
@@ -962,86 +962,86 @@ VALUES
 (@option_group_id_env, '{ts escape="sql"}Development{/ts}', 'Development', 'Development', NULL, NULL, 0, 3, 'Development Environment', 0, 1, 1, NULL, NULL, NULL),
 
 -- Relative Date Filters
-   (@option_group_id_date_filter, '{ts escape="sql"}Today{/ts}', 'this.day', 'this.day', NULL, NULL, NULL,1, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}This week{/ts}', 'this.week', 'this.week', NULL, NULL, NULL,2, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}This calendar month{/ts}', 'this.month', 'this.month', NULL, NULL, NULL,3, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}This quarter{/ts}', 'this.quarter', 'this.quarter', NULL, NULL, NULL,4, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}This fiscal year{/ts}', 'this.fiscal_year', 'this.fiscal_year', NULL, NULL, NULL,5, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}This calendar year{/ts}', 'this.year', 'this.year', NULL, NULL, NULL,6, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Yesterday{/ts}', 'previous.day', 'previous.day', NULL, NULL, NULL,7, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Previous week{/ts}', 'previous.week', 'previous.week', NULL, NULL, NULL,8, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Previous calendar month{/ts}', 'previous.month', 'previous.month', NULL, NULL, NULL,9, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Previous quarter{/ts}', 'previous.quarter', 'previous.quarter', NULL, NULL, NULL,10, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Previous fiscal year{/ts}', 'previous.fiscal_year', 'previous.fiscal_year', NULL, NULL, NULL,11, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Previous calendar year{/ts}', 'previous.year', 'previous.year', NULL, NULL, NULL,12, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Last 7 days including today{/ts}', 'ending.week', 'ending.week', NULL, NULL, NULL,13, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Last 30 days including today{/ts}', 'ending_30.day', 'ending.month', NULL, NULL, NULL,14, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Last 60 days including today{/ts}', 'ending_60.day', 'ending_2.month', NULL, NULL, NULL,15, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Last 90 days including today{/ts}', 'ending_90.day', 'ending.quarter', NULL, NULL, NULL,16, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Last 12 months including today{/ts}', 'ending.year', 'ending.year', NULL, NULL, NULL,17, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Last 2 years including today{/ts}', 'ending_2.year', 'ending_2.year', NULL, NULL, NULL,18, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Last 3 years including today{/ts}', 'ending_3.year', 'ending_3.year', NULL, NULL, NULL,19, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Tomorrow{/ts}', 'starting.day', 'starting.day', NULL, NULL, NULL,20, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Next week{/ts}', 'next.week', 'next.week', NULL, NULL, NULL,21, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Next calendar month{/ts}', 'next.month', 'next.month', NULL, NULL, NULL,22, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Next quarter{/ts}', 'next.quarter', 'next.quarter', NULL, NULL, NULL,23, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Next fiscal year{/ts}', 'next.fiscal_year', 'next.fiscal_year', NULL, NULL, NULL,24, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Next calendar year{/ts}', 'next.year', 'next.year', NULL, NULL, NULL,25, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Next 7 days including today{/ts}', 'starting.week', 'starting.week', NULL, NULL, NULL,26, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Next 30 days including today{/ts}', 'starting.month', 'starting.month', NULL, NULL, NULL,27, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Next 60 days including today{/ts}', 'starting_2.month', 'starting_2.month', NULL, NULL, NULL,28, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Next 90 days including today{/ts}', 'starting.quarter', 'starting.quarter', NULL, NULL, NULL,29, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Next 12 months including today{/ts}', 'starting.year', 'starting.year', NULL, NULL, NULL,30, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Current week to-date{/ts}', 'current.week', 'current.week', NULL, NULL, NULL,31, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Current calendar month to-date{/ts}', 'current.month', 'current.month', NULL, NULL, NULL,32, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Current quarter to-date{/ts}', 'current.quarter', 'current.quarter', NULL, NULL, NULL,33, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Current calendar year to-date{/ts}', 'current.year', 'current.year', NULL, NULL, NULL,34, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}To end of yesterday{/ts}', 'earlier.day', 'earlier.day', NULL, NULL, NULL,35, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}To end of previous week{/ts}', 'earlier.week', 'earlier.week', NULL, NULL, NULL,36, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}To end of previous calendar month{/ts}', 'earlier.month', 'earlier.month', NULL, NULL, NULL,37, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}To end of previous quarter{/ts}', 'earlier.quarter', 'earlier.quarter', NULL, NULL, NULL,38, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}To end of previous calendar year{/ts}', 'earlier.year', 'earlier.year', NULL, NULL, NULL,39, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}From start of current day{/ts}', 'greater.day', 'greater.day', NULL, NULL, NULL,40, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}From start of current week{/ts}', 'greater.week', 'greater.week', NULL, NULL, NULL,41, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}From start of current calendar month{/ts}', 'greater.month', 'greater.month', NULL, NULL, NULL,42, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}From start of current quarter{/ts}', 'greater.quarter', 'greater.quarter', NULL, NULL, NULL,43, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}From start of current calendar year{/ts}', 'greater.year', 'greater.year', NULL, NULL, NULL,44, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}To end of current week{/ts}', 'less.week', 'less.week', NULL, NULL, NULL,45, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}To end of current calendar month{/ts}', 'less.month', 'less.month', NULL, NULL, NULL,46, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}To end of current quarter{/ts}', 'less.quarter', 'less.quarter', NULL, NULL, NULL,47, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}To end of current calendar year{/ts}', 'less.year', 'less.year', NULL, NULL, NULL,48, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Previous 2 days{/ts}', 'previous_2.day', 'previous_2.day', NULL, NULL, NULL,49, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Previous 2 weeks{/ts}', 'previous_2.week', 'previous_2.week', NULL, NULL, NULL,50, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Previous 2 calendar months{/ts}', 'previous_2.month', 'previous_2.month', NULL, NULL, NULL,51, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Previous 2 quarters{/ts}', 'previous_2.quarter', 'previous_2.quarter', NULL, NULL, NULL,52, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Previous 2 calendar years{/ts}', 'previous_2.year', 'previous_2.year', NULL, NULL, NULL,53, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Day prior to yesterday{/ts}', 'previous_before.day', 'previous_before.day', NULL, NULL, NULL,54, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Week prior to previous week{/ts}', 'previous_before.week', 'previous_before.week', NULL, NULL, NULL,55, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Today{/ts}', 'this.day', 'this.day', NULL, NULL, 0,1, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}This week{/ts}', 'this.week', 'this.week', NULL, NULL, 0,2, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}This calendar month{/ts}', 'this.month', 'this.month', NULL, NULL, 0,3, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}This quarter{/ts}', 'this.quarter', 'this.quarter', NULL, NULL, 0,4, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}This fiscal year{/ts}', 'this.fiscal_year', 'this.fiscal_year', NULL, NULL, 0,5, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}This calendar year{/ts}', 'this.year', 'this.year', NULL, NULL, 0,6, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Yesterday{/ts}', 'previous.day', 'previous.day', NULL, NULL, 0,7, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Previous week{/ts}', 'previous.week', 'previous.week', NULL, NULL, 0,8, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Previous calendar month{/ts}', 'previous.month', 'previous.month', NULL, NULL, 0,9, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Previous quarter{/ts}', 'previous.quarter', 'previous.quarter', NULL, NULL, 0,10, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Previous fiscal year{/ts}', 'previous.fiscal_year', 'previous.fiscal_year', NULL, NULL, 0,11, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Previous calendar year{/ts}', 'previous.year', 'previous.year', NULL, NULL, 0,12, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Last 7 days including today{/ts}', 'ending.week', 'ending.week', NULL, NULL, 0,13, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Last 30 days including today{/ts}', 'ending_30.day', 'ending.month', NULL, NULL, 0,14, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Last 60 days including today{/ts}', 'ending_60.day', 'ending_2.month', NULL, NULL, 0,15, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Last 90 days including today{/ts}', 'ending_90.day', 'ending.quarter', NULL, NULL, 0,16, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Last 12 months including today{/ts}', 'ending.year', 'ending.year', NULL, NULL, 0,17, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Last 2 years including today{/ts}', 'ending_2.year', 'ending_2.year', NULL, NULL, 0,18, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Last 3 years including today{/ts}', 'ending_3.year', 'ending_3.year', NULL, NULL, 0,19, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Tomorrow{/ts}', 'starting.day', 'starting.day', NULL, NULL, 0,20, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Next week{/ts}', 'next.week', 'next.week', NULL, NULL, 0,21, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Next calendar month{/ts}', 'next.month', 'next.month', NULL, NULL, 0,22, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Next quarter{/ts}', 'next.quarter', 'next.quarter', NULL, NULL, 0,23, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Next fiscal year{/ts}', 'next.fiscal_year', 'next.fiscal_year', NULL, NULL, 0,24, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Next calendar year{/ts}', 'next.year', 'next.year', NULL, NULL, 0,25, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Next 7 days including today{/ts}', 'starting.week', 'starting.week', NULL, NULL, 0,26, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Next 30 days including today{/ts}', 'starting.month', 'starting.month', NULL, NULL, 0,27, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Next 60 days including today{/ts}', 'starting_2.month', 'starting_2.month', NULL, NULL, 0,28, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Next 90 days including today{/ts}', 'starting.quarter', 'starting.quarter', NULL, NULL, 0,29, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Next 12 months including today{/ts}', 'starting.year', 'starting.year', NULL, NULL, 0,30, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Current week to-date{/ts}', 'current.week', 'current.week', NULL, NULL, 0,31, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Current calendar month to-date{/ts}', 'current.month', 'current.month', NULL, NULL, 0,32, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Current quarter to-date{/ts}', 'current.quarter', 'current.quarter', NULL, NULL, 0,33, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Current calendar year to-date{/ts}', 'current.year', 'current.year', NULL, NULL, 0,34, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}To end of yesterday{/ts}', 'earlier.day', 'earlier.day', NULL, NULL, 0,35, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}To end of previous week{/ts}', 'earlier.week', 'earlier.week', NULL, NULL, 0,36, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}To end of previous calendar month{/ts}', 'earlier.month', 'earlier.month', NULL, NULL, 0,37, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}To end of previous quarter{/ts}', 'earlier.quarter', 'earlier.quarter', NULL, NULL, 0,38, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}To end of previous calendar year{/ts}', 'earlier.year', 'earlier.year', NULL, NULL, 0,39, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}From start of current day{/ts}', 'greater.day', 'greater.day', NULL, NULL, 0,40, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}From start of current week{/ts}', 'greater.week', 'greater.week', NULL, NULL, 0,41, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}From start of current calendar month{/ts}', 'greater.month', 'greater.month', NULL, NULL, 0,42, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}From start of current quarter{/ts}', 'greater.quarter', 'greater.quarter', NULL, NULL, 0,43, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}From start of current calendar year{/ts}', 'greater.year', 'greater.year', NULL, NULL, 0,44, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}To end of current week{/ts}', 'less.week', 'less.week', NULL, NULL, 0,45, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}To end of current calendar month{/ts}', 'less.month', 'less.month', NULL, NULL, 0,46, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}To end of current quarter{/ts}', 'less.quarter', 'less.quarter', NULL, NULL, 0,47, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}To end of current calendar year{/ts}', 'less.year', 'less.year', NULL, NULL, 0,48, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Previous 2 days{/ts}', 'previous_2.day', 'previous_2.day', NULL, NULL, 0,49, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Previous 2 weeks{/ts}', 'previous_2.week', 'previous_2.week', NULL, NULL, 0,50, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Previous 2 calendar months{/ts}', 'previous_2.month', 'previous_2.month', NULL, NULL, 0,51, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Previous 2 quarters{/ts}', 'previous_2.quarter', 'previous_2.quarter', NULL, NULL, 0,52, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Previous 2 calendar years{/ts}', 'previous_2.year', 'previous_2.year', NULL, NULL, 0,53, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Day prior to yesterday{/ts}', 'previous_before.day', 'previous_before.day', NULL, NULL, 0,54, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Week prior to previous week{/ts}', 'previous_before.week', 'previous_before.week', NULL, NULL, 0,55, NULL, 0, 0, 1, NULL, NULL, NULL),
    (@option_group_id_date_filter, '{ts escape="sql"}Month prior to previous calendar month{/ts}', 'previous_before.month', 'previous_before.month', NULL, NULL, NULL,56, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Quarter prior to previous quarter{/ts}', 'previous_before.quarter', 'previous_before.quarter', NULL, NULL, NULL,57, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}Year prior to previous calendar year{/ts}', 'previous_before.year', 'previous_before.year', NULL, NULL, NULL,58, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}From end of previous week{/ts}', 'greater_previous.week', 'greater_previous.week', NULL, NULL, NULL,59, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}From end of previous calendar month{/ts}', 'greater_previous.month', 'greater_previous.month', NULL, NULL, NULL,60, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}From end of previous quarter{/ts}', 'greater_previous.quarter', 'greater_previous.quarter', NULL, NULL, NULL,61, NULL, 0, 0, 1, NULL, NULL, NULL),
-   (@option_group_id_date_filter, '{ts escape="sql"}From end of previous calendar year{/ts}', 'greater_previous.year', 'greater_previous.year', NULL, NULL, NULL,62, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Quarter prior to previous quarter{/ts}', 'previous_before.quarter', 'previous_before.quarter', NULL, NULL, 0,57, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}Year prior to previous calendar year{/ts}', 'previous_before.year', 'previous_before.year', NULL, NULL, 0,58, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}From end of previous week{/ts}', 'greater_previous.week', 'greater_previous.week', NULL, NULL, 0,59, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}From end of previous calendar month{/ts}', 'greater_previous.month', 'greater_previous.month', NULL, NULL, 0,60, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}From end of previous quarter{/ts}', 'greater_previous.quarter', 'greater_previous.quarter', NULL, NULL, 0,61, NULL, 0, 0, 1, NULL, NULL, NULL),
+   (@option_group_id_date_filter, '{ts escape="sql"}From end of previous calendar year{/ts}', 'greater_previous.year', 'greater_previous.year', NULL, NULL, 0,62, NULL, 0, 0, 1, NULL, NULL, NULL),
 
 -- Pledge Status
-  (@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}', 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),
+  (@option_group_id_ps, '{ts escape="sql"}Completed{/ts}'  , 1, 'Completed'  , NULL, 0, 0, 1, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_ps, '{ts escape="sql"}Pending{/ts}'    , 2, 'Pending'    , NULL, 0, 0, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_ps, '{ts escape="sql"}Cancelled{/ts}'  , 3, 'Cancelled'  , NULL, 0, 0, 3, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_ps, '{ts escape="sql"}In Progress{/ts}', 5, 'In Progress', NULL, 0, 0, 4, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_ps, '{ts escape="sql"}Overdue{/ts}'    , 6, 'Overdue'    , NULL, 0, 0, 5, NULL, 0, 1, 1, NULL, NULL, NULL),
 
 
 -- Contribution Recur Status
-  (@option_group_id_crs, '{ts escape="sql"}Completed{/ts}'  , 1, 'Completed'  , NULL, 0, NULL, 1, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_crs, '{ts escape="sql"}Pending{/ts}'    , 2, 'Pending'    , NULL, 0, NULL, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_crs, '{ts escape="sql"}Cancelled{/ts}'  , 3, 'Cancelled'  , NULL, 0, NULL, 3, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_crs, '{ts escape="sql"}Failed{/ts}'     , 4, 'Failed'     , NULL, 0, NULL, 4, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_crs, '{ts escape="sql"}In Progress{/ts}', 5, 'In Progress', NULL, 0, NULL, 5, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_crs, '{ts escape="sql"}Overdue{/ts}'    , 6, 'Overdue'    , NULL, 0, NULL, 6, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_crs, '{ts escape="sql"}Processing{/ts}' , 7, 'Processing' , NULL, 0, NULL, 7, NULL, 0, 1, 1, NULL, NULL, NULL),
-  (@option_group_id_crs, '{ts escape="sql"}Failing{/ts}'    , 8, 'Failing'    , NULL, 0, NULL, 8, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_crs, '{ts escape="sql"}Completed{/ts}'  , 1, 'Completed'  , NULL, 0, 0, 1, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_crs, '{ts escape="sql"}Pending{/ts}'    , 2, 'Pending'    , NULL, 0, 0, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_crs, '{ts escape="sql"}Cancelled{/ts}'  , 3, 'Cancelled'  , NULL, 0, 0, 3, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_crs, '{ts escape="sql"}Failed{/ts}'     , 4, 'Failed'     , NULL, 0, 0, 4, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_crs, '{ts escape="sql"}In Progress{/ts}', 5, 'In Progress', NULL, 0, 0, 5, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_crs, '{ts escape="sql"}Overdue{/ts}'    , 6, 'Overdue'    , NULL, 0, 0, 6, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_crs, '{ts escape="sql"}Processing{/ts}' , 7, 'Processing' , NULL, 0, 0, 7, NULL, 0, 1, 1, NULL, NULL, NULL),
+  (@option_group_id_crs, '{ts escape="sql"}Failing{/ts}'    , 8, 'Failing'    , NULL, 0, 0, 8, NULL, 0, 1, 1, NULL, NULL, NULL),
 
 -- CiviCase - Activity Assignee Default
 --  (`option_group_id`,             `label`,                                                `value`, `name`,                    `grouping`, `filter`, `is_default`, `weight`, `description`, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `visibility_id`, `icon`)
@@ -1096,8 +1096,8 @@ VALUES
   (@option_group_id_mail_approval_status, '{ts escape="sql"}None{/ts}' , 3, 'None', NULL, 0, 0, 3, NULL, 0, 1, 1, @mailCompId, @domainID, NULL),
 
 -- custom group objects
-  (@option_group_id_cgeo, '{ts escape="sql"}Survey{/ts}', 'Survey', 'civicrm_survey', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
-  (@option_group_id_cgeo, '{ts escape="sql"}Cases{/ts}',  'Case', 'civicrm_case',     NULL, 0, NULL, 2, 'CRM_Case_PseudoConstant::caseType;', 0, 0, 1, NULL, NULL, NULL);
+  (@option_group_id_cgeo, '{ts escape="sql"}Survey{/ts}', 'Survey', 'civicrm_survey', NULL, 0, 0, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_cgeo, '{ts escape="sql"}Cases{/ts}',  'Case', 'civicrm_case',     NULL, 0, 0, 2, 'CRM_Case_PseudoConstant::caseType;', 0, 0, 1, NULL, NULL, NULL);
 
 -- CRM-6138
 {include file='languages.tpl'}
@@ -1160,7 +1160,7 @@ VALUES
  ('Dummy',              '{ts escape="sql"}Dummy Payment Processor{/ts}',NULL,1,1,'{ts escape="sql"}User Name{/ts}',NULL,NULL,NULL,'Payment_Dummy',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,1),
  ('Elavon',             '{ts escape="sql"}Elavon Payment Processor{/ts}','{ts escape="sql"}Elavon / Nova Virtual Merchant{/ts}',0,0,'{ts escape="sql"}SSL Merchant ID {/ts}','{ts escape="sql"}SSL User ID{/ts}','{ts escape="sql"}SSL PIN{/ts}',NULL,'Payment_Elavon','https://www.myvirtualmerchant.com/VirtualMerchant/processxml.do',NULL,NULL,NULL,'https://www.myvirtualmerchant.com/VirtualMerchant/processxml.do',NULL,NULL,NULL,1,0),
  ('Realex',             '{ts escape="sql"}Realex Payment{/ts}',         NULL,0,0,'Merchant ID', 'Password', NULL, 'Account', 'Payment_Realex', 'https://epage.payandshop.com/epage.cgi', NULL, NULL, NULL, 'https://epage.payandshop.com/epage-remote.cgi', NULL, NULL, NULL, 1, 0),
- ('FirstData',          '{ts escape="sql"}FirstData (aka linkpoint){/ts}', '{ts escape="sql"}FirstData (aka linkpoint){/ts}', 0, 0, 'Store name', 'certificate path', NULL, NULL, 'Payment_FirstData', 'https://secure.linkpt.net', NULL, NULL, NULL, 'https://staging.linkpt.net', NULL, NULL, NULL, 1, NULL);
+ ('FirstData',          '{ts escape="sql"}FirstData (aka linkpoint){/ts}', '{ts escape="sql"}FirstData (aka linkpoint){/ts}', 0, 0, 'Store name', 'certificate path', NULL, NULL, 'Payment_FirstData', 'https://secure.linkpt.net', NULL, NULL, NULL, 'https://staging.linkpt.net', NULL, NULL, NULL, 1, 0);
 
 
 -- the fuzzy default dedupe rules
@@ -1785,4 +1785,3 @@ INSERT IGNORE INTO civicrm_extension (type, full_name, name, label, file, is_act
 INSERT IGNORE INTO civicrm_extension (type, full_name, name, label, file, is_active) VALUES ('module', 'ckeditor4', 'CKEditor4', 'CKEditor4', 'ckeditor4', 1);
 INSERT IGNORE INTO civicrm_extension (type, full_name, name, label, file, is_active) VALUES ('module', 'legacycustomsearches', 'Custom search framework', 'Custom search framework', 'legacycustomsearches', 1);
 INSERT IGNORE INTO civicrm_extension (type, full_name, name, label, file, is_active) VALUES ('module', 'org.civicrm.flexmailer', 'FlexMailer', 'FlexMailer', 'flexmailer', 1);
-