diff --git a/force-app/main/default/classes/RD2_StatusAutomationSettings_TEST.cls b/force-app/main/default/classes/RD2_StatusAutomationSettings_TEST.cls
index 85725eb3f1b..cc9a1319fee 100644
--- a/force-app/main/default/classes/RD2_StatusAutomationSettings_TEST.cls
+++ b/force-app/main/default/classes/RD2_StatusAutomationSettings_TEST.cls
@@ -56,6 +56,13 @@ private class RD2_StatusAutomationSettings_TEST {
)
);
+ String translatedLapsedStatus =
+ UTIL_Describe.getTranslatedPicklistLabel(npe03__Recurring_Donation__c.SObjectType,
+ npe03__Recurring_Donation__c.Status__c, RD2_Constants.STATUS_LAPSED);
+ String translatedClosedStatus =
+ UTIL_Describe.getTranslatedPicklistLabel(npe03__Recurring_Donation__c.SObjectType,
+ npe03__Recurring_Donation__c.Status__c, RD2_Constants.STATUS_CLOSED);
+
RD2_StatusAutomationView view = RD2_StatusAutomationSettings_CTRL.getAutomationSettings();
System.assertEquals(true, view.rd2Enabled, 'RD2 should be enabled');
@@ -63,13 +70,13 @@ private class RD2_StatusAutomationSettings_TEST {
'The view state should retrieve the correct number of days for Lapsed');
System.assertEquals(DAYS_FOR_CLOSED, view.numberOfDaysForClosed,
'The view state should retrieve the correct number of days for Closed');
- System.assertEquals(RD2_Constants.STATUS_LAPSED, view.lapsedStatus,
+ System.assertEquals(translatedLapsedStatus, view.lapsedStatus,
'The view state should retrieve the correct Automation Lapsed Status');
- System.assertEquals(RD2_Constants.STATUS_CLOSED, view.closedStatus,
+ System.assertEquals(translatedClosedStatus, view.closedStatus,
'The view state should retrieve the correct Automation Closed Status');
- System.assertEquals( RD2_Constants.STATUS_LAPSED, view.lapsedStatusOption[0].label,
+ System.assertEquals(translatedLapsedStatus, view.lapsedStatusOption[0].label,
'The Lapsed status picklist option should include Lapsed Status');
- System.assertEquals(RD2_Constants.STATUS_CLOSED, view.closedStatusOption[0].label,
+ System.assertEquals(translatedClosedStatus, view.closedStatusOption[0].label,
'The Closed status picklist option should include Closed Status');
}
diff --git a/force-app/main/default/translations/de.translation-meta.xml b/force-app/main/default/translations/de.translation-meta.xml
index da852c01f1b..e7d53550269 100644
--- a/force-app/main/default/translations/de.translation-meta.xml
+++ b/force-app/main/default/translations/de.translation-meta.xml
@@ -6458,6 +6458,18 @@ Wenn Sie es vorziehen, können Sie "Spendeneintrag" deaktivieren und s
pmtWrittenOffPaymentDateRequired
+
+ potentialDuplicatesFoundNone
+
+
+
+ potentialDuplicatesFoundOne
+
+
+
+ potentialDuplicatesFoundMultiple
+
+
psACH
@@ -8359,6 +8371,10 @@ Hinweis: Die Registerkarte "NPSP-Einstellungen" ist in der Nonprofit S
updateRecurringDonation
+
+ viewDuplicates
+
+
Contacts_Only
@@ -8368,119 +8384,119 @@ Hinweis: Die Registerkarte "NPSP-Einstellungen" ist in der Nonprofit S
- NPSP_Resources
-
-
-
- Contact_Merge
-
+ Batch_Data_Entry
+
Batch_Gift_Entry
- NPSP_Settings
-
+ Contact_Merge
+
- Batch_Data_Entry
-
+ GE_Gift_Entry
+
GetStarted
-
- GE_Gift_Entry
-
-
GetStartedEndUser
+
+ NPSP_Resources
+
+
+
+ NPSP_Settings
+
+
Nonprofit_CRM
- New_Campaign
-
-
-
- npe03__Recurring_Donation__c.Pause
-
+ Account.New_Address
+
Account.New_Affiliation
- Account.New_Address
-
+ Account.Quick_Household_Update
+
- New_Recurring_Donation
-
+ Account.Quick_Organization_Update
+
- npe03__Recurring_Donation__c.New_Opportunity
-
+ Address__c.Update_Address
+
+
+
+ Contact.New_Affiliation
+
Contact.New_Recurring_Donation
- npe01__OppPayment__c.Refund
-
+ Contact.New_Relationship
+
- npe03__Recurring_Donation__c.Quick_Update
+ Contact.Quick_Update
- npo02__Household__c.Update_Household
-
-
-
- Address__c.Update_Address
-
+ New_Campaign
+
- npe03__Recurring_Donation__c.Close_Recurring_Donation
-
+ New_Recurring_Donation
+
- Contact.New_Affiliation
-
+ Opportunity.New_Payment
+
Opportunity.Quick_Update
- Contact.Quick_Update
+ npe01__OppPayment__c.Quick_Update
- Opportunity.New_Payment
-
+ npe01__OppPayment__c.Refund
+
- Contact.New_Relationship
-
+ npe03__Recurring_Donation__c.Close_Recurring_Donation
+
- npe01__OppPayment__c.Quick_Update
-
+ npe03__Recurring_Donation__c.New_Opportunity
+
- Account.Quick_Household_Update
-
+ npe03__Recurring_Donation__c.Pause
+
- Account.Quick_Organization_Update
+ npe03__Recurring_Donation__c.Quick_Update
+
+ npo02__Household__c.Update_Household
+
+
diff --git a/force-app/main/default/translations/en_GB.translation-meta.xml b/force-app/main/default/translations/en_GB.translation-meta.xml
index f8e5a53f583..f74a1183a71 100644
--- a/force-app/main/default/translations/en_GB.translation-meta.xml
+++ b/force-app/main/default/translations/en_GB.translation-meta.xml
@@ -6458,6 +6458,18 @@ If preferred, you can disable Gift Entry and instead use older Batch Gift Entry
pmtWrittenOffPaymentDateRequired
+
+ potentialDuplicatesFoundNone
+
+
+
+ potentialDuplicatesFoundOne
+
+
+
+ potentialDuplicatesFoundMultiple
+
+
psACH
@@ -8359,6 +8371,10 @@ Note: The NPSP Settings tab is visible in the Nonprofit Success Pack application
updateRecurringDonation
+
+ viewDuplicates
+
+
Contacts_Only
@@ -8368,119 +8384,119 @@ Note: The NPSP Settings tab is visible in the Nonprofit Success Pack application
- NPSP_Resources
-
-
-
- Contact_Merge
-
+ Batch_Data_Entry
+
Batch_Gift_Entry
- NPSP_Settings
-
+ Contact_Merge
+
- Batch_Data_Entry
-
+ GE_Gift_Entry
+
GetStarted
-
- GE_Gift_Entry
-
-
GetStartedEndUser
+
+ NPSP_Resources
+
+
+
+ NPSP_Settings
+
+
Nonprofit_CRM
- New_Campaign
-
-
-
- npe03__Recurring_Donation__c.Pause
-
+ Account.New_Address
+
Account.New_Affiliation
- Account.New_Address
-
+ Account.Quick_Household_Update
+
- New_Recurring_Donation
-
+ Account.Quick_Organization_Update
+
- npe03__Recurring_Donation__c.New_Opportunity
-
+ Address__c.Update_Address
+
+
+
+ Contact.New_Affiliation
+
Contact.New_Recurring_Donation
- npe01__OppPayment__c.Refund
-
+ Contact.New_Relationship
+
- npe03__Recurring_Donation__c.Quick_Update
+ Contact.Quick_Update
- npo02__Household__c.Update_Household
-
-
-
- Address__c.Update_Address
-
+ New_Campaign
+
- npe03__Recurring_Donation__c.Close_Recurring_Donation
-
+ New_Recurring_Donation
+
- Contact.New_Affiliation
-
+ Opportunity.New_Payment
+
Opportunity.Quick_Update
- Contact.Quick_Update
+ npe01__OppPayment__c.Quick_Update
- Opportunity.New_Payment
-
+ npe01__OppPayment__c.Refund
+
- Contact.New_Relationship
-
+ npe03__Recurring_Donation__c.Close_Recurring_Donation
+
- npe01__OppPayment__c.Quick_Update
-
+ npe03__Recurring_Donation__c.New_Opportunity
+
- Account.Quick_Household_Update
-
+ npe03__Recurring_Donation__c.Pause
+
- Account.Quick_Organization_Update
+ npe03__Recurring_Donation__c.Quick_Update
+
+ npo02__Household__c.Update_Household
+
+
diff --git a/force-app/main/default/translations/es.translation-meta.xml b/force-app/main/default/translations/es.translation-meta.xml
index 9e0c3dfd321..087eac371a0 100644
--- a/force-app/main/default/translations/es.translation-meta.xml
+++ b/force-app/main/default/translations/es.translation-meta.xml
@@ -6452,6 +6452,18 @@ Si lo prefiere, puede desactivar Entrada de regalos y utilizar la herramienta En
pmtWrittenOffPaymentDateRequired
+
+ potentialDuplicatesFoundNone
+
+
+
+ potentialDuplicatesFoundOne
+
+
+
+ potentialDuplicatesFoundMultiple
+
+
psACH
@@ -8349,6 +8361,10 @@ Nota: La ficha Configuración de NPSP es visible en la aplicación Nonprofit Suc
updateRecurringDonation
+
+ viewDuplicates
+
+
Contacts_Only
@@ -8358,119 +8374,119 @@ Nota: La ficha Configuración de NPSP es visible en la aplicación Nonprofit Suc
- NPSP_Resources
-
-
-
- Contact_Merge
-
+ Batch_Data_Entry
+
Batch_Gift_Entry
- NPSP_Settings
-
+ Contact_Merge
+
- Batch_Data_Entry
-
+ GE_Gift_Entry
+
GetStarted
-
- GE_Gift_Entry
-
-
GetStartedEndUser
+
+ NPSP_Resources
+
+
+
+ NPSP_Settings
+
+
Nonprofit_CRM
- New_Campaign
-
-
-
- npe03__Recurring_Donation__c.Pause
-
+ Account.New_Address
+
Account.New_Affiliation
- Account.New_Address
-
+ Account.Quick_Household_Update
+
- New_Recurring_Donation
-
+ Account.Quick_Organization_Update
+
- npe03__Recurring_Donation__c.New_Opportunity
-
+ Address__c.Update_Address
+
+
+
+ Contact.New_Affiliation
+
Contact.New_Recurring_Donation
- npe01__OppPayment__c.Refund
-
+ Contact.New_Relationship
+
- npe03__Recurring_Donation__c.Quick_Update
+ Contact.Quick_Update
- npo02__Household__c.Update_Household
-
-
-
- Address__c.Update_Address
-
+ New_Campaign
+
- npe03__Recurring_Donation__c.Close_Recurring_Donation
-
+ New_Recurring_Donation
+
- Contact.New_Affiliation
-
+ Opportunity.New_Payment
+
Opportunity.Quick_Update
- Contact.Quick_Update
+ npe01__OppPayment__c.Quick_Update
- Opportunity.New_Payment
-
+ npe01__OppPayment__c.Refund
+
- Contact.New_Relationship
-
+ npe03__Recurring_Donation__c.Close_Recurring_Donation
+
- npe01__OppPayment__c.Quick_Update
-
+ npe03__Recurring_Donation__c.New_Opportunity
+
- Account.Quick_Household_Update
-
+ npe03__Recurring_Donation__c.Pause
+
- Account.Quick_Organization_Update
+ npe03__Recurring_Donation__c.Quick_Update
+
+ npo02__Household__c.Update_Household
+
+
diff --git a/force-app/main/default/translations/fr.translation-meta.xml b/force-app/main/default/translations/fr.translation-meta.xml
index 9e8dc4915e5..b899306f588 100644
--- a/force-app/main/default/translations/fr.translation-meta.xml
+++ b/force-app/main/default/translations/fr.translation-meta.xml
@@ -6459,6 +6459,18 @@ Si vous préférez, vous pouvez désactiver la Saisie de dons et utiliser à la
pmtWrittenOffPaymentDateRequired
+
+ potentialDuplicatesFoundNone
+
+
+
+ potentialDuplicatesFoundOne
+
+
+
+ potentialDuplicatesFoundMultiple
+
+
psACH
@@ -8360,6 +8372,10 @@ Remarque : l’onglet de paramètres NPSP est visible dans l’application NPSP
updateRecurringDonation
+
+ viewDuplicates
+
+
Contacts_Only
@@ -8369,119 +8385,119 @@ Remarque : l’onglet de paramètres NPSP est visible dans l’application NPSP
- NPSP_Resources
-
-
-
- Contact_Merge
-
+ Batch_Data_Entry
+
Batch_Gift_Entry
- NPSP_Settings
-
+ Contact_Merge
+
- Batch_Data_Entry
-
+ GE_Gift_Entry
+
GetStarted
-
- GE_Gift_Entry
-
-
GetStartedEndUser
+
+ NPSP_Resources
+
+
+
+ NPSP_Settings
+
+
Nonprofit_CRM
- New_Campaign
-
-
-
- npe03__Recurring_Donation__c.Pause
-
+ Account.New_Address
+
Account.New_Affiliation
- Account.New_Address
-
+ Account.Quick_Household_Update
+
- New_Recurring_Donation
-
+ Account.Quick_Organization_Update
+
- npe03__Recurring_Donation__c.New_Opportunity
-
+ Address__c.Update_Address
+
+
+
+ Contact.New_Affiliation
+
Contact.New_Recurring_Donation
- npe01__OppPayment__c.Refund
-
+ Contact.New_Relationship
+
- npe03__Recurring_Donation__c.Quick_Update
+ Contact.Quick_Update
- npo02__Household__c.Update_Household
-
-
-
- Address__c.Update_Address
-
+ New_Campaign
+
- npe03__Recurring_Donation__c.Close_Recurring_Donation
-
+ New_Recurring_Donation
+
- Contact.New_Affiliation
-
+ Opportunity.New_Payment
+
Opportunity.Quick_Update
- Contact.Quick_Update
+ npe01__OppPayment__c.Quick_Update
- Opportunity.New_Payment
-
+ npe01__OppPayment__c.Refund
+
- Contact.New_Relationship
-
+ npe03__Recurring_Donation__c.Close_Recurring_Donation
+
- npe01__OppPayment__c.Quick_Update
-
+ npe03__Recurring_Donation__c.New_Opportunity
+
- Account.Quick_Household_Update
-
+ npe03__Recurring_Donation__c.Pause
+
- Account.Quick_Organization_Update
+ npe03__Recurring_Donation__c.Quick_Update
+
+ npo02__Household__c.Update_Household
+
+
diff --git a/force-app/main/default/translations/ja.translation-meta.xml b/force-app/main/default/translations/ja.translation-meta.xml
index 3e620ac5967..92774e5c958 100644
--- a/force-app/main/default/translations/ja.translation-meta.xml
+++ b/force-app/main/default/translations/ja.translation-meta.xml
@@ -6449,6 +6449,18 @@
pmtWrittenOffPaymentDateRequired
+
+ potentialDuplicatesFoundNone
+
+
+
+ potentialDuplicatesFoundOne
+
+
+
+ potentialDuplicatesFoundMultiple
+
+
psACH
@@ -8349,6 +8361,10 @@
updateRecurringDonation
+
+ viewDuplicates
+
+
Contacts_Only
@@ -8358,119 +8374,119 @@
- NPSP_Resources
-
-
-
- Contact_Merge
-
+ Batch_Data_Entry
+
Batch_Gift_Entry
- NPSP_Settings
-
+ Contact_Merge
+
- Batch_Data_Entry
-
+ GE_Gift_Entry
+
GetStarted
-
- GE_Gift_Entry
-
-
GetStartedEndUser
+
+ NPSP_Resources
+
+
+
+ NPSP_Settings
+
+
Nonprofit_CRM
- New_Campaign
-
-
-
- npe03__Recurring_Donation__c.Pause
-
+ Account.New_Address
+
Account.New_Affiliation
- Account.New_Address
-
+ Account.Quick_Household_Update
+
- New_Recurring_Donation
-
+ Account.Quick_Organization_Update
+
- npe03__Recurring_Donation__c.New_Opportunity
-
+ Address__c.Update_Address
+
+
+
+ Contact.New_Affiliation
+
Contact.New_Recurring_Donation
- npe01__OppPayment__c.Refund
-
+ Contact.New_Relationship
+
- npe03__Recurring_Donation__c.Quick_Update
+ Contact.Quick_Update
- npo02__Household__c.Update_Household
-
-
-
- Address__c.Update_Address
-
+ New_Campaign
+
- npe03__Recurring_Donation__c.Close_Recurring_Donation
-
+ New_Recurring_Donation
+
- Contact.New_Affiliation
-
+ Opportunity.New_Payment
+
Opportunity.Quick_Update
- Contact.Quick_Update
+ npe01__OppPayment__c.Quick_Update
- Opportunity.New_Payment
-
+ npe01__OppPayment__c.Refund
+
- Contact.New_Relationship
-
+ npe03__Recurring_Donation__c.Close_Recurring_Donation
+
- npe01__OppPayment__c.Quick_Update
-
+ npe03__Recurring_Donation__c.New_Opportunity
+
- Account.Quick_Household_Update
-
+ npe03__Recurring_Donation__c.Pause
+
- Account.Quick_Organization_Update
+ npe03__Recurring_Donation__c.Quick_Update
+
+ npo02__Household__c.Update_Household
+
+
diff --git a/force-app/main/default/translations/nl_NL.translation-meta.xml b/force-app/main/default/translations/nl_NL.translation-meta.xml
index 4b6a8f87f40..4c672fb27de 100644
--- a/force-app/main/default/translations/nl_NL.translation-meta.xml
+++ b/force-app/main/default/translations/nl_NL.translation-meta.xml
@@ -6457,6 +6457,18 @@ Indien dit de voorkeur heeft, kunt u Invoer van giften uitschakelen en in plaats
pmtWrittenOffPaymentDateRequired
+
+ potentialDuplicatesFoundNone
+
+
+
+ potentialDuplicatesFoundOne
+
+
+
+ potentialDuplicatesFoundMultiple
+
+
psACH
@@ -8152,7 +8164,7 @@ Opmerking: Het tabblad NPSP-instellingen is zichtbaar in de toepassing Nonprofit
stgNavSystem
-
+
stgNavTriggerConfig
@@ -8358,6 +8370,10 @@ Opmerking: Het tabblad NPSP-instellingen is zichtbaar in de toepassing Nonprofit
updateRecurringDonation
+
+ viewDuplicates
+
+
Contacts_Only
@@ -8367,119 +8383,119 @@ Opmerking: Het tabblad NPSP-instellingen is zichtbaar in de toepassing Nonprofit
- NPSP_Resources
-
-
-
- Contact_Merge
-
+ Batch_Data_Entry
+
Batch_Gift_Entry
- NPSP_Settings
-
+ Contact_Merge
+
- Batch_Data_Entry
-
+ GE_Gift_Entry
+
GetStarted
-
- GE_Gift_Entry
-
-
GetStartedEndUser
+
+ NPSP_Resources
+
+
+
+ NPSP_Settings
+
+
Nonprofit_CRM
- New_Campaign
-
-
-
- npe03__Recurring_Donation__c.Pause
-
+ Account.New_Address
+
Account.New_Affiliation
- Account.New_Address
-
+ Account.Quick_Household_Update
+
- New_Recurring_Donation
-
+ Account.Quick_Organization_Update
+
- npe03__Recurring_Donation__c.New_Opportunity
-
+ Address__c.Update_Address
+
+
+
+ Contact.New_Affiliation
+
Contact.New_Recurring_Donation
- npe01__OppPayment__c.Refund
-
+ Contact.New_Relationship
+
- npe03__Recurring_Donation__c.Quick_Update
+ Contact.Quick_Update
- npo02__Household__c.Update_Household
-
-
-
- Address__c.Update_Address
-
+ New_Campaign
+
- npe03__Recurring_Donation__c.Close_Recurring_Donation
-
+ New_Recurring_Donation
+
- Contact.New_Affiliation
-
+ Opportunity.New_Payment
+
Opportunity.Quick_Update
- Contact.Quick_Update
+ npe01__OppPayment__c.Quick_Update
- Opportunity.New_Payment
-
+ npe01__OppPayment__c.Refund
+
- Contact.New_Relationship
-
+ npe03__Recurring_Donation__c.Close_Recurring_Donation
+
- npe01__OppPayment__c.Quick_Update
-
+ npe03__Recurring_Donation__c.New_Opportunity
+
- Account.Quick_Household_Update
-
+ npe03__Recurring_Donation__c.Pause
+
- Account.Quick_Organization_Update
+ npe03__Recurring_Donation__c.Quick_Update
+
+ npo02__Household__c.Update_Household
+
+
diff --git a/force-app/main/default/translations/pt_BR.translation-meta.xml b/force-app/main/default/translations/pt_BR.translation-meta.xml
index 955f6552c41..55175a89421 100644
--- a/force-app/main/default/translations/pt_BR.translation-meta.xml
+++ b/force-app/main/default/translations/pt_BR.translation-meta.xml
@@ -6458,6 +6458,18 @@ Se preferir, você pode desativar a Entrada de doações e, em vez disso, usar a
pmtWrittenOffPaymentDateRequired
+
+ potentialDuplicatesFoundNone
+
+
+
+ potentialDuplicatesFoundOne
+
+
+
+ potentialDuplicatesFoundMultiple
+
+
psACH
@@ -8359,6 +8371,10 @@ Nota: a guia Configurações do NPSP está visível no aplicativo Pacote de suce
updateRecurringDonation
+
+ viewDuplicates
+
+
Contacts_Only
@@ -8368,119 +8384,119 @@ Nota: a guia Configurações do NPSP está visível no aplicativo Pacote de suce
- NPSP_Resources
-
-
-
- Contact_Merge
-
+ Batch_Data_Entry
+
Batch_Gift_Entry
- NPSP_Settings
-
+ Contact_Merge
+
- Batch_Data_Entry
-
+ GE_Gift_Entry
+
GetStarted
-
- GE_Gift_Entry
-
-
GetStartedEndUser
+
+ NPSP_Resources
+
+
+
+ NPSP_Settings
+
+
Nonprofit_CRM
- New_Campaign
-
-
-
- npe03__Recurring_Donation__c.Pause
-
+ Account.New_Address
+
Account.New_Affiliation
- Account.New_Address
-
+ Account.Quick_Household_Update
+
- New_Recurring_Donation
-
+ Account.Quick_Organization_Update
+
- npe03__Recurring_Donation__c.New_Opportunity
-
+ Address__c.Update_Address
+
+
+
+ Contact.New_Affiliation
+
Contact.New_Recurring_Donation
- npe01__OppPayment__c.Refund
-
+ Contact.New_Relationship
+
- npe03__Recurring_Donation__c.Quick_Update
+ Contact.Quick_Update
- npo02__Household__c.Update_Household
-
-
-
- Address__c.Update_Address
-
+ New_Campaign
+
- npe03__Recurring_Donation__c.Close_Recurring_Donation
-
+ New_Recurring_Donation
+
- Contact.New_Affiliation
-
+ Opportunity.New_Payment
+
Opportunity.Quick_Update
- Contact.Quick_Update
+ npe01__OppPayment__c.Quick_Update
- Opportunity.New_Payment
-
+ npe01__OppPayment__c.Refund
+
- Contact.New_Relationship
-
+ npe03__Recurring_Donation__c.Close_Recurring_Donation
+
- npe01__OppPayment__c.Quick_Update
-
+ npe03__Recurring_Donation__c.New_Opportunity
+
- Account.Quick_Household_Update
-
+ npe03__Recurring_Donation__c.Pause
+
- Account.Quick_Organization_Update
+ npe03__Recurring_Donation__c.Quick_Update
+
+ npo02__Household__c.Update_Household
+
+