civicrm-core.git
4 years agoupgrade script for nl_BE
demeritcowboy [Wed, 8 Apr 2020 15:26:23 +0000 (11:26 -0400)]
upgrade script for nl_BE

4 years agoMerge pull request #17022 from eileenmcnaughton/test_updates
colemanw [Wed, 8 Apr 2020 12:09:23 +0000 (08:09 -0400)]
Merge pull request #17022 from eileenmcnaughton/test_updates

[NFC][Test] cleanup on customDataTrait for tests

4 years agoMerge pull request #16954 from eileenmcnaughton/email4
colemanw [Wed, 8 Apr 2020 12:01:16 +0000 (08:01 -0400)]
Merge pull request #16954 from eileenmcnaughton/email4

[REF] Move generic preProcess function to the trait

4 years ago[NFC][Test] cleanup on customDataTrait for tests
eileen [Wed, 8 Apr 2020 04:37:43 +0000 (16:37 +1200)]
[NFC][Test] cleanup on customDataTrait for tests

4 years agoEnable test on merging country, it now works
eileen [Wed, 8 Apr 2020 02:26:39 +0000 (14:26 +1200)]
Enable test on merging country, it now works

4 years agoMerge pull request #17023 from civicrm/5.25
Eileen McNaughton [Wed, 8 Apr 2020 04:58:21 +0000 (16:58 +1200)]
Merge pull request #17023 from civicrm/5.25

5.25  to master

4 years agoMerge pull request #17004 from pradpnayak/fixhookissue
Eileen McNaughton [Wed, 8 Apr 2020 04:57:48 +0000 (16:57 +1200)]
Merge pull request #17004 from pradpnayak/fixhookissue

Fixed fatal error for class not found when managed hook is invoked du…

4 years agoMerge pull request #17019 from eileenmcnaughton/dupe
Eileen McNaughton [Wed, 8 Apr 2020 04:45:57 +0000 (16:45 +1200)]
Merge pull request #17019 from eileenmcnaughton/dupe

[NFC] Minor code cleanups

4 years agoMerge pull request #16837 from tunbola/case-api-case-clients
Eileen McNaughton [Wed, 8 Apr 2020 03:38:51 +0000 (15:38 +1200)]
Merge pull request #16837 from tunbola/case-api-case-clients

dev/core#1659: Fix Case.get API returning Case Clients As Part of Related Contacts

4 years ago[NFC] Minor code cleanups
eileen [Wed, 8 Apr 2020 01:55:58 +0000 (13:55 +1200)]
[NFC] Minor code cleanups

4 years agoMerge pull request #17018 from civicrm/5.25
Seamus Lee [Wed, 8 Apr 2020 01:53:52 +0000 (11:53 +1000)]
Merge pull request #17018 from civicrm/5.25

5.25

4 years agoMerge pull request #17014 from seamuslee001/nl_be_5_25
Seamus Lee [Wed, 8 Apr 2020 01:53:29 +0000 (11:53 +1000)]
Merge pull request #17014 from seamuslee001/nl_be_5_25

add nl_BE language

4 years agoMerge pull request #17016 from eileenmcnaughton/dupe
Eileen McNaughton [Wed, 8 Apr 2020 01:43:17 +0000 (13:43 +1200)]
Merge pull request #17016 from eileenmcnaughton/dupe

[REF] Clarify variable & tighten use.

4 years agoMerge pull request #17013 from demeritcowboy/boo2
Seamus Lee [Wed, 8 Apr 2020 00:54:35 +0000 (10:54 +1000)]
Merge pull request #17013 from demeritcowboy/boo2

[REF] Use bool instead of boolean

4 years ago[REF] Clarify variable & tighten use.
eileen [Wed, 8 Apr 2020 00:46:36 +0000 (12:46 +1200)]
[REF] Clarify variable & tighten use.

moveContactBelongings is only called from one place which passes in all the function variables, so we don't need defaults.

The last parameter,  is retrieved from self::getAffectedCustomTables which  always returns an
array - so all the handling for it being NULL can be removed....

4 years agoadd nl_BE language
demeritcowboy [Thu, 2 Apr 2020 21:59:21 +0000 (17:59 -0400)]
add nl_BE language

