(@option_group_id_act, '{ts escape="sql"}Follow up{/ts}', 14, 'Follow up', NULL, 0, 0, 14, '', 0, 1, 1, @caseCompId, NULL, 'fa-share-square-o'),
(@option_group_id_act, '{ts escape="sql"}Change Case Type{/ts}', 15, 'Change Case Type', NULL, 0, 0, 15, '', 0, 1, 1, @caseCompId, NULL, 'fa-random'),
(@option_group_id_act, '{ts escape="sql"}Change Case Status{/ts}', 16, 'Change Case Status', NULL, 0, 0, 16, '', 0, 1, 1, @caseCompId, NULL, 'fa-pencil-square-o'),
+ (@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"}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"}Canvass{/ts}', 29, 'Canvass', NULL,0, 0, 28, '', 0, 1, 1, @campaignCompId, NULL, NULL),
(@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"}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),
--- Activity Types for CiviCampaign CiviCase
- (@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'),
-
-- 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"}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),
-- Activity Type for failed payment
- (@option_group_id_act, 'Failed Payment', 53, 'Failed Payment', NULL, 1, 0, 53, 'Failed Payment', 0, 1, 1, @contributeCompId, NULL, NULL),
-
- -- Activity Type for Close Accounting Period
- (@option_group_id_act, '{ts escape="sql"}Close Accounting Period{/ts}', 54, 'Close Accounting Period', NULL, 1, 0, 54, '{ts escape="sql"}Close Accounting Period{/ts}', 0, 1, 1, @contributeCompId, NULL, NULL),
+ (@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_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"}City{/ts}' , 4, 'city' , NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
- (@option_group_id_adOpt, '{ts escape="sql"}Postal Code{/ts}' , 5, 'postal_code' , NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
- (@option_group_id_adOpt, '{ts escape="sql"}Postal Code Suffix{/ts}', 6, 'postal_code_suffix', NULL, 0, NULL, 6, NULL, 0, 0, 1, NULL, NULL, NULL),
- (@option_group_id_adOpt, '{ts escape="sql"}County{/ts}' , 7, 'county' , NULL, 0, NULL, 7, NULL, 0, 0, 1, NULL, NULL, NULL),
- (@option_group_id_adOpt, '{ts escape="sql"}State/Province{/ts}' , 8, 'state_province', NULL, 0, NULL, 8, NULL, 0, 0, 1, NULL, NULL, NULL),
- (@option_group_id_adOpt, '{ts escape="sql"}Country{/ts}' , 9, 'country' , NULL, 0, NULL, 9, NULL, 0, 0, 1, NULL, NULL, NULL),
- (@option_group_id_adOpt, '{ts escape="sql"}Latitude{/ts}' , 10, 'geo_code_1' , NULL, 0, NULL, 10, NULL, 0, 0, 1, NULL, NULL, NULL),
- (@option_group_id_adOpt, '{ts escape="sql"}Longitude{/ts}' , 11, 'geo_code_2', NULL, 0, NULL, 11, NULL, 0, 0, 1, NULL, NULL, NULL),
- (@option_group_id_adOpt, '{ts escape="sql"}Address Name{/ts}' , 12, 'address_name', NULL, 0, NULL, 12, NULL, 0, 0, 1, NULL, NULL, NULL),
- (@option_group_id_adOpt, '{ts escape="sql"}Street Address Parsing{/ts}', 13, 'street_address_parsing', NULL, 0, NULL, 13, 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),
(@bounceTypeID, 'sender was rejected'),
(@bounceTypeID, 'spam(check| reduction software| filters?)'),
(@bounceTypeID, 'blocked by a user configured filter'),
- (@bounceTypeID, '(detected|rejected) as spam'),
+ (@bounceTypeID, '(detected|rejected) (as|due to) spam'),
(@bounceTypeID, 'X-HmXmrOriginalRecipient'),
(@bounceTypeID, 'Client host .[^ ]*. blocked'),
(@bounceTypeID, 'automatic(ally-generated)? messages are not accepted'),
( 10, 'receive_date', 1, 1, 4, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Received{/ts}', 'Contribution', NULL, NULL ),
( 10, 'contribution_source', 0, 0, 5, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Source{/ts}', 'Contribution', NULL, NULL ),
( 10, 'payment_instrument', 0, 0, 6, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Payment Method{/ts}', 'Contribution', NULL, NULL ),
- ( 10, 'check_number', 0, 0, 7, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Check Number{/ts}', 'Contribution', NULL, NULL ),
+ ( 10, 'contribution_check_number', 0, 0, 7, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Check Number{/ts}', 'Contribution', NULL, NULL ),
( 10, 'send_receipt', 0, 0, 8, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Send Receipt{/ts}', 'Contribution', NULL, NULL ),
( 10, 'invoice_id', 0, 0, 9, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Invoice ID{/ts}', 'Contribution', NULL, NULL ),
( 10, 'soft_credit', 0, 0, 10, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Soft Credit{/ts}', 'Contribution', NULL, NULL ),
( 11, 'total_amount', 0, 1, 8, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Amount{/ts}', 'Membership', NULL, NULL ),
( 11, 'receive_date', 1, 1, 9, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Received{/ts}', 'Membership', NULL, NULL ),
( 11, 'payment_instrument', 0, 0, 10, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Payment Method{/ts}', 'Membership', NULL, NULL ),
- ( 11, 'check_number', 0, 0, 11, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Check Number{/ts}', 'Membership', NULL, NULL ),
+ ( 11, 'contribution_check_number', 0, 0, 11, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Check Number{/ts}', 'Membership', NULL, NULL ),
( 11, 'contribution_status_id', 1, 1, 12, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Payment Status{/ts}', 'Membership', NULL, NULL ),
( 11, 'soft_credit', 0, 0, 13, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Soft Credit{/ts}', 'Membership', NULL, NULL ),
( 11, 'soft_credit_type', 0, 0, 14, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Soft Credit Type{/ts}', 'Membership', NULL, NULL ),