civicrm-core.git
4 years agoCall completeOrder directly from event status update form
eileen [Mon, 18 May 2020 06:07:42 +0000 (18:07 +1200)]
Call completeOrder directly from event status update form

We should really call completetransaction but that has been left for later unravelling with the focus here being
to clarify the purpose of the transaction. We don't need to pass a transaction around unless it has DB changes not
yet committed - which is not eally the case here. There is no reason to invoke BaseIPN but more unravelling required...

4 years agoMerge pull request #17326 from demeritcowboy/ts-params
colemanw [Fri, 15 May 2020 00:47:31 +0000 (20:47 -0400)]
Merge pull request #17326 from demeritcowboy/ts-params

Remove unneeded parameters in {ts} on membership form

4 years agoMerge pull request #17320 from totten/master-url-type
Seamus Lee [Thu, 14 May 2020 23:55:38 +0000 (09:55 +1000)]
Merge pull request #17320 from totten/master-url-type

(NFC) CRM_Utils_Url - Fix declared type

4 years agounneeded parameters
demeritcowboy [Thu, 14 May 2020 22:23:52 +0000 (18:23 -0400)]
unneeded parameters

4 years agoMerge pull request #17322 from eileenmcnaughton/ids
Tim Otten [Thu, 14 May 2020 20:46:59 +0000 (13:46 -0700)]
Merge pull request #17322 from eileenmcnaughton/ids

(NFC) Remove some cvs docblock help

4 years agoMerge pull request #16992 from colemanw/customSerialize
colemanw [Thu, 14 May 2020 20:08:26 +0000 (16:08 -0400)]
Merge pull request #16992 from colemanw/customSerialize

Add serialize column to civicrm_custom_field, remove "Multi-Select" html type

4 years agoMerge pull request #17314 from jitendrapurohit/dev-1758
Matthew Wire [Thu, 14 May 2020 11:22:40 +0000 (12:22 +0100)]
Merge pull request #17314 from jitendrapurohit/dev-1758

dev/core#1758 - Fix check number and trxn id values on record payment…

4 years agoMerge pull request #17285 from agh1/no-rendered-icons-in-data-source
Matthew Wire [Thu, 14 May 2020 11:15:12 +0000 (12:15 +0100)]
Merge pull request #17285 from agh1/no-rendered-icons-in-data-source

No rendered icons in data source

4 years agoMerge pull request #17303 from agh1/no-icon-crmbutton
Matthew Wire [Thu, 14 May 2020 11:13:41 +0000 (12:13 +0100)]
Merge pull request #17303 from agh1/no-icon-crmbutton

crmButton: support icon=0 for no icon

4 years agoRemove some cvs docblock help
eileen [Thu, 14 May 2020 06:37:00 +0000 (18:37 +1200)]
Remove some cvs docblock help

The $ pattern turns out to be cvs support. We agreed the whole block should only
stay if it adds extra info

4 years ago(NFC) CRM_Utils_Url - Fix declared type
Tim Otten [Thu, 14 May 2020 06:34:27 +0000 (23:34 -0700)]
(NFC) CRM_Utils_Url - Fix declared type

Before
------

References a non-existent type `\GuzzleHttp\Psr7\UriInterface`.

After
-----

References an existent type `\Psr\Http\Message\UriInterface`.

4 years agoMerge pull request #17306 from colemanw/priceFieldValue
Seamus Lee [Thu, 14 May 2020 00:45:16 +0000 (10:45 +1000)]
Merge pull request #17306 from colemanw/priceFieldValue

Cleanup PriceFieldValue BAO

4 years agoMerge pull request #17078 from herbdool/ui-18
Eileen McNaughton [Thu, 14 May 2020 00:16:53 +0000 (12:16 +1200)]
Merge pull request #17078 from herbdool/ui-18

Ui 18

4 years agoMerge pull request #17116 from lcdservices/dev-core-1721
Eileen McNaughton [Thu, 14 May 2020 00:12:47 +0000 (12:12 +1200)]
Merge pull request #17116 from lcdservices/dev-core-1721

dev/core#1721 send email to case follow-up activity assignees

4 years agoFix setting profile defaults
Coleman Watts [Mon, 11 May 2020 14:51:53 +0000 (10:51 -0400)]
Fix setting profile defaults