4 years agoMerge pull request #17012 from demeritcowboy/boo
colemanw [Wed, 8 Apr 2020 00:40:34 +0000 (20:40 -0400)]
Merge pull request #17012 from demeritcowboy/boo

[REF] Formatting and use bool instead of boolean

4 years agoformatting and bool vs boolean
demeritcowboy [Tue, 7 Apr 2020 19:10:59 +0000 (15:10 -0400)]
formatting and bool vs boolean

4 years agostandard is bool instead of boolean
demeritcowboy [Tue, 7 Apr 2020 19:16:34 +0000 (15:16 -0400)]
standard is bool instead of boolean

4 years agoFixed fatal error for class not found when managed hook is invoked during upgrade
Pradeep Nayak [Tue, 7 Apr 2020 02:16:44 +0000 (03:16 +0100)]
Fixed fatal error for class not found when managed hook is invoked during upgrade

4 years agoMerge pull request #17009 from colemanw/multi-cleanup5
colemanw [Tue, 7 Apr 2020 17:05:36 +0000 (13:05 -0400)]
Merge pull request #17009 from colemanw/multi-cleanup5

[REF] CustomField code cleanup to use isSerialized method

4 years agoMerge pull request #16968 from colemanw/multi-cleanup
colemanw [Tue, 7 Apr 2020 15:53:39 +0000 (11:53 -0400)]
Merge pull request #16968 from colemanw/multi-cleanup

[REF] CustomField code cleanup

4 years agoCustomField code cleanup to use isSerialized method
Coleman Watts [Tue, 7 Apr 2020 15:27:51 +0000 (11:27 -0400)]
CustomField code cleanup to use isSerialized method

4 years agoMerge pull request #17002 from eileenmcnaughton/deduped
colemanw [Tue, 7 Apr 2020 01:59:14 +0000 (21:59 -0400)]
Merge pull request #17002 from eileenmcnaughton/deduped

[NFC][Test] Minor cleanup in test class

4 years agoMerge pull request #16996 from colemanw/customCleanup
Eileen McNaughton [Tue, 7 Apr 2020 01:25:28 +0000 (13:25 +1200)]
Merge pull request #16996 from colemanw/customCleanup

[REF] Cleanup customField prepareCreate function

4 years agoMerge pull request #17001 from seamuslee001/dev_core_1673
Seamus Lee [Tue, 7 Apr 2020 01:01:42 +0000 (11:01 +1000)]
Merge pull request #17001 from seamuslee001/dev_core_1673

dev/core#1673 Ensure that SQL statements are not duplicated in the de…

4 years ago[NFC][Test] Minor cleanup in test class
eileen [Tue, 7 Apr 2020 00:36:29 +0000 (12:36 +1200)]
[NFC][Test] Minor cleanup in test class

Most notably extracting duplicated code. General cleanup

4 years agoMerge pull request #17000 from demeritcowboy/comment-for-extension
Eileen McNaughton [Tue, 7 Apr 2020 00:03:41 +0000 (12:03 +1200)]
Merge pull request #17000 from demeritcowboy/comment-for-extension

[NFC] Add Comment to avoid someone removing field only used in CiviCase extension

4 years agoMerge pull request #16986 from colemanw/importParser
Eileen McNaughton [Tue, 7 Apr 2020 00:02:50 +0000 (12:02 +1200)]
Merge pull request #16986 from colemanw/importParser

[REF] Update custom data handing in contact import

4 years agoMerge pull request #16997 from colemanw/textAreaAttrs
Seamus Lee [Mon, 6 Apr 2020 23:54:32 +0000 (09:54 +1000)]
Merge pull request #16997 from colemanw/textAreaAttrs

Fix setting custom field TextArea attributes

4 years agodev/core#1673 Ensure that SQL statements are not duplicated in the developer tab...
Seamus Lee [Mon, 6 Apr 2020 23:50:26 +0000 (09:50 +1000)]
dev/core#1673 Ensure that SQL statements are not duplicated in the developer tab of reports

4 years agocomment to avoid removing
demeritcowboy [Mon, 6 Apr 2020 22:34:18 +0000 (18:34 -0400)]
comment to avoid removing

