civicrm-core.git
20 months agoThe old pdf test system doesn't work anymore, defaulting to production method
Ruben Rodriguez [Tue, 8 Jun 2021 21:15:02 +0000 (23:15 +0200)]
The old pdf test system doesn't work anymore, defaulting to production method

20 months agoAdding LibreJS back after bundles refactor upstream
Michael McMahon [Wed, 16 Dec 2020 21:57:12 +0000 (16:57 -0500)]
Adding LibreJS back after bundles refactor upstream

20 months agoForce membership auto-renew on by default
Ruben Rodriguez [Wed, 12 Feb 2020 23:06:58 +0000 (18:06 -0500)]
Force membership auto-renew on by default

20 months agocorrected class name in old FSF code
Andrew Engelbrecht [Thu, 18 Oct 2018 16:49:55 +0000 (12:49 -0400)]
corrected class name in old FSF code

https://rt.gnu.org/Ticket/Display.html?id=1330057

20 months agoUse proxy to look for civicrm updates, fixes RT#1314844
Ruben Rodriguez [Thu, 23 Aug 2018 22:17:57 +0000 (18:17 -0400)]
Use proxy to look for civicrm updates, fixes RT#1314844

20 months agoCorrect path to john's signature
Ruben Rodriguez [Tue, 29 May 2018 16:42:57 +0000 (12:42 -0400)]
Correct path to john's signature

20 months agoCorrected call to commonCompose
Ruben Rodriguez [Tue, 29 May 2018 15:47:45 +0000 (11:47 -0400)]
Corrected call to commonCompose

We were using a deprecated wrapper for that function:
https://github.com/civicrm/civicrm-core/commit/187007a3dbd33bde08b0b4f54feff8c71ea2a065

20 months agoremoved an old stray sql file
Andrew Engelbrecht [Wed, 25 Apr 2018 14:34:38 +0000 (10:34 -0400)]
removed an old stray sql file

20 months agoCorrected thankyou template, see RT#1286518
Ruben Rodriguez [Thu, 12 Apr 2018 16:50:26 +0000 (12:50 -0400)]
Corrected thankyou template, see RT#1286518

20 months agoBIG HACK: Corrected frequency calculation for new members
Ruben Rodriguez [Mon, 12 Mar 2018 23:47:35 +0000 (19:47 -0400)]
BIG HACK: Corrected frequency calculation for new members

20 months agoupdated function documentation
Andrew Engelbrecht [Fri, 19 Jan 2018 05:46:30 +0000 (00:46 -0500)]
updated function documentation

20 months agoThis version of the TC code is no longer in use
Andrew Engelbrecht [Tue, 16 Jan 2018 18:31:27 +0000 (13:31 -0500)]
This version of the TC code is no longer in use

the code in org.fsf.payment.trustcommerce was used, and will continue to
be used for the time being.

20 months agoSort by country,second_name,first_name for pdf generation of international mailings
Ruben Rodriguez [Wed, 15 Nov 2017 17:29:39 +0000 (12:29 -0500)]
Sort by country,second_name,first_name for pdf generation of international mailings

(change currently disabled / commented out -- sudoman)

20 months agoDisable recipient estimation on mailings
Ruben Rodriguez [Wed, 15 Nov 2017 17:28:43 +0000 (12:28 -0500)]
Disable recipient estimation on mailings

20 months agoCorrected TeX ligatures for pdf letters
Ruben Rodriguez [Mon, 13 Nov 2017 22:53:57 +0000 (17:53 -0500)]
Corrected TeX ligatures for pdf letters

20 months agoFilter groups according to included profiles
Andrew Engelbrecht [Mon, 25 Sep 2017 22:34:51 +0000 (18:34 -0400)]
Filter groups according to included profiles

This is a continuation of the contact groups filtering feature, which
allows admins to filter the public listings of contact groups on various
Civi pages by setting a Drupal variable with drush.

It is now possible to set a rule for a profile and for that rule to
automatically apply to standalone profile pages, contribution pages that
include the profile, and event pages that include it as well.

See comments in CRM/Contact/Form/Edit/TagsAndGroups.php for instructions
on how to set the variable via drush.

20 months agoAllow admin to change the names of filtered groups
Andrew Engelbrecht [Mon, 18 Sep 2017 22:19:40 +0000 (18:19 -0400)]
Allow admin to change the names of filtered groups