4 years agoFix dedupe merger handling of serialized custom fields
Coleman Watts [Fri, 17 Apr 2020 00:34:58 +0000 (20:34 -0400)]
Fix dedupe merger handling of serialized custom fields

4 years agoUpdate contact import parser to validate serialized custom fields
Coleman Watts [Fri, 17 Apr 2020 00:05:20 +0000 (20:05 -0400)]
Update contact import parser to validate serialized custom fields

4 years agoCustom Field serialization test fixes
Coleman Watts [Thu, 16 Apr 2020 21:56:37 +0000 (17:56 -0400)]
Custom Field serialization test fixes

4 years agoCleanup references to custom field html_type
Coleman Watts [Tue, 7 Apr 2020 14:57:11 +0000 (10:57 -0400)]
Cleanup references to custom field html_type

4 years agoUpdate CustomField form with 'serialize' option
Coleman Watts [Mon, 6 Apr 2020 01:23:50 +0000 (21:23 -0400)]
Update CustomField form with 'serialize' option

4 years agoEliminate Multi-Select field types
Coleman Watts [Sun, 5 Apr 2020 21:06:27 +0000 (17:06 -0400)]
Eliminate Multi-Select field types

4 years agoAPIv4 - Update custom field spec for serialize column
Coleman Watts [Fri, 3 Apr 2020 23:31:46 +0000 (19:31 -0400)]
APIv4 - Update custom field spec for serialize column

4 years agoRely on serialize property when checking if custom field is multivalued
Coleman Watts [Fri, 3 Apr 2020 01:06:06 +0000 (21:06 -0400)]
Rely on serialize property when checking if custom field is multivalued

4 years agoAPIv3 - Legacy handling for old way of naming serialized fields
Coleman Watts [Fri, 3 Apr 2020 00:37:05 +0000 (20:37 -0400)]
APIv3 - Legacy handling for old way of naming serialized fields

4 years agoAdd serialize column to civicrm_custom_field
Coleman Watts [Thu, 2 Apr 2020 21:37:59 +0000 (17:37 -0400)]
Add serialize column to civicrm_custom_field

4 years agoMerge pull request #17311 from KarinG/clarify_amount
Seamus Lee [Wed, 13 May 2020 22:36:53 +0000 (08:36 +1000)]
Merge pull request #17311 from KarinG/clarify_amount

Clarify definition of amount field in civicrm_contribution_recur table.

4 years agoMerge pull request #17313 from civicrm/5.26
Seamus Lee [Wed, 13 May 2020 22:35:54 +0000 (08:35 +1000)]
Merge pull request #17313 from civicrm/5.26

5.26

4 years agoCommon.js Icons should be aria-hidden
Andrew Hunt [Wed, 13 May 2020 18:20:34 +0000 (14:20 -0400)]
Common.js Icons should be aria-hidden

4 years agoMerge pull request #17316 from agh1/ab-test-flask-icon
colemanw [Wed, 13 May 2020 17:14:44 +0000 (13:14 -0400)]
Merge pull request #17316 from agh1/ab-test-flask-icon

A/B test: icon should be Erlenmeyer flask, not bar chart

4 years agoA/B test: icon should be Erlenmeyer flask, not bar chart
Andrew Hunt [Wed, 13 May 2020 15:55:51 +0000 (11:55 -0400)]
A/B test: icon should be Erlenmeyer flask, not bar chart

4 years agodev/core#1758 - Fix check number and trxn id values on record payment form
Jitendra Purohit [Wed, 13 May 2020 12:52:39 +0000 (18:22 +0530)]
dev/core#1758 - Fix check number and trxn id values on record payment form

4 years agoMerge pull request #17265 from MegaphoneJon/mime-error-rc
Seamus Lee [Wed, 13 May 2020 08:42:20 +0000 (18:42 +1000)]
Merge pull request #17265 from MegaphoneJon/mime-error-rc

[regression] Fix error on no MIME type

4 years agoMerge pull request #17309 from colemanw/MailingAB
Seamus Lee [Wed, 13 May 2020 08:38:06 +0000 (18:38 +1000)]
Merge pull request #17309 from colemanw/MailingAB

[REF] Cleanup MailingAB BAO

4 years agoClarify definition of amount field in civicrm_contribution_recur table.
KarinG [Tue, 12 May 2020 23:02:22 +0000 (17:02 -0600)]
Clarify definition of amount field in civicrm_contribution_recur table.