4 years agoMerge pull request #16994 from yashodha/error
Eileen McNaughton [Mon, 6 Apr 2020 20:19:39 +0000 (08:19 +1200)]
Merge pull request #16994 from yashodha/error

add filter and sorting for receipt date in contribution report

4 years agoMerge pull request #16995 from ivan-compucorp/CPS-130-case-details-empty
Eileen McNaughton [Mon, 6 Apr 2020 20:17:40 +0000 (08:17 +1200)]
Merge pull request #16995 from ivan-compucorp/CPS-130-case-details-empty

Case Details field is empty

4 years agoFix setting custom field TextArea attributes
Coleman Watts [Mon, 6 Apr 2020 15:48:52 +0000 (11:48 -0400)]
Fix setting custom field TextArea attributes

The code was potentially overwriting attributes for existing fields during update ops

4 years agoCleanup customField prepareCreate function
Coleman Watts [Mon, 6 Apr 2020 15:36:37 +0000 (11:36 -0400)]
Cleanup customField prepareCreate function

4 years agoCPS-130: Fix empty Details field when creating a Case
ivan [Mon, 6 Apr 2020 14:18:29 +0000 (17:18 +0300)]
CPS-130: Fix empty Details field when creating a Case

4 years agoMerge pull request #16901 from eileenmcnaughton/settings
Matthew Wire [Mon, 6 Apr 2020 09:24:30 +0000 (10:24 +0100)]
Merge pull request #16901 from eileenmcnaughton/settings

Fix bug on handling 'is_required'

4 years agoadd filter and soring for receipt date in contribution report
yashodha [Mon, 6 Apr 2020 07:10:53 +0000 (12:40 +0530)]
add filter and soring for receipt date in contribution report

4 years agoMerge pull request #16953 from jitendrapurohit/core-1685
Seamus Lee [Mon, 6 Apr 2020 06:38:07 +0000 (16:38 +1000)]
Merge pull request #16953 from jitendrapurohit/core-1685

dev/core#1685 - Search builder returns DB error on Group => Empty filter

4 years agoMerge pull request #16623 from mattwire/tokenvalues
Eileen McNaughton [Mon, 6 Apr 2020 05:29:00 +0000 (17:29 +1200)]
Merge pull request #16623 from mattwire/tokenvalues

Fix values passed to tokenValues hook

4 years agoMerge pull request #16989 from colemanw/seeingDouble
colemanw [Mon, 6 Apr 2020 01:13:43 +0000 (21:13 -0400)]
Merge pull request #16989 from colemanw/seeingDouble

[REF] Cleanup custom field handling... twice

4 years agoMerge pull request #16984 from colemanw/ufGroupCleanup
colemanw [Mon, 6 Apr 2020 01:05:34 +0000 (21:05 -0400)]
Merge pull request #16984 from colemanw/ufGroupCleanup

Cleanup custom field handling in ufGroup BAO

4 years agoMerge pull request #16990 from colemanw/multi-cleanup4
Seamus Lee [Mon, 6 Apr 2020 00:16:30 +0000 (10:16 +1000)]
Merge pull request #16990 from colemanw/multi-cleanup4

[REF] Cleanup CustomField BAO to use its own isSerialized function

4 years agoMerge pull request #16988 from civicrm/5.25
Seamus Lee [Mon, 6 Apr 2020 00:14:22 +0000 (10:14 +1000)]
Merge pull request #16988 from civicrm/5.25

5.25

4 years agoMerge pull request #16991 from pradpnayak/customFieldDefaults
colemanw [Sun, 5 Apr 2020 23:39:13 +0000 (19:39 -0400)]
Merge pull request #16991 from pradpnayak/customFieldDefaults

Fix multiselect/checkbox custom field defaults on contribution online form

4 years agoMerge pull request #16981 from colemanw/fixCustom
colemanw [Sun, 5 Apr 2020 23:37:29 +0000 (19:37 -0400)]
Merge pull request #16981 from colemanw/fixCustom

Fix multiselect/checkbox custom field defaults on registration profile