This feature lets one mimic a custom field by allowing admins to change
the text that appears next to each group's check box, via drush.

The json format is a bit more nested, but indented json can be used. An
exmple is included in CRM/Contact/Form/Edit/TagsAndGroups.php.

20 months agoGroups filter hack for smaller groups listings
Andrew Engelbrecht [Fri, 15 Sep 2017 20:15:10 +0000 (16:15 -0400)]
Groups filter hack for smaller groups listings

This change is a dirty hack that lets site admins filter the "Contacts
Group(s)" field output in select profiles. This reduces overwhem for
users when they are making a donation or filling out a form with the
Groups signup field. This is preferable to using a custom field with
smart groups because the Groups field provides double opt-in, while
custom fields do not.

The filter is controlled via a json string stored in a drupal variable
that can be set with drush like so:

drush vset --format=string groups_field_filters "{...}"

See the documentation marked with "sudoman hack" in
CRM/Contact/Form/Edit/TagsAndGroups.php for an example.

20 months agoremove unneeded file not deleted in git rebase
Andrew Engelbrecht [Wed, 19 Jul 2017 21:28:47 +0000 (17:28 -0400)]
remove unneeded file not deleted in git rebase

20 months agoremove unneeded file (latex.patch)
Andrew Engelbrecht [Wed, 19 Jul 2017 20:31:29 +0000 (16:31 -0400)]
remove unneeded file (latex.patch)

this was apparently not removed in the git rebase.

20 months agoComment cleanup
Ruben Rodriguez [Thu, 1 Dec 2016 21:59:27 +0000 (16:59 -0500)]
Comment cleanup

20 months agoUpdated the LaTeX header for letters
Ruben Rodriguez [Thu, 1 Dec 2016 21:28:53 +0000 (16:28 -0500)]
Updated the LaTeX header for letters

20 months agoAdded hack for scaping curly brackets on smarty LaTeX templates
Ruben Rodriguez [Fri, 10 Jun 2016 19:06:07 +0000 (15:06 -0400)]
Added hack for scaping curly brackets on smarty LaTeX templates

20 months agoTuned up PdfLatex font settings
Ruben Rodriguez [Fri, 10 Jun 2016 19:05:21 +0000 (15:05 -0400)]
Tuned up PdfLatex font settings

20 months agoredisabling mail tracking
k [Tue, 15 Mar 2016 17:41:14 +0000 (13:41 -0400)]
redisabling mail tracking

20 months agoSolving RT ticket #1092988
k [Tue, 15 Mar 2016 17:13:26 +0000 (13:13 -0400)]
Solving RT ticket #1092988
adding civicrm ID to contributin record

20 months agoipn receiver for external api
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:33:03 +0000 (13:33 -0400)]
ipn receiver for external api

20 months agoPriceset 2nd half
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:28:53 +0000 (13:28 -0400)]
Priceset 2nd half

20 months agoPriceset/debugwatchdog
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:28:43 +0000 (13:28 -0400)]
Priceset/debugwatchdog

20 months agoRemoved cache rebuild from the GroupContact
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:18:43 +0000 (13:18 -0400)]
Removed cache rebuild from the GroupContact

20 months agoRT#765026, patch for null values in civicrm_acl_cache
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:15:03 +0000 (13:15 -0400)]
RT#765026, patch for null values in civicrm_acl_cache

20 months agoAdded the current uncommited changes to production code, and rebased to 4.6.8
Ruben Rodriguez [Thu, 10 Sep 2015 22:24:23 +0000 (18:24 -0400)]
Added the current uncommited changes to production code, and rebased to 4.6.8

20 months agoAdditional files for PDF/Latex
Lisa Marie Maginnis [Thu, 1 May 2014 21:29:27 +0000 (17:29 -0400)]
Additional files for PDF/Latex

20 months agoOur changes
Lisa Marie Maginnis [Thu, 1 May 2014 21:04:18 +0000 (17:04 -0400)]
Our changes

20 months agoMerge pull request #26327 from totten/5.61-bump4
Tim Otten [Wed, 24 May 2023 06:53:00 +0000 (23:53 -0700)]
Merge pull request #26327 from totten/5.61-bump4