4 years agoMerge pull request #17293 from agh1/sr-wrenches
colemanw [Tue, 12 May 2020 22:15:03 +0000 (18:15 -0400)]
Merge pull request #17293 from agh1/sr-wrenches

Screen reader text for wrenches

4 years agoMerge pull request #17294 from agh1/sr-rel-perms
colemanw [Tue, 12 May 2020 22:08:37 +0000 (18:08 -0400)]
Merge pull request #17294 from agh1/sr-rel-perms

sr-only text for relationship permissions

4 years agoCleanup MailingAB BAO
Coleman Watts [Tue, 12 May 2020 17:32:48 +0000 (13:32 -0400)]
Cleanup MailingAB BAO

- Use writeRecord function instead of boilerplate.
- Use api defaults for domain_id instead of setting in BAO:
  - APIv3 default domain is set via _civicrm_api3_mailing_a_b_create_spec() function.
  - APIv4 FieldDomainIdSpecProvider will set it automatically based on the required property in the schema.

4 years agoCRM.utils.formatIcon: updated function name and made condition optional
Andrew Hunt [Tue, 12 May 2020 18:35:26 +0000 (14:35 -0400)]
CRM.utils.formatIcon: updated function name and made condition optional

4 years agoCleanup PriceFieldValue BAO
Coleman Watts [Tue, 12 May 2020 15:56:56 +0000 (11:56 -0400)]
Cleanup PriceFieldValue BAO

- Use writeRecord() helper function
- Remove $ids param from add()
- Make sense of previously unused $priceFieldID variable

4 years agocrmButton: support icon=0 for no icon
Andrew Hunt [Tue, 12 May 2020 15:20:07 +0000 (11:20 -0400)]
crmButton: support icon=0 for no icon

4 years agoUpdate CRM/Core/Form/Renderer.php
Andrew Hunt [Tue, 12 May 2020 13:58:48 +0000 (09:58 -0400)]
Update CRM/Core/Form/Renderer.php

Adopting @colemanw's suggestion since it's more of a concern that the label be blank than undefined.

Co-authored-by: colemanw <coleman@civicrm.org>
4 years agoMerge pull request #17301 from eileenmcnaughton/recur
colemanw [Tue, 12 May 2020 13:37:21 +0000 (09:37 -0400)]
Merge pull request #17301 from eileenmcnaughton/recur

dev/core#1728 Ensure that custom fields that extend specified financi…

4 years agoMerge pull request #17302 from eileenmcnaughton/mem
colemanw [Tue, 12 May 2020 13:36:36 +0000 (09:36 -0400)]
Merge pull request #17302 from eileenmcnaughton/mem

[REF] Minor tidy up

4 years agoMerge pull request #17246 from agh1/review-contrib
colemanw [Tue, 12 May 2020 12:51:10 +0000 (08:51 -0400)]
Merge pull request #17246 from agh1/review-contrib

Proceeding to confirmation page should be a "next" button not a check

4 years ago[REF] Minor tidy up
eileen [Tue, 12 May 2020 07:30:04 +0000 (19:30 +1200)]
[REF] Minor tidy up

Removes a few old constructs like the value() function

4 years agoAlternate to #17156
eileen [Tue, 12 May 2020 07:11:37 +0000 (19:11 +1200)]
Alternate to #17156

4 years agoMerge pull request #17299 from eileenmcnaughton/recur
Seamus Lee [Tue, 12 May 2020 05:44:24 +0000 (15:44 +1000)]
Merge pull request #17299 from eileenmcnaughton/recur

Add ContributionRecur crud api

4 years agoMerge pull request #17295 from agh1/fa-more
colemanw [Tue, 12 May 2020 02:46:33 +0000 (22:46 -0400)]
Merge pull request #17295 from agh1/fa-more

Replaced more> icon with Font Awesome

4 years agoAdd ContributionRecur crud api
eileen [Tue, 12 May 2020 01:58:53 +0000 (13:58 +1200)]
Add ContributionRecur crud api

4 years agoMerge pull request #17289 from agh1/icon-title-escape
colemanw [Tue, 12 May 2020 00:00:29 +0000 (20:00 -0400)]
Merge pull request #17289 from agh1/icon-title-escape

Icon helper: replace quotes in html title.