4 years agoFix multiselect/checkbox custom field defaults on contribution online form
Pradeep Nayak [Sun, 5 Apr 2020 21:42:14 +0000 (22:42 +0100)]
Fix multiselect/checkbox custom field defaults on contribution online form

4 years agoCleanup CustomField BAO to use its own isSerialized function rather than guesswork
Coleman Watts [Sun, 5 Apr 2020 20:43:48 +0000 (16:43 -0400)]
Cleanup CustomField BAO to use its own isSerialized function rather than guesswork

4 years agoCleanup custom field handling... twice
Coleman Watts [Sun, 5 Apr 2020 20:25:37 +0000 (16:25 -0400)]
Cleanup custom field handling... twice

4 years agoMerge pull request #16978 from seamuslee001/5.25
Seamus Lee [Sun, 5 Apr 2020 20:17:23 +0000 (06:17 +1000)]
Merge pull request #16978 from seamuslee001/5.25

Add release-notes/5.24.1

4 years agoUpdate custom data handing in contact import
Coleman Watts [Sun, 5 Apr 2020 18:14:14 +0000 (14:14 -0400)]
Update custom data handing in contact import

4 years agoFix values passed to tokenValues hook
Matthew Wire [Mon, 24 Feb 2020 15:30:16 +0000 (15:30 +0000)]
Fix values passed to tokenValues hook

4 years agoCleanup custom field handling in ufGroup BAO
Coleman Watts [Sun, 5 Apr 2020 14:54:44 +0000 (10:54 -0400)]
Cleanup custom field handling in ufGroup BAO

4 years agoFix multiselect/checkbox custom field defaults on registration profile
Coleman Watts [Sun, 5 Apr 2020 14:05:21 +0000 (10:05 -0400)]
Fix multiselect/checkbox custom field defaults on registration profile

The CRM_Core_BAO_UFGroup::setProfileDefaults() function expects each field to be an array,
but this function was just passing it the number 1. So it did not have enough field metadata
to correctly format each value.

4 years agoMerge pull request #16980 from eileenmcnaughton/ex2
colemanw [Sun, 5 Apr 2020 12:51:37 +0000 (08:51 -0400)]
Merge pull request #16980 from eileenmcnaughton/ex2

[REF] Call makeCSVTable function directly from writeRows

4 years agoCustomField - switch statement to use data_type instead of html_type
Coleman Watts [Fri, 3 Apr 2020 17:00:58 +0000 (13:00 -0400)]
CustomField - switch statement to use data_type instead of html_type

4 years agoRemove reference to obsolete field type and simplify statement
Coleman Watts [Fri, 3 Apr 2020 13:38:05 +0000 (09:38 -0400)]
Remove reference to obsolete field type and simplify statement

The history of this section of code is murky but from what I can tell,
this is applying special formatting to checkboxes. So instead of a double-negative conditional
"not field types that are not checkbox" let's just say "if checkbox".

4 years agoMerge pull request #16979 from eileenmcnaughton/cw
Eileen McNaughton [Sun, 5 Apr 2020 05:29:41 +0000 (17:29 +1200)]
Merge pull request #16979 from eileenmcnaughton/cw

Use isSerialized function rather guessing from html_type

4 years agoCall makeCSVTable function directly from writeRows
eileen [Mon, 25 Nov 2019 04:57:39 +0000 (17:57 +1300)]
Call makeCSVTable function directly from writeRows

4 years agoMerge pull request #16966 from demeritcowboy/add-nlbe
Eileen McNaughton [Sun, 5 Apr 2020 03:58:48 +0000 (15:58 +1200)]
Merge pull request #16966 from demeritcowboy/add-nlbe

dev/translation#4 - Add nl_BE language

4 years agoMerge pull request #16970 from colemanw/multi-cleanup2
Eileen McNaughton [Sun, 5 Apr 2020 02:30:22 +0000 (14:30 +1200)]
Merge pull request #16970 from colemanw/multi-cleanup2

[REF] CustomGroup - cleanup handling of serialized fields in old function

4 years agoUse isSerialized function rather guessing from html_type
Coleman Watts [Fri, 3 Apr 2020 14:38:28 +0000 (10:38 -0400)]
Use isSerialized function rather guessing from html_type

