From 59d867b91d804fbe68fe61f2325d3c20f2df9886 Mon Sep 17 00:00:00 2001 From: "Donald A. Lobo" Date: Wed, 6 Mar 2013 09:15:05 -0800 Subject: [PATCH] fix CRM-12034 --- templates/CRM/Contribute/Form/ContributionPage/Settings.hlp | 2 +- templates/CRM/Contribute/Import/Form/UploadFile.hlp | 2 +- templates/CRM/Event/Form/ManageEvent/Registration.hlp | 2 +- templates/CRM/Event/Import/Form/UploadFile.hlp | 2 +- templates/CRM/Member/Import/Form/UploadFile.hlp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp b/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp index 9dde323a16..2a82313868 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp +++ b/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp @@ -71,7 +71,7 @@ {ts}Organization{/ts} {/htxt} {htxt id="id-is_organization"} -

{ts}When enabled, this feature allows users to identify an organization as the donor or member. Logged in users will be given a choice of selecting from a list of organizations that they have a permissioned relationship with OR entering a new organization. Anonymous users are prompted to enter the organization name. If a matching organization is found using your site's configured strict duplicate matching rules for Organizations, the contribution or membership will be linked to that organization. Otherwise a new organization contact record is created.{/ts}

+

{ts}When enabled, this feature allows users to identify an organization as the donor or member. Logged in users will be given a choice of selecting from a list of organizations that they have a permissioned relationship with OR entering a new organization. Anonymous users are prompted to enter the organization name. If a matching organization is found using your site's configured unsupervised duplicate matching rules for Organizations, the contribution or membership will be linked to that organization. Otherwise a new organization contact record is created.{/ts}

{capture assign="profileURL"}{crmURL p='civicrm/admin/uf/group' q='reset=1'}{/capture}

{ts 1=$profileURL}The organization data collected from users is controlled by the Organization Profile selected below. You can use the default "On Behalf Of Organization" profile, or any other profile with type 'Contact' and/or 'Organization' (Administer > Customize > CiviCRM Profile). The profile must include Organization Name and Email Address.{/ts}

{/htxt} diff --git a/templates/CRM/Contribute/Import/Form/UploadFile.hlp b/templates/CRM/Contribute/Import/Form/UploadFile.hlp index 4647a38339..469d9ae8c5 100644 --- a/templates/CRM/Contribute/Import/Form/UploadFile.hlp +++ b/templates/CRM/Contribute/Import/Form/UploadFile.hlp @@ -33,7 +33,7 @@

{ts}Matching Contributions to Contributors{/ts}

{ts}Contribution import files must contain data needed to match the contribution to the contributor. This 'matching' can be handled in several different ways:{/ts}

diff --git a/templates/CRM/Event/Form/ManageEvent/Registration.hlp b/templates/CRM/Event/Form/ManageEvent/Registration.hlp index c652afad2c..c8f8e5b045 100644 --- a/templates/CRM/Event/Form/ManageEvent/Registration.hlp +++ b/templates/CRM/Event/Form/ManageEvent/Registration.hlp @@ -72,7 +72,7 @@ {/htxt} {htxt id="id-allow_same_email"}

{ts}Check this box to allow a user to register multiple participants using the same email address. If you want additional participants to be registered without requiring an email address to be entered for each person - check the "Register multiple participants" option, AND include a profile in this registration form which includes First Name and Last Name fields.{/ts}

-

{ts}You will also need to update the default strict duplicate contact matching rule for Individuals to include First Name and Last Name fields (Contacts » Find and Merge Duplicate Contacts).{/ts}

+

{ts}You will also need to set the default supervised duplicate contact matching rule for Individuals to one that includes First Name and Last Name fields (Contacts » Find and Merge Duplicate Contacts).{/ts}

{/htxt} {htxt id="id-requires_approval-title"} diff --git a/templates/CRM/Event/Import/Form/UploadFile.hlp b/templates/CRM/Event/Import/Form/UploadFile.hlp index 3c61f7341e..892c542217 100644 --- a/templates/CRM/Event/Import/Form/UploadFile.hlp +++ b/templates/CRM/Event/Import/Form/UploadFile.hlp @@ -40,7 +40,7 @@

{ts}Matching Participant Data to Contacts{/ts}

{ts}Participant import files must contain data needed to match the participant to a contact record in your CiviCRM database. This 'matching' can be handled in several different ways:{/ts}

diff --git a/templates/CRM/Member/Import/Form/UploadFile.hlp b/templates/CRM/Member/Import/Form/UploadFile.hlp index 9285dbf5c6..20ef2d1172 100644 --- a/templates/CRM/Member/Import/Form/UploadFile.hlp +++ b/templates/CRM/Member/Import/Form/UploadFile.hlp @@ -37,7 +37,7 @@

{ts}Matching Memberships to Contacts{/ts}

{ts}Membership import files must contain data needed to match the membership to the contact record. This 'matching' can be handled in several different ways:{/ts}

-- 2.25.1