4 years agoReplaced more> icon with Font Awesome
Andrew Hunt [Sat, 9 May 2020 02:58:41 +0000 (22:58 -0400)]
Replaced more> icon with Font Awesome

4 years agosr-only text for relationship permissions
Andrew Hunt [Sat, 9 May 2020 00:07:56 +0000 (20:07 -0400)]
sr-only text for relationship permissions

4 years agosr-only text for wrenches
Andrew Hunt [Fri, 8 May 2020 23:15:48 +0000 (19:15 -0400)]
sr-only text for wrenches

4 years agoProceeding to confirmation page should be a "next" button not a check
Andrew Hunt [Mon, 11 May 2020 23:03:20 +0000 (19:03 -0400)]
Proceeding to confirmation page should be a "next" button not a check

4 years agoMerge pull request #17273 from mattwire/phpnoticeisoverride
Yashodha Chaku [Mon, 11 May 2020 15:21:21 +0000 (20:51 +0530)]
Merge pull request #17273 from mattwire/phpnoticeisoverride

Fix PHP notice when is_override is not set

4 years agoMerge pull request #16967 from wmortada/wp#46-2
Matthew Wire [Mon, 11 May 2020 14:38:31 +0000 (15:38 +0100)]
Merge pull request #16967 from wmortada/wp#46-2

dev/wp#46 - Fix overlarge select2 elements in WordPress 5.3+

4 years agoCRM.utils.formatConditionalIcon: Escape html characters in alt text
Andrew Hunt [Mon, 11 May 2020 14:07:13 +0000 (10:07 -0400)]
CRM.utils.formatConditionalIcon: Escape html characters in alt text

4 years agoSend `is_default` data as boolean, not rendered icon; add js icon helper
Andrew Hunt [Fri, 8 May 2020 19:40:46 +0000 (15:40 -0400)]
Send `is_default` data as boolean, not rendered icon; add js icon helper

4 years agoIcon helper: replace quotes in html title.
Andrew Hunt [Mon, 11 May 2020 13:40:25 +0000 (09:40 -0400)]
Icon helper: replace quotes in html title.

4 years agoMerge pull request #17284 from agh1/admin-console-only
Matthew Wire [Mon, 11 May 2020 09:39:27 +0000 (10:39 +0100)]
Merge pull request #17284 from agh1/admin-console-only

Simplify admin console and remove superfluous icons

4 years agoFix PHP notice when is_override is not set
Matthew Wire [Sun, 10 May 2020 10:44:01 +0000 (11:44 +0100)]
Fix PHP notice when is_override is not set

4 years agoMerge pull request #17283 from agh1/stop-icon-png
Matthew Wire [Mon, 11 May 2020 09:22:03 +0000 (10:22 +0100)]
Merge pull request #17283 from agh1/stop-icon-png

Replace stop-icon.png with fa-ban over a relevant icon for privacy

4 years agoMerge pull request #17286 from seamuslee001/contribution_id_search_metadata
Matthew Wire [Mon, 11 May 2020 09:21:48 +0000 (10:21 +0100)]
Merge pull request #17286 from seamuslee001/contribution_id_search_metadata

[REF] Add contribution_id field to search using metadata instead of h…

4 years agoMerge pull request #17280 from agh1/copy-png
Matthew Wire [Mon, 11 May 2020 09:21:03 +0000 (10:21 +0100)]
Merge pull request #17280 from agh1/copy-png

Replace all instances of copy.png with font awesome

4 years agoMerge pull request #17279 from agh1/check-gif
Matthew Wire [Mon, 11 May 2020 09:20:42 +0000 (10:20 +0100)]
Merge pull request #17279 from agh1/check-gif

Remove most uses of check.gif

4 years ago[REF] Add contribution_id field to search using metadata instead of hard codeded...
Seamus Lee [Sun, 10 May 2020 22:18:10 +0000 (08:18 +1000)]
[REF] Add contribution_id field to search using metadata instead of hard codeded quickform html

4 years agoMerge pull request #17275 from mattwire/mailingbackend
Seamus Lee [Sun, 10 May 2020 21:12:23 +0000 (07:12 +1000)]
Merge pull request #17275 from mattwire/mailingbackend

NFC Change hardcoded ID to constant

