civicrm-core.git
5 years agoMerge pull request #15805 from eileenmcnaughton/cont_urls
Eileen McNaughton [Mon, 11 Nov 2019 04:32:23 +0000 (17:32 +1300)]
Merge pull request #15805 from eileenmcnaughton/cont_urls

[REF] extract setDeprecatedDefaults

5 years agoMerge pull request #15802 from eileenmcnaughton/complete_order_to_calling
Seamus Lee [Mon, 11 Nov 2019 03:27:41 +0000 (14:27 +1100)]
Merge pull request #15802 from eileenmcnaughton/complete_order_to_calling

Test fixes - addresses more invalid setup data

5 years agoMerge pull request #15799 from eileenmcnaughton/valid
Seamus Lee [Mon, 11 Nov 2019 03:26:26 +0000 (14:26 +1100)]
Merge pull request #15799 from eileenmcnaughton/valid

FinancialTrxnTest - Fix unit test to  be 'legit'

5 years agoMerge pull request #15808 from civicrm/5.20
Eileen McNaughton [Mon, 11 Nov 2019 03:23:31 +0000 (16:23 +1300)]
Merge pull request #15808 from civicrm/5.20

5.20

5 years agoMerge pull request #15804 from eileenmcnaughton/fns
Seamus Lee [Mon, 11 Nov 2019 03:19:01 +0000 (14:19 +1100)]
Merge pull request #15804 from eileenmcnaughton/fns

dev/core#1381 fix fatal on case search (unreleased regression

5 years agoMerge pull request #15795 from seamuslee001/dev_core_183_mailing_test
Seamus Lee [Mon, 11 Nov 2019 03:15:01 +0000 (14:15 +1100)]
Merge pull request #15795 from seamuslee001/dev_core_183_mailing_test

dev/core#183 Convert creating of temp table in mailing test to use st…

5 years ago[REF] extract setDeprecatedDefaults
eileen [Mon, 11 Nov 2019 02:13:03 +0000 (15:13 +1300)]
[REF] extract setDeprecatedDefaults

5 years agodev/core#1381 fix fatal on case search (unreleased regression
eileen [Mon, 11 Nov 2019 02:03:50 +0000 (15:03 +1300)]
dev/core#1381 fix fatal on case search (unreleased regression

5 years agodev/core#183 Convert creating of temp table in mailing test to use standardised CRM_U...
Seamus Lee [Sun, 10 Nov 2019 19:51:04 +0000 (06:51 +1100)]
dev/core#183 Convert creating of temp table in mailing test to use standardised CRM_Utils_SQL_TempTable interface

5 years agoFix data to be valid for one of the a.net tests
eileen [Sun, 10 Nov 2019 23:46:09 +0000 (12:46 +1300)]
Fix data to be valid for one of the a.net tests

The tests were munging the line items in set up - this fixes it - but only for one so far

5 years agoMerge pull request #15801 from eileenmcnaughton/format
Eileen McNaughton [Mon, 11 Nov 2019 00:47:47 +0000 (13:47 +1300)]
Merge pull request #15801 from eileenmcnaughton/format

[NFC] reformat CiviUnitTestCase.php

5 years agoFix unit test to be 'legit'
eileen [Sun, 10 Nov 2019 21:23:13 +0000 (10:23 +1300)]
Fix unit test to  be 'legit'