5.61.4 - Add notes. Bump version.

20 months agoAdd release-notes/5.61.4.md
Tim Otten [Wed, 24 May 2023 06:38:56 +0000 (23:38 -0700)]
Add release-notes/5.61.4.md

20 months agoSet version to 5.61.4
Tim Otten [Wed, 24 May 2023 06:38:53 +0000 (23:38 -0700)]
Set version to 5.61.4

20 months agoMerge pull request #26325 from agileware/CIVICRM-2137-5.61
Eileen McNaughton [Wed, 24 May 2023 04:45:16 +0000 (16:45 +1200)]
Merge pull request #26325 from agileware/CIVICRM-2137-5.61

dev/core#4310 (5.61) Fix layout regression in MembershipBlock for Contribution pages

20 months agoCIVICRM-2137 Add closing div and force renewal javascript back to makeContribution...
Francis Whittle [Wed, 24 May 2023 01:07:12 +0000 (11:07 +1000)]
CIVICRM-2137 Add closing div and force renewal javascript back to makeContribution context for Membership block on Contributions

20 months agoMerge pull request #26312 from totten/5.61-htxt
Eileen McNaughton [Tue, 23 May 2023 22:42:56 +0000 (10:42 +1200)]
Merge pull request #26312 from totten/5.61-htxt

Port {htxt} fixes to 5.61

20 months ago[REF] Fix an additional htxt id issue similar to #26079
Seamus Lee [Wed, 19 Apr 2023 23:31:45 +0000 (09:31 +1000)]
[REF] Fix an additional htxt id issue similar to #26079

20 months agoHtxt undetected opening tag
Samuel Vanhove [Wed, 19 Apr 2023 14:10:41 +0000 (10:10 -0400)]
Htxt undetected opening tag

20 months agoDefine {htxt} filter to allow some extra parameters.
Tim Otten [Tue, 23 May 2023 06:28:32 +0000 (23:28 -0700)]
Define {htxt} filter to allow some extra parameters.

Also: tighten the handling of ' and " to ensure that they are matched properly.