4 years agoMerge pull request #17281 from agh1/geotag-16-png
colemanw [Sun, 10 May 2020 20:17:53 +0000 (16:17 -0400)]
Merge pull request #17281 from agh1/geotag-16-png

Replace geotag_16.png with fa-map-marker

4 years agoAdmin console: remove superfluous code and don't hard-code sections
Andrew Hunt [Sat, 9 May 2020 03:37:50 +0000 (23:37 -0400)]
Admin console: remove superfluous code and don't hard-code sections

4 years agoAdmin console: remove old version and icons
Andrew Hunt [Thu, 7 May 2020 20:25:17 +0000 (16:25 -0400)]
Admin console: remove old version and icons

4 years agoAdmin console: produced much simpler version
Andrew Hunt [Thu, 7 May 2020 14:48:12 +0000 (10:48 -0400)]
Admin console: produced much simpler version

4 years agoReplace stop-icon.png with fa-ban over a relevant icon for privacy
Andrew Hunt [Thu, 7 May 2020 19:27:32 +0000 (15:27 -0400)]
Replace stop-icon.png with fa-ban over a relevant icon for privacy

4 years agoReplace geotag_16.png with fa-map-marker
Andrew Hunt [Thu, 7 May 2020 17:36:20 +0000 (13:36 -0400)]
Replace geotag_16.png with fa-map-marker

4 years agoReplace all instances of copy.png with font awesome
Andrew Hunt [Thu, 7 May 2020 17:29:27 +0000 (13:29 -0400)]
Replace all instances of copy.png with font awesome

4 years agoReplace all instances of check.gif appearing in listings
Andrew Hunt [Thu, 7 May 2020 16:51:42 +0000 (12:51 -0400)]
Replace all instances of check.gif appearing in listings

4 years agoCiviMail compose: replace check.gif with Font Awesome icons
Andrew Hunt [Thu, 7 May 2020 15:46:15 +0000 (11:46 -0400)]
CiviMail compose: replace check.gif with Font Awesome icons

4 years agoHardcoded ID to constant
Matthew Wire [Sun, 10 May 2020 10:56:53 +0000 (11:56 +0100)]
Hardcoded ID to constant

4 years agoMerge pull request #16484 from yashodha/dev_1580
Matthew Wire [Sun, 10 May 2020 10:33:38 +0000 (11:33 +0100)]
Merge pull request #16484 from yashodha/dev_1580