This unit test is one of a bunch that came up as not creating valid payments. The issue is
in the test set up methodology (the 'partial_payment_to_pay' key doesn't work).

On tidying up the test proved to be mostly cruft from an earlier iteration

5 years agoMerge pull request #15798 from seamuslee001/dev_core_183_imports_2
Seamus Lee [Sun, 10 Nov 2019 23:10:04 +0000 (10:10 +1100)]
Merge pull request #15798 from seamuslee001/dev_core_183_imports_2

dev/core#183 Convert database testing to use CRM_Utils_SQL_TempTable …

5 years ago[NFC] reformat CiviUnitTestCase.php
eileen [Sun, 10 Nov 2019 22:57:37 +0000 (11:57 +1300)]
[NFC] reformat CiviUnitTestCase.php

5 years agodev/core#183 Convert database testing to use CRM_Utils_SQL_TempTable fuctionality...
Seamus Lee [Sun, 10 Nov 2019 20:15:15 +0000 (07:15 +1100)]
dev/core#183 Convert database testing to use CRM_Utils_SQL_TempTable fuctionality and remove Incomplete Jobs handling as it is not called

5 years agoMerge pull request #15790 from civicrm/5.20
Seamus Lee [Sat, 9 Nov 2019 07:04:00 +0000 (18:04 +1100)]
Merge pull request #15790 from civicrm/5.20

5.20

5 years agoMerge pull request #15787 from eileenmcnaughton/recur_ug
Seamus Lee [Sat, 9 Nov 2019 05:30:13 +0000 (16:30 +1100)]
Merge pull request #15787 from eileenmcnaughton/recur_ug

Remove unhelpful alert from contribution search

5 years agoMerge pull request #15665 from MikeyMJCO/patch-1
Tim Otten [Sat, 9 Nov 2019 04:37:40 +0000 (20:37 -0800)]
Merge pull request #15665 from MikeyMJCO/patch-1

Create a GitLab general issue template

5 years agoMerge pull request #15789 from seamuslee001/5_19_1_version_notes
Seamus Lee [Sat, 9 Nov 2019 02:57:37 +0000 (13:57 +1100)]
Merge pull request #15789 from seamuslee001/5_19_1_version_notes

5.19.1 Version Release Notes

5 years agoMerge pull request #15783 from eileenmcnaughton/sort_id
Seamus Lee [Sat, 9 Nov 2019 02:44:17 +0000 (13:44 +1100)]
Merge pull request #15783 from eileenmcnaughton/sort_id

[REF] replace copy & paste with shared getSortID function.

5 years agoUpdate 5.19.1.md
Tim Otten [Sat, 9 Nov 2019 02:32:54 +0000 (18:32 -0800)]
Update 5.19.1.md

5 years agoAdd in release notes for 5.19.1 drop
Seamus Lee [Sat, 9 Nov 2019 01:39:44 +0000 (12:39 +1100)]
Add in release notes for 5.19.1 drop

5 years agoMerge pull request #15786 from eileenmcnaughton/cont_type
Seamus Lee [Sat, 9 Nov 2019 01:41:50 +0000 (12:41 +1100)]
Merge pull request #15786 from eileenmcnaughton/cont_type

Remove obsolete warning

5 years agoRemove unhelpful alert from contribution search
eileen [Sat, 9 Nov 2019 01:12:20 +0000 (14:12 +1300)]
Remove unhelpful alert from contribution search

5 years ago[REF] replace copy & paste with shared getSortID function.
eileen [Fri, 8 Nov 2019 22:59:41 +0000 (11:59 +1300)]
[REF] replace copy & paste with shared getSortID function.

I've replaced this repetitive code chunk across the forms that inherit from CRM_Core_Form_Search

5 years agoMerge pull request #15784 from civicrm/5.20
Eileen McNaughton [Sat, 9 Nov 2019 00:48:25 +0000 (13:48 +1300)]
Merge pull request #15784 from civicrm/5.20

5.20

5 years agoRemove obsolete warning
eileen [Sat, 9 Nov 2019 00:46:37 +0000 (13:46 +1300)]
Remove obsolete warning

The time has come to let this one go.....

5 years agoMerge pull request #15781 from eileenmcnaughton/cont_search
Seamus Lee [Sat, 9 Nov 2019 00:37:51 +0000 (11:37 +1100)]
Merge pull request #15781 from eileenmcnaughton/cont_search

dev/core#1374 Fix search formValue handling on contribution search

5 years agoMerge pull request #15782 from seamuslee001/dev_mailing_56_2
Seamus Lee [Fri, 8 Nov 2019 23:58:17 +0000 (10:58 +1100)]
Merge pull request #15782 from seamuslee001/dev_mailing_56_2

Add in unit test for dev/mailing#56 and dev/mailing#57 and also fix i…

5 years agodev/core#1374 Fix search formValue handling on contribution search
eileen [Fri, 8 Nov 2019 21:42:00 +0000 (10:42 +1300)]
dev/core#1374 Fix search formValue handling on contribution search

This fixes 2 issues
1) Search params being lost when editing a related entity per
https://lab.civicrm.org/dev/core/issues/1374
2) force=1&sort_name=p not working in contribution search url

