civicrm-core.git
3 years agoMerge pull request #20703 from civicrm/5.39
Eileen McNaughton [Wed, 23 Jun 2021 19:54:18 +0000 (07:54 +1200)]
Merge pull request #20703 from civicrm/5.39

5.39 to master

3 years agoMerge pull request #20699 from demeritcowboy/urlfix-539
Eileen McNaughton [Wed, 23 Jun 2021 19:53:45 +0000 (07:53 +1200)]
Merge pull request #20699 from demeritcowboy/urlfix-539

Backport of 20641 - url fix on payment edit form

3 years agobackport 20641
demeritcowboy [Wed, 23 Jun 2021 12:40:26 +0000 (08:40 -0400)]
backport 20641

3 years agoMerge pull request #20693 from eileenmcnaughton/trigg
Seamus Lee [Wed, 23 Jun 2021 08:15:37 +0000 (18:15 +1000)]
Merge pull request #20693 from eileenmcnaughton/trigg

Fix sorting for drop triggers

3 years agoFix sorting for drop triggers
Eileen McNaughton [Wed, 23 Jun 2021 04:18:16 +0000 (16:18 +1200)]
Fix sorting for drop triggers

I added a ksort but it should have been an asort - the createTriggers has an array like
['civicrm_acl'] => [.....]

which suits asort but in this location the array is