(dev/core#1580) Allow to search on contribution id

4 years agoMerge pull request #17067 from colemanw/importSubmit
Matthew Wire [Sun, 10 May 2020 10:28:00 +0000 (11:28 +0100)]
Merge pull request #17067 from colemanw/importSubmit

dev/user-interface#17 Fix popup confirmation on import forms

4 years agoMerge pull request #17072 from eileenmcnaughton/dupe
Matthew Wire [Sun, 10 May 2020 10:26:33 +0000 (11:26 +0100)]
Merge pull request #17072 from eileenmcnaughton/dupe

Merge code - remove UPDATE IGNORE+Delete & just use reliable update

4 years agoMerge pull request #17079 from yashodha/dev-1704
Matthew Wire [Sun, 10 May 2020 10:25:09 +0000 (11:25 +0100)]
Merge pull request #17079 from yashodha/dev-1704

respect file fields that have been configured as view only in profiles

4 years agoMerge pull request #17260 from demeritcowboy/csv-apostrophe
Matthew Wire [Sun, 10 May 2020 10:22:43 +0000 (11:22 +0100)]
Merge pull request #17260 from demeritcowboy/csv-apostrophe

dev/core#1743 - Fix decoding of apostrophes in csv export from CiviReports

4 years agoMerge pull request #17245 from agh1/chevrons
Matthew Wire [Sun, 10 May 2020 10:17:01 +0000 (11:17 +0100)]
Merge pull request #17245 from agh1/chevrons

Decorative chevrons should be icons not angle quotes

4 years agoMerge pull request #17257 from colemanw/tagParam
Matthew Wire [Sun, 10 May 2020 10:12:42 +0000 (11:12 +0100)]
Merge pull request #17257 from colemanw/tagParam

Tag create: respect created_date and created_id params

4 years agoMerge pull request #17268 from colemanw/getBAOClassName
Matthew Wire [Sun, 10 May 2020 10:11:02 +0000 (11:11 +0100)]
Merge pull request #17268 from colemanw/getBAOClassName

Add getBAOClassName utiltiy function

4 years agoMerge pull request #17269 from greenpeace-cee/simplify-length-test
Matthew Wire [Sun, 10 May 2020 10:10:03 +0000 (11:10 +0100)]
Merge pull request #17269 from greenpeace-cee/simplify-length-test

CRM/Logging - Remove obsolete cache static clear in test

4 years agoMerge pull request #17267 from eileenmcnaughton/bag
Matthew Wire [Sun, 10 May 2020 10:09:36 +0000 (11:09 +0100)]
Merge pull request #17267 from eileenmcnaughton/bag

Add propertyBag handling for getEmail when incoming uses email-5

4 years agoMerge pull request #17270 from totten/master-regtest
colemanw [Sat, 9 May 2020 13:06:04 +0000 (09:06 -0400)]
Merge pull request #17270 from totten/master-regtest

(NFC) RegionTest - Small cleanups

4 years ago(NFC) RegionTest - Small cleanups
Tim Otten [Sat, 9 May 2020 02:40:08 +0000 (19:40 -0700)]
(NFC) RegionTest - Small cleanups

4 years agoCRM/Logging - Remove obsolete cache static clear in test
Patrick Figel [Sat, 9 May 2020 02:20:22 +0000 (04:20 +0200)]
CRM/Logging - Remove obsolete cache static clear in test

This simplifies CRM_Logging_SchemaTest::testLengthChange() and
CRM_Logging_SchemaTest::testEnumChange() by removing a manual reset on
a cache static and a second call to
CRM_Logging_Schema::fixSchemaDifferences(). This was made obsolete by
a40a5a4875bf5caa03eaa8732c958f5c714c7b61, which has added a cache flush
to fixSchemaDifferences() via fixSchemaDifferencesForAll().

4 years agoAdd getBAOClassName utiltiy function
Coleman Watts [Sat, 9 May 2020 01:30:46 +0000 (21:30 -0400)]
Add getBAOClassName utiltiy function

4 years agoAdd propertyBag handling for getEmail when incoming uses email-5
eileen [Sat, 9 May 2020 00:11:15 +0000 (12:11 +1200)]
Add propertyBag handling for getEmail when incoming uses email-5

Calling code is often setting email-5. The property bag should iron out this inconsistency, and getEmail (and similar)
should handle the appended billing id. We can't do this in the static property map as it is a calculated variable

4 years agoMerge pull request #17263 from civicrm/5.26
Seamus Lee [Fri, 8 May 2020 22:47:02 +0000 (08:47 +1000)]
Merge pull request #17263 from civicrm/5.26

5.26

4 years agoMerge pull request #17264 from colemanw/grantCleanup
Seamus Lee [Fri, 8 May 2020 22:33:03 +0000 (08:33 +1000)]
Merge pull request #17264 from colemanw/grantCleanup

[REF] Grant BAO cleanup

4 years agoMerge pull request #17255 from agh1/sr-only
Tim Otten [Fri, 8 May 2020 21:37:56 +0000 (14:37 -0700)]
Merge pull request #17255 from agh1/sr-only

[NFC] Add sr-only class for content only for screen readers

4 years agofix regression on new MIME type library
Jon Goldberg [Fri, 8 May 2020 17:21:02 +0000 (13:21 -0400)]
fix regression on new MIME type library

4 years agoGrant BAO cleanup
Coleman Watts [Fri, 8 May 2020 14:11:14 +0000 (10:11 -0400)]
Grant BAO cleanup

4 years agoTag create cleanup: respect created_date and created_id params
Coleman Watts [Thu, 7 May 2020 21:11:19 +0000 (17:11 -0400)]
Tag create cleanup: respect created_date and created_id params

4 years agoMerge pull request #17262 from totten/5.26-test-sql-op
Seamus Lee [Fri, 8 May 2020 11:05:52 +0000 (21:05 +1000)]
Merge pull request #17262 from totten/5.26-test-sql-op

SyntaxConformanceTest::testSqlOperators - Fix failure on MySQL 8

4 years agoMerge pull request #17183 from eileenmcnaughton/tax_t
Seamus Lee [Fri, 8 May 2020 08:46:51 +0000 (18:46 +1000)]
Merge pull request #17183 from eileenmcnaughton/tax_t

Remove incorrect retrievals of tax-term setting