In digging I concluded the problem is we have 3 underlying arrays which we keep jumbling together

1) formValues - the actual submitted values, augmented by any  url passed params
2) the default values - values to load by default on the form
3) our working query params - a copy of formValues that we have prepared for the query

We need to stop mangling them. I added subtle code comments

5 years agoMerge pull request #15777 from eileenmcnaughton/format
Seamus Lee [Fri, 8 Nov 2019 23:47:26 +0000 (10:47 +1100)]
Merge pull request #15777 from eileenmcnaughton/format

[NFC] Reformat Contact_Form_Search_Advanced

5 years agoAdd in unit test for dev/mailing#56 and dev/mailing#57 and also fix issue where by...
Seamus Lee [Fri, 8 Nov 2019 22:40:22 +0000 (09:40 +1100)]
Add in unit test for dev/mailing#56 and dev/mailing#57 and also fix issue where by mailing_name has been namespaced also in 5.20

5 years agoMerge pull request #15779 from seamuslee001/dev_mailing_56
Seamus Lee [Fri, 8 Nov 2019 22:35:25 +0000 (09:35 +1100)]
Merge pull request #15779 from seamuslee001/dev_mailing_56

dev/mailing#56 dev/mailing#57 Ensure that we don't pass in any namesp…

5 years agoMerge pull request #15773 from civicrm/5.20
Eileen McNaughton [Fri, 8 Nov 2019 22:12:58 +0000 (11:12 +1300)]
Merge pull request #15773 from civicrm/5.20

5.20

5 years ago[NFC] Reformat Contact_Form_Search_Advanced
eileen [Fri, 8 Nov 2019 21:03:45 +0000 (10:03 +1300)]
[NFC] Reformat Contact_Form_Search_Advanced

Fix array style

5 years agoMerge pull request #15775 from seamuslee001/convert_fatal_to_error_system_cache
Seamus Lee [Fri, 8 Nov 2019 21:57:56 +0000 (08:57 +1100)]
Merge pull request #15775 from seamuslee001/convert_fatal_to_error_system_cache

Converts using deprecated fatal function for exception in CRM/Utils/Sys…

5 years agoMerge pull request #15776 from eileenmcnaughton/url_params
Seamus Lee [Fri, 8 Nov 2019 21:45:39 +0000 (08:45 +1100)]
Merge pull request #15776 from eileenmcnaughton/url_params

[NFC] comment fixes - exceptions & don't declare NULL

5 years agodev/mailing#56 dev/mailing#57 Ensure that we don't pass in any namespaced fields...
Seamus Lee [Fri, 8 Nov 2019 21:27:41 +0000 (08:27 +1100)]
dev/mailing#56 dev/mailing#57 Ensure that we don't pass in any namespaced fields when building the row array for mailing reports

5 years agoMerge pull request #15774 from seamuslee001/eileen_ts_15770
Seamus Lee [Fri, 8 Nov 2019 21:07:52 +0000 (08:07 +1100)]
Merge pull request #15774 from seamuslee001/eileen_ts_15770

Add in translation function around newly converted statusBounce messages

5 years agoConverts using deprated fatal function for exception in CRM/Utils/System and in CRM...
Seamus Lee [Fri, 8 Nov 2019 20:31:57 +0000 (07:31 +1100)]
Converts using deprated fatal function for exception in CRM/Utils/System and in CRM/Utils/Cache and changes default for retrieve function in the Request class to throw exceptions

Update doc blocks

5 years ago[NFC] comment fixes - exceptions & don't declare NULL
eileen [Fri, 8 Nov 2019 20:50:01 +0000 (09:50 +1300)]
[NFC] comment fixes - exceptions & don't declare NULL