4 years agoAdd release-notes/5.24.1
Tim Otten [Sun, 5 Apr 2020 00:50:45 +0000 (17:50 -0700)]
Add release-notes/5.24.1

4 years agoMerge pull request #16975 from colemanw/multi-cleanup3
colemanw [Sat, 4 Apr 2020 13:37:46 +0000 (09:37 -0400)]
Merge pull request #16975 from colemanw/multi-cleanup3

[REF] CustomField - Remove pointless caching and move form variable to form class

4 years agoMerge pull request #16973 from eileenmcnaughton/pan
Seamus Lee [Sat, 4 Apr 2020 03:48:25 +0000 (14:48 +1100)]
Merge pull request #16973 from eileenmcnaughton/pan

Capitalise PAN truncation

4 years agoMerge pull request #16974 from civicrm/5.25
Eileen McNaughton [Sat, 4 Apr 2020 01:29:28 +0000 (14:29 +1300)]
Merge pull request #16974 from civicrm/5.25

5.25

4 years agoCustomField - Remove pointless caching and move form variable to form class
Coleman Watts [Fri, 3 Apr 2020 14:44:39 +0000 (10:44 -0400)]
CustomField - Remove pointless caching and move form variable to form class

4 years agoCustomGroup - Use isSerialized function rather than html_type
Coleman Watts [Fri, 3 Apr 2020 23:57:52 +0000 (19:57 -0400)]
CustomGroup - Use isSerialized function rather than html_type

4 years agoMerge pull request #16971 from totten/5.25-seqcredit
Seamus Lee [Fri, 3 Apr 2020 23:49:28 +0000 (10:49 +1100)]
Merge pull request #16971 from totten/5.25-seqcredit

dev/financial#84 - Fix upgrade failure. Thin-out activation logic for `sequentialcreditnotes`.

4 years agoCapitalise PAN truncation
eileen [Fri, 3 Apr 2020 22:48:29 +0000 (11:48 +1300)]
Capitalise PAN truncation

From chat translation channel:

"Pan truncation" should be written "PAN truncation" for Truncation of the primary account number (credit card number). Now it's obvious to translate!

4 years agoMerge pull request #16969 from seamuslee001/master
Seamus Lee [Fri, 3 Apr 2020 23:05:14 +0000 (10:05 +1100)]
Merge pull request #16969 from seamuslee001/master

[REF] Update XML file to match updated title in DAO File

4 years agodev/financial#84 - Simplify upgrader. Fix "wp-demo" upgrade scenario.
Tim Otten [Fri, 3 Apr 2020 22:22:44 +0000 (15:22 -0700)]
dev/financial#84 - Simplify upgrader. Fix "wp-demo" upgrade scenario.

Steps to reproduce
------------------

* Create a site based on `wp-demo` with Civi 5.21
* Make a DB snapshot
* Update code to 5.24
* In the web UI, run the DB upgrade
    * Note: It's important to use the web UI. The problem does not reproduce in CLI.

Before
------

The upgrader freezes on "Upgrade DB to 5.24.alpha1". The `CiviCRM.log` includes:

```
Apr 03 14:41:50  [info] Running task: Upgrade DB to 5.24.alpha1: SQL

Apr 03 14:41:55  [info] Running task: Install sequential creditnote extension

Apr 03 14:42:14  [info] $CRM_Queue_ErrorPolicy_reportError = Array
(
    [is_error] => 1
    [is_continue] => 0
    [exception] => Error 1: Uncaught Error: Class 'CRM_Volunteer_Permission' not found in /home/me/bknix/build/wpmaster/web/wp-content/plugins/civicrm/civicrm/tools/extensions/civivolunteer/volunteer.php:497
Stack trace:
0 /home/me/bknix/build/wpmaster/web/wp-content/plugins/civicrm/civicrm/CRM/Utils/Hook.php(286): volunteer_civicrm_permission(Array)
1 /home/me/bknix/build/wpmaster/web/wp-content/plugins/civicrm/civicrm/CRM/Utils/Hook/WordPress.php(139): CRM_Utils_Hook->runHooks(Array, 'civicrm_permiss...', 1, Array, NULL, NULL, NULL, NULL, NULL)
2 /home/me/bknix/build/wpmaster/web/wp-content/plugins/civicrm/civicrm/Civi/Core/CiviEventDispatcher.php(86): CRM_Utils_Hook_WordPress->invokeViaUF(1, Array, NULL, NULL, NULL, NULL, NULL, 'civicrm_permiss...')
3 /home/me/bknix/build/wpmaster/web/wp-content/plugins/civicrm/civicrm/vendor/symfony/event-dispatcher/EventDispatcher.php(184): Civi\Core\CiviEventDispatcher::delegateToUF(Object(Civi\Core\Event\GenericHookEvent), 'hook_civicrm_p
    [last_task_title] => Install sequential creditnote extension
)
```

