From fec1b4d0429f517cda18ad36ba68bad50a313ca4 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Sun, 16 Nov 2014 16:58:48 -0500 Subject: [PATCH] CRM-15603 - Standardize case of 'Pledged but not Paid Report' --- CRM/Report/Form/Pledge/Pbnp.php | 2 +- CRM/Upgrade/Incremental/sql/2.2.7.mysql.tpl | 4 ++-- CRM/Upgrade/Incremental/sql/3.0.alpha1.mysql.tpl | 4 ++-- xml/templates/civicrm_data.tpl | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CRM/Report/Form/Pledge/Pbnp.php b/CRM/Report/Form/Pledge/Pbnp.php index e38337b9b4..d5b779964d 100644 --- a/CRM/Report/Form/Pledge/Pbnp.php +++ b/CRM/Report/Form/Pledge/Pbnp.php @@ -211,7 +211,7 @@ class CRM_Report_Form_Pledge_Pbnp extends CRM_Report_Form { } function preProcess() { - $this->assign('reportTitle', ts('Pledge But Not Paid Report')); + $this->assign('reportTitle', ts('Pledged but not Paid Report')); parent::preProcess(); } diff --git a/CRM/Upgrade/Incremental/sql/2.2.7.mysql.tpl b/CRM/Upgrade/Incremental/sql/2.2.7.mysql.tpl index 535559920e..9bc5f4d16e 100644 --- a/CRM/Upgrade/Incremental/sql/2.2.7.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/2.2.7.mysql.tpl @@ -53,7 +53,7 @@ SELECT @option_group_id_report := max(id) from civicrm_option_group wher (@option_group_id_report , {foreach from=$locales item=locale}'Event Income Report (Summary)', '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.', {/foreach} 'event/summary', 'CRM_Report_Form_Event_Summary', 19, 1, @eventCompId ), (@option_group_id_report , {foreach from=$locales item=locale}'Event Income Report (Detail)', 'Helps you to analyze the income generated by an event. The report can include details by participant type, status and payment method.', {/foreach} 'event/income', 'CRM_Report_Form_Event_Income', 20, 1, @eventCompId ), (@option_group_id_report , {foreach from=$locales item=locale}'Pledge Report', 'Pledge Report', {/foreach} 'pledge/summary', 'CRM_Report_Form_Pledge_Summary', 21, 0, @pledgeCompId ), - (@option_group_id_report , {foreach from=$locales item=locale}'Pledged But not Paid Report', 'Pledged but not Paid Report', {/foreach} 'pledge/pbnp', 'CRM_Report_Form_Pledge_Pbnp', 22, 0, @pledgeCompId ); + (@option_group_id_report , {foreach from=$locales item=locale}'Pledged but not Paid Report', 'Pledged but not Paid Report', {/foreach} 'pledge/pbnp', 'CRM_Report_Form_Pledge_Pbnp', 22, 0, @pledgeCompId ); {else} INSERT INTO civicrm_option_value @@ -80,7 +80,7 @@ SELECT @option_group_id_report := max(id) from civicrm_option_group wher (@option_group_id_report , 'Event Income Report (Summary)', 'event/summary', 'CRM_Report_Form_Event_Summary', 19, '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.', 1, @eventCompId ), (@option_group_id_report , 'Event Income Report (Detail)', 'event/income', 'CRM_Report_Form_Event_Income', 20, 'Helps you to analyze the income generated by an event. The report can include details by participant type, status and payment method.', 1, @eventCompId ), (@option_group_id_report , 'Pledge Report', 'pledge/summary', 'CRM_Report_Form_Pledge_Summary', 21, 'Pledge Report', 0, @pledgeCompId ), - (@option_group_id_report , 'Pledged But not Paid Report', 'pledge/pbnp', 'CRM_Report_Form_Pledge_Pbnp', 22, 'Pledged but not Paid Report', 0, @pledgeCompId ); + (@option_group_id_report , 'Pledged but not Paid Report', 'pledge/pbnp', 'CRM_Report_Form_Pledge_Pbnp', 22, 'Pledged but not Paid Report', 0, @pledgeCompId ); {/if} -- civicrm_report_instance diff --git a/CRM/Upgrade/Incremental/sql/3.0.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/3.0.alpha1.mysql.tpl index 4986091a38..34162b9110 100644 --- a/CRM/Upgrade/Incremental/sql/3.0.alpha1.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/3.0.alpha1.mysql.tpl @@ -438,7 +438,7 @@ ( 184, @domain_id, 'civicrm/report/instance/19&reset=1', '{ts escape="sql"}Donation Summary Report (Household){/ts}', '{literal}Donation Summary Report (Household){/literal}', 'access CiviContribute', '', 163, '1', NULL, 21 ), ( 185, @domain_id, 'civicrm/report/instance/20&reset=1', '{ts escape="sql"}Top Donors Report{/ts}', 'Top Donors Report', 'access CiviContribute', '', 163, '1', NULL, 22 ), ( 186, @domain_id, 'civicrm/report/instance/21&reset=1', '{ts escape="sql"}Pledge Summary Report{/ts}', 'Pledge Summary Report', 'access CiviPledge', '', 163, '1', NULL, 23 ), - ( 187, @domain_id, 'civicrm/report/instance/22&reset=1', '{ts escape="sql"}Pledged But not Paid Report{/ts}', 'Pledged But not Paid Report', 'access CiviPledge', '', 163, '1', NULL, 24 ); + ( 187, @domain_id, 'civicrm/report/instance/22&reset=1', '{ts escape="sql"}Pledged but not Paid Report{/ts}', 'Pledged but not Paid Report', 'access CiviPledge', '', 163, '1', NULL, 24 ); -- End navigation @@ -466,7 +466,7 @@ ('{ts escape="sql"}Donation Summary Report (Household){/ts}', 'contribute/householdSummary', 'Provides a detailed report for Contributions made by contributors(Or Household itself) who are having a relationship with household (For ex a Contributor is Head of Household for some household or is a member of.)', 'access CiviContribute', '{literal}a:20:{s:6:"fields"#a:5:{s:14:"household_name"#s:1:"1"#s:12:"display_name"#s:1:"1"#s:12:"total_amount"#s:1:"1"#s:22:"contribution_status_id"#s:1:"1"#s:12:"receive_date"#s:1:"1"#}s:17:"household_name_op"#s:3:"has"#s:20:"household_name_value"#s:0:""#s:23:"relationship_type_id_op"#s:2:"eq"#s:26:"relationship_type_id_value"#s:5:"6_b_a"#s:21:"receive_date_relative"#s:1:"0"#s:17:"receive_date_from"#a:3:{s:1:"M"#s:0:""#s:1:"d"#s:0:""#s:1:"Y"#s:0:""#}s:15:"receive_date_to"#a:3:{s:1:"M"#s:0:""#s:1:"d"#s:0:""#s:1:"Y"#s:0:""#}s:16:"total_amount_min"#s:0:""#s:16:"total_amount_max"#s:0:""#s:15:"total_amount_op"#s:3:"lte"#s:18:"total_amount_value"#s:0:""#s:25:"contribution_status_id_op"#s:2:"in"#s:28:"contribution_status_id_value"#a:1:{i:0#s:1:"1"#}s:11:"description"#s:213:"Provides a detailed report for Contributions made by contributors(Or Household itself) who are having a relationship with household (For ex a Contributor is Head of Household for some household or is a member of.)"#s:13:"email_subject"#s:0:""#s:8:"email_to"#s:0:""#s:8:"email_cc"#s:0:""#s:10:"permission"#s:21:"access CiviContribute"#s:6:"groups"#s:0:""#}{/literal}'), ('{ts escape="sql"}Top Donors Report{/ts}', 'contribute/topDonor', '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).', 'access CiviContribute', '{literal}a:20:{s:6:"fields"#a:2:{s:12:"display_name"#s:1:"1"#s:12:"total_amount"#s:1:"1"#}s:21:"receive_date_relative"#s:9:"this.year"#s:17:"receive_date_from"#a:3:{s:1:"M"#s:0:""#s:1:"d"#s:0:""#s:1:"Y"#s:0:""#}s:15:"receive_date_to"#a:3:{s:1:"M"#s:0:""#s:1:"d"#s:0:""#s:1:"Y"#s:0:""#}s:15:"total_range_min"#s:0:""#s:15:"total_range_max"#s:0:""#s:14:"total_range_op"#s:2:"eq"#s:17:"total_range_value"#s:0:""#s:23:"contribution_type_id_op"#s:2:"in"#s:26:"contribution_type_id_value"#a:0:{}s:25:"contribution_status_id_op"#s:2:"in"#s:28:"contribution_status_id_value"#a:1:{i:0#s:1:"1"#}s:6:"gid_op"#s:2:"in"#s:9:"gid_value"#a:0:{}s:11:"description"#s:148:"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)."#s:13:"email_subject"#s:0:""#s:8:"email_to"#s:0:""#s:8:"email_cc"#s:0:""#s:10:"permission"#s:21:"access CiviContribute"#s:6:"groups"#s:0:""#}{/literal}'), ('{ts escape="sql"}Pledge Summary Report{/ts}', 'pledge/summary', 'Updates you with your Pledge Summary (if any) such as your pledge status, next payment date, amount, payment due, total amount paid etc.', 'access CiviPledge', '{literal}a:24:{s:6:"fields"#a:4:{s:12:"display_name"#s:1:"1"#s:10:"country_id"#s:1:"1"#s:6:"amount"#s:1:"1"#s:9:"status_id"#s:1:"1"#}s:12:"sort_name_op"#s:3:"has"#s:15:"sort_name_value"#s:0:""#s:6:"id_min"#s:0:""#s:6:"id_max"#s:0:""#s:5:"id_op"#s:3:"lte"#s:8:"id_value"#s:0:""#s:27:"pledge_create_date_relative"#s:1:"0"#s:23:"pledge_create_date_from"#a:3:{s:1:"M"#s:0:""#s:1:"d"#s:0:""#s:1:"Y"#s:0:""#}s:21:"pledge_create_date_to"#a:3:{s:1:"M"#s:0:""#s:1:"d"#s:0:""#s:1:"Y"#s:0:""#}s:17:"pledge_amount_min"#s:0:""#s:17:"pledge_amount_max"#s:0:""#s:16:"pledge_amount_op"#s:3:"lte"#s:19:"pledge_amount_value"#s:0:""#s:6:"sid_op"#s:2:"in"#s:9:"sid_value"#a:0:{}s:6:"gid_op"#s:2:"in"#s:9:"gid_value"#a:0:{}s:11:"description"#s:136:"Updates you with your Pledge Summary (if any) such as your pledge status, next payment date, amount, payment due, total amount paid etc."#s:13:"email_subject"#s:0:""#s:8:"email_to"#s:0:""#s:8:"email_cc"#s:0:""#s:10:"permission"#s:17:"access CiviPledge"#s:6:"groups"#s:0:""#}{/literal}'), - ('{ts escape="sql"}Pledged But not Paid Report{/ts}', 'pledge/pbnp', 'Pledged but not Paid Report', 'access CiviPledge', '{literal}a:14:{s:6:"fields"#a:6:{s:12:"display_name"#s:1:"1"#s:18:"pledge_create_date"#s:1:"1"#s:6:"amount"#s:1:"1"#s:14:"scheduled_date"#s:1:"1"#s:10:"country_id"#s:1:"1"#s:5:"email"#s:1:"1"#}s:27:"pledge_create_date_relative"#s:1:"0"#s:23:"pledge_create_date_from"#a:3:{s:1:"M"#s:0:""#s:1:"d"#s:0:""#s:1:"Y"#s:0:""#}s:21:"pledge_create_date_to"#a:3:{s:1:"M"#s:0:""#s:1:"d"#s:0:""#s:1:"Y"#s:0:""#}s:23:"contribution_type_id_op"#s:2:"in"#s:26:"contribution_type_id_value"#a:0:{}s:6:"gid_op"#s:2:"in"#s:9:"gid_value"#a:0:{}s:11:"description"#s:27:"Pledged but not Paid Report"#s:13:"email_subject"#s:0:""#s:8:"email_to"#s:0:""#s:8:"email_cc"#s:0:""#s:10:"permission"#s:17:"access CiviPledge"#s:6:"groups"#s:0:""#}{/literal}'); + ('{ts escape="sql"}Pledged but not Paid Report{/ts}', 'pledge/pbnp', 'Pledged but not Paid Report', 'access CiviPledge', '{literal}a:14:{s:6:"fields"#a:6:{s:12:"display_name"#s:1:"1"#s:18:"pledge_create_date"#s:1:"1"#s:6:"amount"#s:1:"1"#s:14:"scheduled_date"#s:1:"1"#s:10:"country_id"#s:1:"1"#s:5:"email"#s:1:"1"#}s:27:"pledge_create_date_relative"#s:1:"0"#s:23:"pledge_create_date_from"#a:3:{s:1:"M"#s:0:""#s:1:"d"#s:0:""#s:1:"Y"#s:0:""#}s:21:"pledge_create_date_to"#a:3:{s:1:"M"#s:0:""#s:1:"d"#s:0:""#s:1:"Y"#s:0:""#}s:23:"contribution_type_id_op"#s:2:"in"#s:26:"contribution_type_id_value"#a:0:{}s:6:"gid_op"#s:2:"in"#s:9:"gid_value"#a:0:{}s:11:"description"#s:27:"Pledged but not Paid Report"#s:13:"email_subject"#s:0:""#s:8:"email_to"#s:0:""#s:8:"email_cc"#s:0:""#s:10:"permission"#s:17:"access CiviPledge"#s:6:"groups"#s:0:""#}{/literal}'); -- CRM-4114 diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl index 7b7a16013d..7591f62c7d 100644 --- a/xml/templates/civicrm_data.tpl +++ b/xml/templates/civicrm_data.tpl @@ -593,7 +593,7 @@ VALUES (@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), (@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), (@option_group_id_report , '{ts escape="sql"}Pledge Report{/ts}', 'pledge/detail', 'CRM_Report_Form_Pledge_Detail', NULL, 0, NULL, 21, '{ts escape="sql"}Pledge Report{/ts}', 0, 0, 1, @pledgeCompId, 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), + (@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), (@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), (@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), (@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), -- 2.25.1