5 years agoAdd in translation function around newly converted statusBounce messages
Seamus Lee [Fri, 8 Nov 2019 20:18:55 +0000 (07:18 +1100)]
Add in translation function around newly converted statusBounce messages

5 years agoMerge pull request #15770 from eileenmcnaughton/except
Seamus Lee [Fri, 8 Nov 2019 20:14:23 +0000 (07:14 +1100)]
Merge pull request #15770 from eileenmcnaughton/except

Swap some fatals on form & page classes for statusBounces

5 years agoMerge pull request #15772 from agh1/5.20.0-releasenotes-initial
Seamus Lee [Fri, 8 Nov 2019 20:09:25 +0000 (07:09 +1100)]
Merge pull request #15772 from agh1/5.20.0-releasenotes-initial

5.20.0 release notes initial run

5 years ago5.20.0 release notes: added boilerplate
Andrew Hunt [Fri, 8 Nov 2019 17:26:55 +0000 (12:26 -0500)]
5.20.0 release notes: added boilerplate

5 years ago5.20.0 release notes: raw from script
Andrew Hunt [Fri, 8 Nov 2019 17:21:30 +0000 (12:21 -0500)]
5.20.0 release notes: raw from script

5 years agoMerge pull request #15757 from yashodha/participant_edit
Yashodha Chaku [Fri, 8 Nov 2019 08:29:51 +0000 (13:59 +0530)]
Merge pull request #15757 from yashodha/participant_edit