20 months ago(dev/core#4303) Allow {htxt} guard to accommodate variable ID
Tim Otten [Mon, 22 May 2023 04:48:57 +0000 (21:48 -0700)]
(dev/core#4303) Allow {htxt} guard to accommodate variable ID

Before
------

`{htxt}` guard works with static IDs (`{htxt id="abc"}`)

After
-----

`{htxt}` guard with with variable ID (`{htxt id=$abc}`)

Comments
--------

As discussed in dev/core#4303, one relevant use-case comes from `CustomField.hlp`.

In my copy of universe, there's a similar construction in
`nz.co.fuzion.entitysetting` (`entitysettingscommon.hlp`).

20 months ago(dev/core#4303) Add test for {htxt}
Tim Otten [Mon, 22 May 2023 05:26:10 +0000 (22:26 -0700)]
(dev/core#4303) Add test for {htxt}

21 months agoMerge pull request #26279 from totten/5.61-bump3
Tim Otten [Sat, 20 May 2023 00:58:10 +0000 (17:58 -0700)]
Merge pull request #26279 from totten/5.61-bump3

5.61.3 - Add notes. Bump version.

21 months agoAdd release-notes/5.61.3.md
Tim Otten [Sat, 20 May 2023 00:44:11 +0000 (17:44 -0700)]
Add release-notes/5.61.3.md

21 months agoSet version to 5.61.3
Tim Otten [Sat, 20 May 2023 00:44:09 +0000 (17:44 -0700)]
Set version to 5.61.3

21 months agoMerge pull request #26277 from eileenmcnaughton/5.61
Tim Otten [Sat, 20 May 2023 00:38:06 +0000 (17:38 -0700)]
Merge pull request #26277 from eileenmcnaughton/5.61

dev/core#4282 Fix isShowMembershipBlock & notice fix

21 months agoEnotice fix on frontend_title
Eileen McNaughton [Fri, 19 May 2023 02:28:23 +0000 (14:28 +1200)]
Enotice fix on frontend_title

21 months agodev/core#4282 Fix isShowMembershipBlock
Eileen McNaughton [Fri, 19 May 2023 02:47:39 +0000 (14:47 +1200)]
dev/core#4282 Fix isShowMembershipBlock

As determined by Konadave & myself this
isShowMembershipBlock was always true when memberships were in
play in 5.60 - despite various code comments. I have renamed
& assigned it regardless of QuickConfig. Since it is
a condition of including the tpl & within it it already checks
the context I made the context check the top level check & removed the
isShowMembershipBlock check

21 months agoMerge pull request #26176 from totten/5.61-bump2
Tim Otten [Mon, 8 May 2023 23:13:58 +0000 (16:13 -0700)]
Merge pull request #26176 from totten/5.61-bump2

5.61.2 - Add notes. Bump version.

21 months agoAdd release-notes/5.61.2.md
Tim Otten [Mon, 8 May 2023 23:10:10 +0000 (16:10 -0700)]
Add release-notes/5.61.2.md

21 months agoSet version to 5.61.2
Tim Otten [Mon, 8 May 2023 23:10:08 +0000 (16:10 -0700)]
Set version to 5.61.2

21 months agoMerge pull request #26175 from totten/5.61-memberships
Eileen McNaughton [Mon, 8 May 2023 21:25:19 +0000 (09:25 +1200)]
Merge pull request #26175 from totten/5.61-memberships

CiviMember - Fix regression whereby membership does not submit

21 months agoCiviDiscount fix - pass correct component
Eileen McNaughton [Mon, 8 May 2023 08:03:50 +0000 (20:03 +1200)]
CiviDiscount fix - pass correct component

21 months agoRe-instate the renewal message
Eileen McNaughton [Mon, 8 May 2023 04:27:08 +0000 (16:27 +1200)]
Re-instate the renewal message

21 months agoFix regression whereby membership does not submit
Eileen McNaughton [Mon, 8 May 2023 03:45:13 +0000 (15:45 +1200)]
Fix regression whereby membership does not submit

21 months agoMerge pull request #26161 from totten/5.61-rn1
Tim Otten [Fri, 5 May 2023 21:16:46 +0000 (14:16 -0700)]
Merge pull request #26161 from totten/5.61-rn1

Add release-notes/5.61.1.md

21 months agoMerge pull request #26160 from totten/5.61-upgrade-d9-msg
demeritcowboy [Fri, 5 May 2023 21:14:33 +0000 (17:14 -0400)]
Merge pull request #26160 from totten/5.61-upgrade-d9-msg

Upgrade message for drupal9 sites to advise to clear drupal cache

21 months agoAdd release-notes/5.61.1.md
Tim Otten [Fri, 5 May 2023 20:49:51 +0000 (13:49 -0700)]
Add release-notes/5.61.1.md

21 months agoSet version to 5.61.1
Tim Otten [Fri, 5 May 2023 20:34:25 +0000 (13:34 -0700)]
Set version to 5.61.1

21 months agoupgrade message
demeritcowboy [Fri, 5 May 2023 20:15:48 +0000 (16:15 -0400)]
upgrade message

21 months agoSet version to 5.61.0
Tim Otten [Thu, 4 May 2023 03:37:01 +0000 (20:37 -0700)]
Set version to 5.61.0

21 months agoMerge pull request #26155 from seamuslee001/5.61
Seamus Lee [Thu, 4 May 2023 01:36:56 +0000 (11:36 +1000)]
Merge pull request #26155 from seamuslee001/5.61

Bump engine.io and socket.io versions

21 months agoMerge pull request #26153 from totten/5.61-rn0
Tim Otten [Thu, 4 May 2023 01:27:23 +0000 (18:27 -0700)]
Merge pull request #26153 from totten/5.61-rn0

release-notes/5.61.0.md - Last minute additions

21 months agoMerge pull request #26108 from eileenmcnaughton/import_template
Seamus Lee [Thu, 4 May 2023 01:26:46 +0000 (11:26 +1000)]
Merge pull request #26108 from eileenmcnaughton/import_template

Importer - Ensure mapping ID is set in all places using import templates

21 months agoBump engine.io and socket.io versions
Seamus Lee [Thu, 4 May 2023 01:20:09 +0000 (11:20 +1000)]
Bump engine.io and socket.io versions

21 months agorelease-notes/5.61.0.md - Last minute additions
Tim Otten [Thu, 4 May 2023 00:42:57 +0000 (17:42 -0700)]
release-notes/5.61.0.md - Last minute additions

21 months agoMerge pull request #26140 from eileenmcnaughton/561
Seamus Lee [Wed, 3 May 2023 23:27:21 +0000 (09:27 +1000)]
Merge pull request #26140 from eileenmcnaughton/561

dev/core#4225 Add test & fix for new regression - contact update fails when relationship exists & CiviMember disabled

21 months agoMerge pull request #26146 from MegaphoneJon/import-fill-fix
Eileen McNaughton [Wed, 3 May 2023 22:20:17 +0000 (10:20 +1200)]
Merge pull request #26146 from MegaphoneJon/import-fill-fix

fixes core#4269 - Import "fill" doesn't fill phone/email

21 months agoMerge pull request #26141 from eileenmcnaughton/561_member
demeritcowboy [Wed, 3 May 2023 18:55:42 +0000 (14:55 -0400)]
Merge pull request #26141 from eileenmcnaughton/561_member

dev/core#4272 Fix unreleased regression on Membership form validation

21 months agoFixes core#4269 - import 'fill' doesn't work on phone/email
Jon Goldberg [Wed, 3 May 2023 18:09:53 +0000 (14:09 -0400)]
Fixes core#4269 - import 'fill' doesn't work on phone/email

21 months agodev/core#4272 Fix unreleased regression on Membership form validation
Eileen McNaughton [Wed, 3 May 2023 01:17:28 +0000 (13:17 +1200)]
dev/core#4272 Fix unreleased regression on Membership form validation

21 months agoAdd Civi-Member is enabled check
Eileen McNaughton [Wed, 3 May 2023 00:39:14 +0000 (12:39 +1200)]
Add Civi-Member is enabled check

21 months agodev/core#4225 Add test for new regression
Eileen McNaughton [Wed, 3 May 2023 00:31:33 +0000 (12:31 +1200)]
dev/core#4225 Add test for new regression

21 months agoMerge pull request #26127 from alifrumin/rn5.61
Eileen McNaughton [Sat, 29 Apr 2023 23:53:47 +0000 (11:53 +1200)]
Merge pull request #26127 from alifrumin/rn5.61

[NFC] 5.61 release notes

21 months ago[NFC] 5.61 release notes
Alice Frumin [Fri, 28 Apr 2023 03:21:40 +0000 (23:21 -0400)]
[NFC] 5.61 release notes

21 months agoMerge pull request #26117 from agh1/5.61.0-releasenotes-initial
Eileen McNaughton [Thu, 27 Apr 2023 22:46:33 +0000 (10:46 +1200)]
Merge pull request #26117 from agh1/5.61.0-releasenotes-initial

5.61.0 release notes initial run

21 months ago5.61.0 release notes: added boilerplate
Andie Hunt [Thu, 27 Apr 2023 20:48:16 +0000 (16:48 -0400)]
5.61.0 release notes: added boilerplate

21 months ago5.61.0 release notes: raw from script
Andie Hunt [Thu, 27 Apr 2023 20:43:30 +0000 (16:43 -0400)]
5.61.0 release notes: raw from script

21 months agoMerge pull request #26015 from eileenmcnaughton/dedupe_employer
demeritcowboy [Thu, 27 Apr 2023 13:31:12 +0000 (09:31 -0400)]
Merge pull request #26015 from eileenmcnaughton/dedupe_employer

dev/core#4156 Fix employer not carrying over correctly in merge

21 months agoEnsure mapping id is set in all places using import templates
Eileen McNaughton [Tue, 25 Apr 2023 00:05:29 +0000 (12:05 +1200)]
Ensure mapping id is set in all places using import templates

This fixes the missing update saved mapping option when using a template

I think I changed the way the metadata was a few times & so it is
a bit confusing - but this ensures it is set in the
place MapField is expecting it to be

21 months agoMerge pull request #26099 from seamuslee001/5.61
Seamus Lee [Sat, 22 Apr 2023 00:56:51 +0000 (10:56 +1000)]
Merge pull request #26099 from seamuslee001/5.61

dev/core#4249 Ensure that no deprecation logging occurs from groupPer…

21 months agodev/core#4249 Ensure that no deprecation logging occurs from groupPermission having...
Seamus Lee [Thu, 20 Apr 2023 03:26:15 +0000 (13:26 +1000)]
dev/core#4249 Ensure that no deprecation logging occurs from groupPermission having includeGroups as NULL rather than an empty array

22 months agoMerge pull request #26085 from seamuslee001/dev_core_4247
Yashodha Chaku [Thu, 20 Apr 2023 06:30:00 +0000 (12:00 +0530)]
Merge pull request #26085 from seamuslee001/dev_core_4247

dev/core#4247 Ensure that Membership values are populated to prevent â€¦

22 months agodev/core#4247 Ensure that Membership values are populated to prevent fatal error...
Seamus Lee [Thu, 20 Apr 2023 03:21:33 +0000 (13:21 +1000)]
dev/core#4247 Ensure that Membership values are populated to prevent fatal error on formatting start date

22 months agoMerge pull request #26082 from seamuslee001/5.61
Seamus Lee [Wed, 19 Apr 2023 23:09:55 +0000 (09:09 +1000)]
Merge pull request #26082 from seamuslee001/5.61

Updates pear/pear-core-minimal and guzzlehttp/psr7

22 months agoUpdate Guzzle PSR7 package
Seamus Lee [Wed, 19 Apr 2023 22:45:34 +0000 (08:45 +1000)]
Update Guzzle PSR7 package

22 months agoThis has been closed in favour of pear/pear-core#124
Luke Stewart [Wed, 19 Apr 2023 20:55:40 +0000 (08:55 +1200)]
This has been closed in favour of pear/pear-core#124

Updates lock file to pull in latest version of pear/pear-core-minimal.

22 months agoMerge pull request #26067 from colemanw/fixEntityRefSave
colemanw [Mon, 17 Apr 2023 21:07:33 +0000 (17:07 -0400)]
Merge pull request #26067 from colemanw/fixEntityRefSave

Fix dev/core#4240 - Saving entityReference field value via API

22 months agoCustomValue - Fix saving entityReference field as NULL and add test
Coleman Watts [Mon, 17 Apr 2023 19:32:02 +0000 (15:32 -0400)]
CustomValue - Fix saving entityReference field as NULL and add test

22 months agoFix dev/core#4240 - Saving entityReference field value via API
Coleman Watts [Sat, 15 Apr 2023 19:57:43 +0000 (15:57 -0400)]
Fix dev/core#4240 - Saving entityReference field value via API

22 months agoCleanup relationships
Eileen McNaughton [Thu, 13 Apr 2023 19:02:26 +0000 (07:02 +1200)]
Cleanup relationships

22 months agoRemove obsolete code
Eileen McNaughton [Thu, 13 Apr 2023 00:17:27 +0000 (12:17 +1200)]
Remove obsolete code

This was actually obsolete before the apiv4 switch I think - but it DEFINITELY is now

22 months agoMore better fix on population on cached organization name
Eileen McNaughton [Thu, 13 Apr 2023 00:16:51 +0000 (12:16 +1200)]
More better fix on population on cached organization name

22 months agoFix for handling of FALSE now we are getting apiv4 results
Eileen McNaughton [Fri, 7 Apr 2023 01:15:05 +0000 (13:15 +1200)]
Fix for handling of FALSE now we are getting apiv4 results

As exposed in api_v3_JobTest.testBatchMergeWorks

22 months agoAdjust to APiv4 returning label as a field
Eileen McNaughton [Thu, 6 Apr 2023 23:39:38 +0000 (11:39 +1200)]
Adjust to APiv4 returning label as a field

As tested by CRM_Dedupe_MergerTest::testGetRowsElementsAndInfoSpecialInfo

22 months agoDo not consider greeting display names in merges
Eileen McNaughton [Thu, 6 Apr 2023 23:34:59 +0000 (11:34 +1200)]
Do not consider greeting display names in merges

As surfaced by api_v3_ContactTest::testMergeGetConflicts
these are basically caches of calculated fields

22 months agoFix employer not carrying over correctly in merge
Eileen McNaughton [Thu, 6 Apr 2023 06:12:24 +0000 (18:12 +1200)]
Fix employer not carrying over correctly in merge

This addresses a deduper bug where selecting the employer_id to
carry over in the form does NOT result in the newly
merged contact having that organization's name
in it's organization_name field