After
-----

The upgrade completes. After installation, the `sequentialcreditnotes` extension is active.

4 years agoCustomGroup - cleanup handling of serialized fields in old function
Coleman Watts [Fri, 3 Apr 2020 21:28:34 +0000 (17:28 -0400)]
CustomGroup - cleanup handling of serialized fields in old function

Use new isSeralized method rather than looking at html_type to figure out how to handle the data

4 years ago[REF] Update XML file to match updated title in DAO File
Seamus Lee [Fri, 3 Apr 2020 20:43:26 +0000 (07:43 +1100)]
[REF] Update XML file to match updated title in DAO File

4 years agoMerge pull request #16965 from colemanw/isset
colemanw [Fri, 3 Apr 2020 19:41:13 +0000 (15:41 -0400)]
Merge pull request #16965 from colemanw/isset

Code cleanup - replace overcomplicated test for null with isset

4 years agoCode cleanup - replace overcomplicated test for null with isset
Coleman Watts [Fri, 3 Apr 2020 15:06:33 +0000 (11:06 -0400)]
Code cleanup - replace overcomplicated test for null with isset

4 years agoMerge pull request #16964 from GuillaumeSorel/patch-1
Mathieu Lu [Fri, 3 Apr 2020 14:55:09 +0000 (10:55 -0400)]
Merge pull request #16964 from GuillaumeSorel/patch-1

Update FinancialTrxn.php

4 years agoUpdate FinancialTrxn.php
Guillaume Sorel [Fri, 3 Apr 2020 11:49:35 +0000 (13:49 +0200)]
Update FinancialTrxn.php

PAN is an acronym for Primary Account Number (credit card number) and writing it full in uppercase will make it more obvious for people to translate as I really wondered even with context what it meant.

4 years agoMerge pull request #16962 from civicrm/5.25
Seamus Lee [Fri, 3 Apr 2020 07:10:58 +0000 (18:10 +1100)]
Merge pull request #16962 from civicrm/5.25

5.25

4 years agoMerge pull request #16961 from MegaphoneJon/core-1688-525
Seamus Lee [Fri, 3 Apr 2020 00:54:34 +0000 (11:54 +1100)]
Merge pull request #16961 from MegaphoneJon/core-1688-525

core#1688 - false positive on missing custom field check

4 years agocore#1688 - false positive on missing custom field check
Jon Goldberg [Thu, 2 Apr 2020 18:07:33 +0000 (14:07 -0400)]
core#1688 - false positive on missing custom field check

4 years agoadd nl_BE language
demeritcowboy [Thu, 2 Apr 2020 21:59:21 +0000 (17:59 -0400)]
add nl_BE language

4 years agoMerge pull request #16700 from christianwach/lab-1635
Matthew Wire [Thu, 2 Apr 2020 17:36:44 +0000 (18:36 +0100)]
Merge pull request #16700 from christianwach/lab-1635

Fix WordPress support for Get UF Locale

4 years agoMove generic preProcess function to the trait
eileen [Tue, 31 Mar 2020 22:32:39 +0000 (11:32 +1300)]
Move generic preProcess function to the trait

This is still overriden on the contact email.

4 years agodev/core#1685 - Search builder returns DB error on Group => Empty condition
Jitendra Purohit [Thu, 2 Apr 2020 07:17:23 +0000 (12:47 +0530)]
dev/core#1685 - Search builder returns DB error on Group => Empty condition