(dev/core#1065) Contribution in Edit mode needs to be shown consistently

5 years agoSwap some fatals on form & page classes for statusBounces
eileen [Fri, 8 Nov 2019 07:50:45 +0000 (20:50 +1300)]
Swap some fatals on form & page classes for statusBounces

5 years agoMerge pull request #15769 from seamuslee001/mathieu_shared_address_improvement
Seamus Lee [Fri, 8 Nov 2019 06:18:52 +0000 (17:18 +1100)]
Merge pull request #15769 from seamuslee001/mathieu_shared_address_improvement

Improve link title in shared address as per Mathieu

5 years agoImprove link title in shared address as per Mathieu
Seamus Lee [Fri, 8 Nov 2019 05:09:12 +0000 (16:09 +1100)]
Improve link title in shared address as per Mathieu

5 years agoMerge pull request #15666 from revati90/shared_address
Seamus Lee [Fri, 8 Nov 2019 05:07:02 +0000 (16:07 +1100)]
Merge pull request #15666 from revati90/shared_address

modified shared address note under contact dashboard

5 years agoMerge pull request #15768 from civicrm/5.20
Eileen McNaughton [Fri, 8 Nov 2019 02:20:25 +0000 (15:20 +1300)]
Merge pull request #15768 from civicrm/5.20

5.20 to master

5 years agoMerge pull request #15765 from seamuslee001/5.20
Eileen McNaughton [Fri, 8 Nov 2019 02:19:21 +0000 (15:19 +1300)]
Merge pull request #15765 from seamuslee001/5.20

dev/core#1376 Catch Invalid Argument Exception when looking for APIv4…

5 years agoMerge pull request #15764 from civicrm/5.20
Seamus Lee [Thu, 7 Nov 2019 23:36:13 +0000 (10:36 +1100)]
Merge pull request #15764 from civicrm/5.20

5.20

5 years agoMerge pull request #15761 from eileenmcnaughton/cache_stuffed
Seamus Lee [Thu, 7 Nov 2019 23:35:53 +0000 (10:35 +1100)]
Merge pull request #15761 from eileenmcnaughton/cache_stuffed

Fix cachekey string

5 years agodev/core#1376 Catch Invalid Argument Exception when looking for APIv4 Services
Seamus Lee [Thu, 7 Nov 2019 23:07:32 +0000 (10:07 +1100)]
dev/core#1376 Catch Invalid Argument Exception when looking for APIv4 Services

5 years agoMerge pull request #15248 from MegaphoneJon/reporting-19
Seamus Lee [Thu, 7 Nov 2019 21:03:24 +0000 (08:03 +1100)]
Merge pull request #15248 from MegaphoneJon/reporting-19

reporting#19 - Performance improvements on report display/export

5 years agoMerge pull request #15762 from seamuslee001/dev_core_1371
Seamus Lee [Thu, 7 Nov 2019 20:47:49 +0000 (07:47 +1100)]
Merge pull request #15762 from seamuslee001/dev_core_1371

dev/core#1371 Fix e-notice caused by trying to pass in known  to the …

5 years agodev/core#1371 Fix e-notice caused by trying to pass in known to the extension downlo...
Seamus Lee [Thu, 7 Nov 2019 19:25:55 +0000 (06:25 +1100)]
dev/core#1371 Fix e-notice caused by trying to pass in known  to the extension downloader when checking requirements

5 years agoMerge pull request #15758 from yashodha/contributors
Seamus Lee [Thu, 7 Nov 2019 19:19:48 +0000 (06:19 +1100)]
Merge pull request #15758 from yashodha/contributors

add contributor name

5 years agoMerge pull request #15595 from eileenmcnaughton/dedupe3
Seamus Lee [Thu, 7 Nov 2019 19:19:06 +0000 (06:19 +1100)]
Merge pull request #15595 from eileenmcnaughton/dedupe3

dev/core#1339 Dedupe screen check to carry across any data where the other contact has none by default.

5 years agoFix cachekey string
eileen [Thu, 7 Nov 2019 19:18:38 +0000 (08:18 +1300)]
Fix cachekey string

I hit a bug (in a unit test) where a user without permissions to access custom data would do a
check_permissions api call followed by a check_permissions = 0 call. In the second call
custom fields were not returned
as they were already excluded from the cached key.

5 years agoMerge pull request #1 from totten/MikeyMJCO-patch-1
Mikey O'Toole [Thu, 7 Nov 2019 09:58:02 +0000 (09:58 +0000)]
Merge pull request #1 from totten/MikeyMJCO-patch-1

Proposed updates to Gitlab issue template

5 years agoIssue template - Add "improvement.md"
Tim Otten [Thu, 7 Nov 2019 07:23:03 +0000 (23:23 -0800)]
Issue template - Add "improvement.md"

This is basically the same as the bug-report template, except:

* "Reproduction steps" become "Example use-case"
* "Environment" is removed - because it's not usually a factor. (And if it is,
  it's generally explicit part of the requirements.)

5 years agoIssue template - More consistent punctuation
Tim Otten [Thu, 7 Nov 2019 07:20:26 +0000 (23:20 -0800)]
Issue template - More consistent punctuation

* End comment-placeholder with period, like in other comment-placeholders
* Remove colons from titles - don't think we do that anywhere else

5 years agoIssue template - Small tweak
Tim Otten [Thu, 7 Nov 2019 07:15:27 +0000 (23:15 -0800)]
Issue template - Small tweak

5 years agoIssue template - Rename "general-bug-or-issue" to "problem"
Tim Otten [Thu, 7 Nov 2019 07:01:32 +0000 (23:01 -0800)]
Issue template - Rename "general-bug-or-issue" to "problem"

Because... fewer words

5 years agoIssue template - Move error-msg block from "Reproduction steps" to "Current behavior"
Tim Otten [Thu, 7 Nov 2019 06:57:22 +0000 (22:57 -0800)]
Issue template - Move error-msg block from "Reproduction steps" to "Current behavior"

5 years agoIssue template - No screenshot for expected behavior
Tim Otten [Thu, 7 Nov 2019 06:44:04 +0000 (22:44 -0800)]
Issue template - No screenshot for expected behavior

The "Expected Behavior" is specifically what the system does *not* do, so...
it might be hard to give a screenshot of that...

5 years agoIssue template - For triple `, use multiline
Tim Otten [Thu, 7 Nov 2019 06:40:55 +0000 (22:40 -0800)]
Issue template - For triple `, use multiline

5 years agoIssue template - Update "Environment"; combine type+version fields
Tim Otten [Thu, 7 Nov 2019 06:36:27 +0000 (22:36 -0800)]
Issue template - Update "Environment"; combine type+version fields

We want "versions" for everything. Making separate lines for the version just makes it bit
harder to write (you have to remove more things) and to read (you have to skim more lines).

Changes:

* Combine "CMS/CMS Version"
* Combine "Database/Database Version"
* For "Web Server", also include version.
* Add "PHP"

5 years agoadd contributor name
yashodha [Thu, 7 Nov 2019 06:34:52 +0000 (12:04 +0530)]
add contributor name

5 years ago(dev/core#1065) Contribution in Edit mode needs to be shown consistently
yashodha [Thu, 7 Nov 2019 06:12:44 +0000 (11:42 +0530)]
(dev/core#1065) Contribution in Edit mode needs to be shown consistently

5 years agomodified shared address note
Revati Gawas [Thu, 7 Nov 2019 06:09:37 +0000 (11:39 +0530)]
modified shared address note

5 years agoMerge pull request #15755 from seamuslee001/copywrite_date_update
Seamus Lee [Thu, 7 Nov 2019 03:49:36 +0000 (14:49 +1100)]
Merge pull request #15755 from seamuslee001/copywrite_date_update

[NFC] Update copyright date for 2020

5 years agoMerge pull request #15739 from eileenmcnaughton/dompdf
Seamus Lee [Thu, 7 Nov 2019 03:14:57 +0000 (14:14 +1100)]
Merge pull request #15739 from eileenmcnaughton/dompdf

Update dompdf (0.8.0=>0.8.3) & dependencies

5 years ago[NFC] Style Fix Prepare Event
Seamus Lee [Thu, 7 Nov 2019 02:44:44 +0000 (13:44 +1100)]
[NFC] Style Fix Prepare Event

5 years ago(NFC) Style fixups
Tim Otten [Thu, 7 Nov 2019 02:30:55 +0000 (18:30 -0800)]
(NFC) Style fixups

5 years agoUpdate copyright date for 2020
Seamus Lee [Thu, 7 Nov 2019 02:16:10 +0000 (13:16 +1100)]
Update copyright date for 2020

5 years agoSet version to 5.21.alpha1
CiviCRM [Thu, 7 Nov 2019 02:15:34 +0000 (02:15 +0000)]
Set version to 5.21.alpha1

5 years agoSet version to 5.20.beta1
CiviCRM [Thu, 7 Nov 2019 02:11:34 +0000 (02:11 +0000)]
Set version to 5.20.beta1

5 years agoMerge pull request #15754 from seamuslee001/master
Seamus Lee [Thu, 7 Nov 2019 01:44:11 +0000 (12:44 +1100)]
Merge pull request #15754 from seamuslee001/master

5.19

5 years agoMerge in 5.19
Seamus Lee [Thu, 7 Nov 2019 01:43:35 +0000 (12:43 +1100)]
Merge in 5.19

5 years agoSet version to 5.19.0
Tim Otten [Thu, 7 Nov 2019 01:39:32 +0000 (17:39 -0800)]
Set version to 5.19.0

5 years agoMerge pull request #15752 from agh1/5.19.0-releasenotes-final
Tim Otten [Thu, 7 Nov 2019 01:32:18 +0000 (17:32 -0800)]
Merge pull request #15752 from agh1/5.19.0-releasenotes-final

5.19.0 release notes: added late changes

5 years agoUpdate 5.19.0.md
Tim Otten [Thu, 7 Nov 2019 01:31:27 +0000 (17:31 -0800)]
Update 5.19.0.md

5 years agoMerge pull request #15751 from magnolia61/workflow_template_contribution_terms
Eileen McNaughton [Thu, 7 Nov 2019 01:26:14 +0000 (14:26 +1300)]
Merge pull request #15751 from magnolia61/workflow_template_contribution_terms

changed wording to Total Fee & Total Paid

5 years ago5.19.0 release notes: added late changes
Andrew Hunt [Thu, 7 Nov 2019 01:16:33 +0000 (20:16 -0500)]
5.19.0 release notes: added late changes

5 years agoMerge pull request #15748 from eileenmcnaughton/line_item_belt_braces
Eileen McNaughton [Thu, 7 Nov 2019 01:02:14 +0000 (14:02 +1300)]
Merge pull request #15748 from eileenmcnaughton/line_item_belt_braces

Provide precautionary handling for theoretical error scenario.

5 years agochanged wording to Total Fee & Total Paid
magnolia61 [Wed, 6 Nov 2019 23:38:40 +0000 (00:38 +0100)]
changed wording to Total Fee & Total Paid

5 years agoProvide precautionary handling for theoretical error scenario.
eileen [Wed, 6 Nov 2019 19:40:37 +0000 (08:40 +1300)]
Provide precautionary handling for theoretical error scenario.

While testing payments I hit a bug where I tried to add a payment to a contribution with no financial items.

I never managed to replicate it again or determine how the payment came to be in that state but
it's been playing in my mind that people could get fatal errors if the financial_items don't exist
and dealing with those as regression reports will very tough. So my plan is
- for 5.20 add this extra routine to create it if it does not exist
- use this mechanism + more digging to figure out how legit an issue it is https://github.com/civicrm/civicrm-core/pull/15706
- in future releases 'get noisy' about having to create them if they don't exist
- eventually remove this routine

5 years agoMerge pull request #15740 from eileenmcnaughton/partial
Seamus Lee [Wed, 6 Nov 2019 23:23:44 +0000 (10:23 +1100)]
Merge pull request #15740 from eileenmcnaughton/partial

dev/financial#40 Fix for non-allocation of payment to fully reversed checkboxes option

5 years agoMerge pull request #15745 from seamuslee001/master
Eileen McNaughton [Wed, 6 Nov 2019 22:07:34 +0000 (11:07 +1300)]
Merge pull request #15745 from seamuslee001/master

Update template upgrade list as per PR #15742

5 years agoMerge pull request #15750 from eileenmcnaughton/except
Eileen McNaughton [Wed, 6 Nov 2019 21:06:22 +0000 (10:06 +1300)]
Merge pull request #15750 from eileenmcnaughton/except

[NFC] Cleanup on exceptions

5 years agoMerge pull request #15744 from yashodha/participant_edit
Eileen McNaughton [Wed, 6 Nov 2019 21:04:13 +0000 (10:04 +1300)]
Merge pull request #15744 from yashodha/participant_edit

(dev/core#1065) Participant in Edit mode needs to be shown consistently

5 years agoMerge pull request #15749 from seamuslee001/Additional_Fixes_to_workflow_templates
Seamus Lee [Wed, 6 Nov 2019 20:56:27 +0000 (07:56 +1100)]
Merge pull request #15749 from seamuslee001/Additional_Fixes_to_workflow_templates

Additional fixes to workflow templates

5 years agoUpdate template upgrade list as per PR #15742
Seamus Lee [Wed, 6 Nov 2019 18:43:57 +0000 (05:43 +1100)]
Update template upgrade list as per PR #15742

5 years agoCleanup on exceptions
eileen [Wed, 6 Nov 2019 20:09:51 +0000 (09:09 +1300)]
Cleanup on exceptions

Fixes a low level function to throw a CRM_Core_Exception & tidies up functions
above to specify that. Fixes casing on a function call, removes a fatal
for status bounce

5 years agoFix Smarty Syntax in payment_or_refund_notification_text template and update unit...
Seamus Lee [Wed, 6 Nov 2019 19:44:21 +0000 (06:44 +1100)]
Fix Smarty Syntax in payment_or_refund_notification_text template and update unit tests to match the change in langauge in the templates

5 years agoMerge pull request #15746 from civicrm/5.19
Eileen McNaughton [Wed, 6 Nov 2019 19:29:45 +0000 (08:29 +1300)]
Merge pull request #15746 from civicrm/5.19

5.19