[0 => 'civicrm_acl', 1 =>.....

so asort is right

3 years agoMerge pull request #20691 from demeritcowboy/statlinks
Eileen McNaughton [Tue, 22 Jun 2021 19:37:47 +0000 (07:37 +1200)]
Merge pull request #20691 from demeritcowboy/statlinks

dev/core#2647 - Deprecated call to non-static CRM_Financial_Form_BatchTransaction::links()

3 years agodev/core#2647 - deprecated call to non-static
demeritcowboy [Tue, 22 Jun 2021 16:12:02 +0000 (12:12 -0400)]
dev/core#2647 - deprecated call to non-static

3 years agoMerge pull request #20677 from colemanw/resolveFKValues
Eileen McNaughton [Tue, 22 Jun 2021 08:15:31 +0000 (20:15 +1200)]
Merge pull request #20677 from colemanw/resolveFKValues

APIv4 - Allow FK dot notation in create/update/save actions

3 years agoMerge pull request #20690 from civicrm/5.39
Eileen McNaughton [Tue, 22 Jun 2021 06:40:14 +0000 (18:40 +1200)]
Merge pull request #20690 from civicrm/5.39

5.39

3 years agoMerge pull request #20689 from agileware/CIVICRM-1784
Seamus Lee [Tue, 22 Jun 2021 04:01:43 +0000 (14:01 +1000)]
Merge pull request #20689 from agileware/CIVICRM-1784

Reinstate invoiceID param to membership renewal payment

3 years agoMerge pull request #20686 from demeritcowboy/newtag
Seamus Lee [Tue, 22 Jun 2021 02:45:05 +0000 (12:45 +1000)]
Merge pull request #20686 from demeritcowboy/newtag

dev/core#2660 - Remove old menu entry for "New Tag"

3 years agoMerge pull request #20688 from demeritcowboy/coincidence
Seamus Lee [Tue, 22 Jun 2021 02:44:40 +0000 (12:44 +1000)]
Merge pull request #20688 from demeritcowboy/coincidence

Force the right path in github action script

3 years agoCIVICRM-1784 Reinstate invoiceID param to membership renewal payment
Francis Whittle [Tue, 22 Jun 2021 00:57:07 +0000 (10:57 +1000)]
CIVICRM-1784 Reinstate invoiceID param to membership renewal payment

Fixes a compatibility regresson introduced for 5.36

3 years agoforce the right path
demeritcowboy [Mon, 21 Jun 2021 23:46:39 +0000 (19:46 -0400)]
force the right path

3 years agoremove old menu entry
demeritcowboy [Mon, 21 Jun 2021 18:54:46 +0000 (14:54 -0400)]
remove old menu entry

3 years agoMerge pull request #20625 from seamuslee001/allow_civicrm_install_php8
Tim Otten [Mon, 21 Jun 2021 22:03:15 +0000 (15:03 -0700)]
Merge pull request #20625 from seamuslee001/allow_civicrm_install_php8

[php8-compact] Allow for CiviCRM to be installed by 3rd parties using…

3 years agoMerge pull request #20626 from akosgarai/issue/2645
Eileen McNaughton [Mon, 21 Jun 2021 21:03:58 +0000 (09:03 +1200)]
Merge pull request #20626 from akosgarai/issue/2645

dev/core#2645 Proposed fix for exporting preferred_mail_format field

3 years agoMerge pull request #20620 from eileenmcnaughton/539_test
Eileen McNaughton [Mon, 21 Jun 2021 20:52:18 +0000 (08:52 +1200)]
Merge pull request #20620 from eileenmcnaughton/539_test

Add file_exists check on loading services xml

3 years agoMerge pull request #20684 from colemanw/tplVars
Eileen McNaughton [Mon, 21 Jun 2021 20:36:35 +0000 (08:36 +1200)]
Merge pull request #20684 from colemanw/tplVars

Fix undefined tpl vars

3 years agoFix undefined tpl vars
Coleman Watts [Mon, 21 Jun 2021 14:12:02 +0000 (10:12 -0400)]
Fix undefined tpl vars

3 years agoMerge pull request #20664 from eileenmcnaughton/notice
colemanw [Mon, 21 Jun 2021 13:52:08 +0000 (09:52 -0400)]
Merge pull request #20664 from eileenmcnaughton/notice

Always assign mode to smarty

3 years agoMerge pull request #20683 from civicrm/5.39
Eileen McNaughton [Mon, 21 Jun 2021 08:11:35 +0000 (20:11 +1200)]
Merge pull request #20683 from civicrm/5.39

5.39

3 years agoMerge pull request #20675 from eileenmcnaughton/ev
Seamus Lee [Mon, 21 Jun 2021 05:54:15 +0000 (15:54 +1000)]
Merge pull request #20675 from eileenmcnaughton/ev

dev/event#58 Ensure custom data is not saved to template's row

3 years agoMerge pull request #20679 from eileenmcnaughton/smarty1
colemanw [Mon, 21 Jun 2021 05:43:42 +0000 (01:43 -0400)]
Merge pull request #20679 from eileenmcnaughton/smarty1

Extract feeBlock to it's own tpl

3 years agoMerge pull request #20680 from demeritcowboy/regen-github-action
colemanw [Mon, 21 Jun 2021 05:42:39 +0000 (01:42 -0400)]
Merge pull request #20680 from demeritcowboy/regen-github-action

[NFC] Github action script to run regen.sh for you

3 years agoAPIv4 - Support FK field lookups in create/update/save actions
Coleman Watts [Sun, 20 Jun 2021 20:16:05 +0000 (16:16 -0400)]
APIv4 - Support FK field lookups in create/update/save actions

3 years agoTest cleanup - use new APIv4 syntax for checkPermissions
Coleman Watts [Sun, 20 Jun 2021 20:13:25 +0000 (16:13 -0400)]
Test cleanup - use new APIv4 syntax for checkPermissions

3 years agoscript to run regen.sh for you
demeritcowboy [Mon, 21 Jun 2021 00:15:13 +0000 (20:15 -0400)]
script to run regen.sh for you

3 years agoMerge pull request #20268 from agileware/CIVICRM-1725
demeritcowboy [Sun, 20 Jun 2021 23:23:26 +0000 (19:23 -0400)]
Merge pull request #20268 from agileware/CIVICRM-1725

User experience improvement - Remove the confusing mixed terminology used to describe Tags: "Tags (Categories)" and "Tag (Category)"

3 years agoExtract feeBlock to it's own tpl
Eileen McNaughton [Sun, 20 Jun 2021 22:21:07 +0000 (10:21 +1200)]
Extract feeBlock to it's own tpl

This is a step towards moving the FeeBlock rendering to it's own form instead of the current 'overload'
approach

3 years agoCIVICRM-1725 User experience improvement - Remove the confusing mixed terminology...
Justin Freeman [Sun, 20 Jun 2021 21:35:51 +0000 (07:35 +1000)]
CIVICRM-1725 User experience improvement - Remove the confusing mixed terminology used to describe Tags: "Tags (Categories)" and "Tag (Category)"

3 years agoStart to tighten open-ended 'return' in tests
Eileen McNaughton [Sat, 19 Jun 2021 23:14:45 +0000 (11:14 +1200)]
Start to tighten open-ended 'return' in tests

3 years agoMerge pull request #20674 from seamuslee001/regen_dao
Seamus Lee [Sun, 20 Jun 2021 00:06:19 +0000 (10:06 +1000)]
Merge pull request #20674 from seamuslee001/regen_dao

[NFC] Regenerate ContributeProduct DAO and also fix search_kit instal…

3 years agoAdd unit test for event copy
Eileen McNaughton [Sat, 19 Jun 2021 23:14:29 +0000 (11:14 +1200)]
Add unit test for event copy

3 years agodev/event#58 Ensure custom data is not saved to template's row
Eileen McNaughton [Sat, 19 Jun 2021 22:43:58 +0000 (10:43 +1200)]
dev/event#58 Ensure custom data is not saved to template's row

This ensures than when we are copying (implicity a create-new-action) we do not
update an existing row in the custom data table by explicity unsetting the
id in the copy function. This has been bouncey behaviour because
the formatting for form purposes relies on form type formatting and yet
for save purposes it's not really fit for purpose. Although a bit
hacky this approach should be robust & avoids a re-write on the form

3 years agoMerge pull request #20667 from eileenmcnaughton/prt
Seamus Lee [Sat, 19 Jun 2021 22:39:32 +0000 (08:39 +1000)]
Merge pull request #20667 from eileenmcnaughton/prt

Fix up on invalid test data

3 years agoMerge pull request #20669 from eileenmcnaughton/member
Seamus Lee [Sat, 19 Jun 2021 22:39:12 +0000 (08:39 +1000)]
Merge pull request #20669 from eileenmcnaughton/member

Move determination of priceSetID to the internal order class

3 years agoMerge pull request #20668 from eileenmcnaughton/tt
Seamus Lee [Sat, 19 Jun 2021 22:38:14 +0000 (08:38 +1000)]
Merge pull request #20668 from eileenmcnaughton/tt

Fix test to use valid amounts

3 years ago[NFC] Regenerate ContributeProduct DAO and also fix search_kit install on MySQL 5...
Seamus Lee [Sat, 19 Jun 2021 22:23:58 +0000 (22:23 +0000)]
[NFC] Regenerate ContributeProduct DAO and also fix search_kit install on MySQL 5.6 on test boxes

3 years ago[php8-compact] Allow for CiviCRM to be installed by 3rd parties using composer on...
Seamus Lee [Wed, 16 Jun 2021 08:34:02 +0000 (18:34 +1000)]
[php8-compact] Allow for CiviCRM to be installed by 3rd parties using composer on php8 systems

Fix unit test

3 years agoMerge pull request #20671 from eileenmcnaughton/tax_null
Seamus Lee [Sat, 19 Jun 2021 09:29:16 +0000 (19:29 +1000)]
Merge pull request #20671 from eileenmcnaughton/tax_null

Deprecate passing in 'null' for tax

3 years agoMove determination of priceSetID to the internal order class
Eileen McNaughton [Sat, 19 Jun 2021 02:36:55 +0000 (14:36 +1200)]
Move determination of priceSetID to the internal order class

This moves some functionality from the form to where we can start to use if from the order api.

I also added more 'internal' commenting. This is implicitly the case but
I think it would be tempting to use this class and the comments at the top
of the class saying not to could be missed

3 years agoDeprecate passing in 'null' for tax
Eileen McNaughton [Sat, 19 Jun 2021 05:02:13 +0000 (17:02 +1200)]
Deprecate passing in 'null' for tax

This is the source of the php8 test fails -and it's wrong - it should be 0 not null

3 years agoFix test to use valid amounts
Eileen McNaughton [Sat, 19 Jun 2021 02:07:21 +0000 (14:07 +1200)]
Fix test to use valid amounts

This fixes the test so the rates match the appropriate rate for the tax

3 years agoMerge pull request #20663 from eileenmcnaughton/prt_form
Eileen McNaughton [Sat, 19 Jun 2021 01:27:28 +0000 (13:27 +1200)]
Merge pull request #20663 from eileenmcnaughton/prt_form

Minor tpl simplificaiton, notice reduction

3 years agoFix up on invalid test data
Eileen McNaughton [Sat, 19 Jun 2021 00:24:27 +0000 (12:24 +1200)]
Fix up on invalid test data

3 years agoMerge pull request #20666 from civicrm/5.39
Eileen McNaughton [Fri, 18 Jun 2021 23:58:19 +0000 (11:58 +1200)]
Merge pull request #20666 from civicrm/5.39

5.39 to master

3 years agoMerge pull request #20661 from seamuslee001/dev_core_2604
Eileen McNaughton [Fri, 18 Jun 2021 23:57:17 +0000 (11:57 +1200)]
Merge pull request #20661 from seamuslee001/dev_core_2604

dev/core#2604 Apply upstream patch to allow single quotes in return p…

3 years agoMerge pull request #20659 from colemanw/fixUndefinedTplVars
Seamus Lee [Fri, 18 Jun 2021 23:20:04 +0000 (09:20 +1000)]
Merge pull request #20659 from colemanw/fixUndefinedTplVars

Fix undefined tpl variables on contact summary

3 years agoMerge pull request #20655 from seamuslee001/fix_apiv4_group_concat_php8
Seamus Lee [Fri, 18 Jun 2021 22:41:58 +0000 (08:41 +1000)]
Merge pull request #20655 from seamuslee001/fix_apiv4_group_concat_php8

[php8-compact] Fix APIv4 Group Concat Test by setting dataType to be …

3 years agoAlways assign mode to smarty
Eileen McNaughton [Fri, 18 Jun 2021 22:06:07 +0000 (10:06 +1200)]
Always assign mode to smarty

We should assign regardless of nullity

3 years agoMinor tpl simplificaiton, notice reduction
Eileen McNaughton [Fri, 18 Jun 2021 21:58:38 +0000 (09:58 +1200)]
Minor tpl simplificaiton, notice reduction

This registerMode stuff turns out to be just a long winded way of upper casing the variable

3 years agodev/core#2604 Apply upstream patch to allow single quotes in return patch emails
Seamus Lee [Fri, 18 Jun 2021 21:45:17 +0000 (21:45 +0000)]
dev/core#2604 Apply upstream patch to allow single quotes in return patch emails

3 years agoFix undefined tpl variables on contact summary
Coleman Watts [Fri, 18 Jun 2021 21:31:21 +0000 (17:31 -0400)]
Fix undefined tpl variables on contact summary

3 years agoMerge pull request #20652 from seamuslee001/fix_array_access_on_number
colemanw [Fri, 18 Jun 2021 21:30:35 +0000 (17:30 -0400)]
Merge pull request #20652 from seamuslee001/fix_array_access_on_number

[NFC] Fixes an issue in this unit test where we are trying to do an a…

3 years agoMerge pull request #20472 from eileenmcnaughton/trigger_clean
demeritcowboy [Fri, 18 Jun 2021 21:30:26 +0000 (17:30 -0400)]
Merge pull request #20472 from eileenmcnaughton/trigger_clean

Improve output triggers when logged to file

3 years agoMerge pull request #20471 from eileenmcnaughton/schema
demeritcowboy [Fri, 18 Jun 2021 21:30:15 +0000 (17:30 -0400)]
Merge pull request #20471 from eileenmcnaughton/schema

Fix Schema calculation of usePrefix to cope with rpow:

3 years agoMerge pull request #20649 from eileenmcnaughton/mem_clean
Seamus Lee [Fri, 18 Jun 2021 21:15:23 +0000 (07:15 +1000)]
Merge pull request #20649 from eileenmcnaughton/mem_clean

[NFC] [Test] Cleanup on membership type test

3 years ago[php8-compact] Fix APIv4 Group Concat Test by setting dataType to be NULL if the...
Seamus Lee [Fri, 18 Jun 2021 06:32:59 +0000 (06:32 +0000)]
[php8-compact] Fix APIv4 Group Concat Test by setting dataType to be NULL if the first expression is a SQL Function

3 years agoMerge pull request #20657 from demeritcowboy/these-go-to-11
Eileen McNaughton [Fri, 18 Jun 2021 21:04:03 +0000 (09:04 +1200)]
Merge pull request #20657 from demeritcowboy/these-go-to-11

[NFC/Unit test] - Add a test for getCaseRoles when there's a lot of roles assigned

3 years agotest lots of roles on cases
demeritcowboy [Fri, 18 Jun 2021 18:06:08 +0000 (14:06 -0400)]
test lots of roles on cases

3 years ago[NFC] Fix around returns, cleanup
Eileen McNaughton [Fri, 18 Jun 2021 01:39:42 +0000 (13:39 +1200)]
[NFC] Fix around returns, cleanup

3 years agoMerge pull request #20653 from eileenmcnaughton/you_have_lines
Seamus Lee [Fri, 18 Jun 2021 06:42:21 +0000 (16:42 +1000)]
Merge pull request #20653 from eileenmcnaughton/you_have_lines

[REF] Remove always false if

3 years agoMerge pull request #20616 from seamuslee001/fix_custom_group_Test
Seamus Lee [Fri, 18 Jun 2021 06:31:01 +0000 (16:31 +1000)]
Merge pull request #20616 from seamuslee001/fix_custom_group_Test

[php8-compact][REF] Fix failing custom group test on php8 by better h…

3 years ago[REF] Remove always false if
Eileen McNaughton [Fri, 18 Jun 2021 05:09:39 +0000 (17:09 +1200)]
[REF] Remove always false if

We recently added code to ensure line_item is always populated
before this function is called. So line items is never empty at this point

3 years ago[NFC] Fixes an issue in this unit test where we are trying to do an array acess on...
Seamus Lee [Fri, 18 Jun 2021 04:44:56 +0000 (04:44 +0000)]
[NFC] Fixes an issue in this unit test where we are trying to do an array acess on an integer

3 years agoFix bug found by Eileen on creating Custom Fields of Paritipant event type and add...
Seamus Lee [Fri, 18 Jun 2021 04:42:44 +0000 (14:42 +1000)]
Fix bug found by Eileen on creating Custom Fields of Paritipant event type and add unit tests to lock in fix

3 years ago[REF] Shift special handling of extends param of the customGroup create into apiv3...
Seamus Lee [Wed, 16 Jun 2021 02:45:23 +0000 (02:45 +0000)]
[REF] Shift special handling of extends param of the customGroup create into apiv3 and change Custom Group form to use apiv3

3 years ago[php8-compact][REF] Fix failing custom group test on php8 by better handling strings...
Seamus Lee [Wed, 16 Jun 2021 01:59:33 +0000 (01:59 +0000)]
[php8-compact][REF] Fix failing custom group test on php8 by better handling strings in 2nd key of the extends array and also validating the child and main entity work

3 years agoMerge pull request #20621 from eileenmcnaughton/mps
Eileen McNaughton [Fri, 18 Jun 2021 03:57:13 +0000 (15:57 +1200)]
Merge pull request #20621 from eileenmcnaughton/mps

Add test validation for Membership & participant payments

3 years agoMerge pull request #20623 from seamuslee001/fix_event_form_test_php8
Eileen McNaughton [Fri, 18 Jun 2021 03:15:12 +0000 (15:15 +1200)]
Merge pull request #20623 from seamuslee001/fix_event_form_test_php8

[php8-compact] Fix Event Form test for php8 by setting totalAmount in…

3 years agoAdd test validation for Membership & participant payments
Eileen McNaughton [Wed, 16 Jun 2021 07:01:00 +0000 (19:01 +1200)]
Add test validation for Membership & participant payments

3 years agoMerge pull request #20639 from colemanw/getReferencesToContactTable
Eileen McNaughton [Fri, 18 Jun 2021 01:05:31 +0000 (13:05 +1200)]
Merge pull request #20639 from colemanw/getReferencesToContactTable

dev/core#2656 Fix getReferencesToContactTable to ignore non-id references

3 years agoMerge pull request #20647 from eileenmcnaughton/cl
Eileen McNaughton [Fri, 18 Jun 2021 00:49:24 +0000 (12:49 +1200)]
Merge pull request #20647 from eileenmcnaughton/cl

[NFC] [Test] Remove duplicate cleanup

3 years agoMerge pull request #20633 from eileenmcnaughton/ret3
colemanw [Fri, 18 Jun 2021 00:23:19 +0000 (20:23 -0400)]
Merge pull request #20633 from eileenmcnaughton/ret3

[NFC] [TEST] cleanup, more use of return in ActivityTest

3 years agoMerge pull request #20636 from eileenmcnaughton/mm
Seamus Lee [Fri, 18 Jun 2021 00:21:06 +0000 (10:21 +1000)]
Merge pull request #20636 from eileenmcnaughton/mm

[NFC] Cleanup on membership test

3 years agoMerge pull request #20637 from eileenmcnaughton/mem
Seamus Lee [Fri, 18 Jun 2021 00:20:04 +0000 (10:20 +1000)]
Merge pull request #20637 from eileenmcnaughton/mem

[NFC] [Test] Remove duplicate cleanup

3 years agoMerge pull request #20638 from eileenmcnaughton/ret2
Seamus Lee [Fri, 18 Jun 2021 00:19:43 +0000 (10:19 +1000)]
Merge pull request #20638 from eileenmcnaughton/ret2

[NFC] Cleanup on contribution v3 api test

3 years agoMerge pull request #20644 from lcdservices/dev-core-2657
Eileen McNaughton [Thu, 17 Jun 2021 23:39:57 +0000 (11:39 +1200)]
Merge pull request #20644 from lcdservices/dev-core-2657

dev/core#2657 trigger pre hook on LineItem delete

3 years ago[NFC] [Test] Remove duplicate cleanup
Eileen McNaughton [Thu, 17 Jun 2021 08:41:01 +0000 (20:41 +1200)]
[NFC] [Test] Remove duplicate cleanup

3 years agoMerge pull request #20646 from civicrm/5.39
Eileen McNaughton [Thu, 17 Jun 2021 22:32:19 +0000 (10:32 +1200)]
Merge pull request #20646 from civicrm/5.39

5.39

3 years agoMerge pull request #20554 from colemanw/noteUsedFor
demeritcowboy [Thu, 17 Jun 2021 21:25:47 +0000 (17:25 -0400)]
Merge pull request #20554 from colemanw/noteUsedFor

Convert Notes to use option_group instead of hardcoded list

3 years agoMerge pull request #20645 from agh1/5.39.0-releasenotes-initial
Seamus Lee [Thu, 17 Jun 2021 20:35:15 +0000 (06:35 +1000)]
Merge pull request #20645 from agh1/5.39.0-releasenotes-initial

5.39.0 release notes initial run

3 years agoRegenerate sql with note_used_for option group
Coleman Watts [Thu, 17 Jun 2021 18:29:43 +0000 (14:29 -0400)]
Regenerate sql with note_used_for option group

3 years agoConvert Notes to use option_group instead of hardcoded list
Coleman Watts [Tue, 8 Jun 2021 12:37:38 +0000 (08:37 -0400)]
Convert Notes to use option_group instead of hardcoded list

3 years ago5.39.0 release notes: added boilerplate
Andrew Hunt [Thu, 17 Jun 2021 16:33:18 +0000 (12:33 -0400)]
5.39.0 release notes: added boilerplate

3 years ago5.39.0 release notes: raw from script
Andrew Hunt [Thu, 17 Jun 2021 16:30:57 +0000 (12:30 -0400)]
5.39.0 release notes: raw from script

3 years agoMerge pull request #20642 from colemanw/admin
colemanw [Thu, 17 Jun 2021 16:11:31 +0000 (12:11 -0400)]
Merge pull request #20642 from colemanw/admin

Remove unreachable code from admin page

3 years agoMerge pull request #20643 from colemanw/moveUpgradeCode
colemanw [Thu, 17 Jun 2021 15:49:34 +0000 (11:49 -0400)]
Merge pull request #20643 from colemanw/moveUpgradeCode

Move upgrade code to correct version

3 years agodev/core#2657 trigger pre hook on LineItem delete
Brian Shaughnessy [Thu, 17 Jun 2021 14:46:32 +0000 (10:46 -0400)]
dev/core#2657 trigger pre hook on LineItem delete

3 years agoMerge pull request #20641 from pradpnayak/urlfix
demeritcowboy [Thu, 17 Jun 2021 14:43:45 +0000 (10:43 -0400)]
Merge pull request #20641 from pradpnayak/urlfix

Fixed url

3 years agoMerge pull request #20640 from colemanw/smartyNotices
demeritcowboy [Thu, 17 Jun 2021 14:34:29 +0000 (10:34 -0400)]
Merge pull request #20640 from colemanw/smartyNotices

Show smarty E-notices when in debug mode

3 years agoMove upgrade code to correct version
Coleman Watts [Thu, 17 Jun 2021 13:27:30 +0000 (09:27 -0400)]
Move upgrade code to correct version

See https://github.com/civicrm/civicrm-core/pull/20553

3 years agoRemove unreachable code from admin page
Coleman Watts [Thu, 17 Jun 2021 13:19:58 +0000 (09:19 -0400)]
Remove unreachable code from admin page

3 years agoMerge pull request #20553 from JMAConsulting/add_product_id_fk
colemanw [Thu, 17 Jun 2021 13:14:29 +0000 (09:14 -0400)]
Merge pull request #20553 from JMAConsulting/add_product_id_fk

dev/core#2486 - Add foreign key on civicrm_contribution_product.product_id

3 years agoFixed url
Pradeep Nayak [Thu, 17 Jun 2021 13:07:24 +0000 (14:07 +0100)]
Fixed url

3 years agoShow smarty E-notices when in debug mode
Coleman Watts [Thu, 17 Jun 2021 13:04:05 +0000 (09:04 -0400)]
Show smarty E-notices when in debug mode

3 years agoFix getReferencesToContactTable to ignore non-id references
Coleman Watts [Thu, 17 Jun 2021 12:10:19 +0000 (08:10 -0400)]
Fix getReferencesToContactTable to ignore non-id references

Fixes dev/core#2656
https://lab.civicrm.org/dev/core/-/issues/2656

3 years agoMerge pull request #20635 from eileenmcnaughton/reta
Monish Deb [Thu, 17 Jun 2021 11:52:56 +0000 (17:22 +0530)]
Merge pull request #20635 from eileenmcnaughton/reta

[NFC] [TEST] cleanup, more use of return in AddressTest

3 years agoAdd product_id FK
Monish Deb [Tue, 8 Jun 2021 07:35:02 +0000 (13:05 +0530)]
Add product_id FK