4 years agoSet version to 5.26.alpha1
CiviCRM [Thu, 2 Apr 2020 05:33:20 +0000 (05:33 +0000)]
Set version to 5.26.alpha1

4 years agoSet version to 5.25.beta1
CiviCRM [Thu, 2 Apr 2020 05:26:58 +0000 (05:26 +0000)]
Set version to 5.25.beta1

4 years agoMerge pull request #16753 from agh1/consolidated-php-version
Tim Otten [Thu, 2 Apr 2020 04:57:15 +0000 (21:57 -0700)]
Merge pull request #16753 from agh1/consolidated-php-version

dev/core#1528 - Consolidate to single constant for minimum PHP version

4 years agoCRM_Report_DAO_ReportInstance - Update checksum
Tim Otten [Thu, 2 Apr 2020 04:21:07 +0000 (21:21 -0700)]
CRM_Report_DAO_ReportInstance - Update checksum

4 years agoMerge pull request #16948 from eileenmcnaughton/email4
Tim Otten [Thu, 2 Apr 2020 04:14:16 +0000 (21:14 -0700)]
Merge pull request #16948 from eileenmcnaughton/email4

[REF] move buildQuickForm function to the trait

4 years agoMerge pull request #16951 from colemanw/dirtyMoney
Tim Otten [Thu, 2 Apr 2020 04:11:58 +0000 (21:11 -0700)]
Merge pull request #16951 from colemanw/dirtyMoney

Revert "APIv4 - Fix contribution create"

4 years agoRevert "APIv4 - Fix contribution create"
Coleman Watts [Thu, 2 Apr 2020 01:21:10 +0000 (21:21 -0400)]
Revert "APIv4 - Fix contribution create"

This reverts commit 2f97c5641cceec44c02585c2d1d212bda1c6228e.
It should no longer be needed due to the improvement made in 243320eda23195985815ceb65ec7ee9079ae3014.

4 years agoMerge pull request #16950 from eileenmcnaughton/clean_money
Seamus Lee [Thu, 2 Apr 2020 00:40:14 +0000 (11:40 +1100)]
Merge pull request #16950 from eileenmcnaughton/clean_money

Remove  deprecated cleaning  of money in  the  BAO layer

4 years agoRemove deprecated cleaning of money in the BAO layer
eileen [Wed, 1 Apr 2020 23:01:00 +0000 (12:01 +1300)]
Remove  deprecated cleaning  of money in  the  BAO layer

Any code that  passed dirty money  to the Contribution::create BAO will  have been seeing
deprecation notices  for  some time.  The  supported method is via the  api & v3 api does  the cleaning
whereas  v4 expects it to be pre-cleaned  - perhaps it's time to remove  this & leave it to  the
calling code

4 years agoMerge pull request #16947 from colemanw/groupByFunctions
Eileen McNaughton [Wed, 1 Apr 2020 22:57:04 +0000 (11:57 +1300)]
Merge pull request #16947 from colemanw/groupByFunctions

APIv4 - Support GROUP BY and aggregate functions

4 years agoMerge pull request #16943 from jitendrapurohit/core-1682
Eileen McNaughton [Wed, 1 Apr 2020 22:33:31 +0000 (11:33 +1300)]
Merge pull request #16943 from jitendrapurohit/core-1682

dev/core#1682 - Invalid currency  on sending offline membership receipt.

4 years agoMerge pull request #16919 from jaapjansma/dev-1674
Tim Otten [Wed, 1 Apr 2020 22:06:31 +0000 (15:06 -0700)]
Merge pull request #16919 from jaapjansma/dev-1674

dev/core#1674: fix rebuilding of container on every request

4 years ago(REF) CRM_Api4_Services - Cleanup extra comment/try/catch
Tim Otten [Wed, 1 Apr 2020 22:03:33 +0000 (15:03 -0700)]
(REF) CRM_Api4_Services - Cleanup extra comment/try/catch

4 years ago[REF] move buildQuickForm function to the trait
eileen [Tue, 31 Mar 2020 22:19:44 +0000 (11:19 +1300)]
[REF] move buildQuickForm function to the trait

Note that Contact had an extra assign. It seems likely the  extra  assign  is not required  but it
would not be a bad thing on the others