civicrm-core.git
6 years ago(NFC) make (includes taxes) translation work
Samuel Vanhove [Tue, 3 Apr 2018 20:49:48 +0000 (16:49 -0400)]
(NFC) make (includes taxes) translation work

6 years agoMerge pull request #11885 from eileenmcnaughton/report_filter_eq
colemanw [Tue, 3 Apr 2018 13:03:38 +0000 (09:03 -0400)]
Merge pull request #11885 from eileenmcnaughton/report_filter_eq

Handle eq (equals) operator in the report url

6 years agoMerge pull request #11921 from civicrm/5.0
Eileen McNaughton [Mon, 2 Apr 2018 19:30:28 +0000 (07:30 +1200)]
Merge pull request #11921 from civicrm/5.0

5.0 merge to master

6 years agoMerge pull request #11917 from eileenmcnaughton/cont_report
Eileen McNaughton [Mon, 2 Apr 2018 19:28:39 +0000 (07:28 +1200)]
Merge pull request #11917 from eileenmcnaughton/cont_report

CRM-21831 & dev/report/issues/1 Fix regressions in contribution detail report relating to soft credits

6 years agoMerge pull request #11919 from eileenmcnaughton/top
Eileen McNaughton [Mon, 2 Apr 2018 19:27:50 +0000 (07:27 +1200)]
Merge pull request #11919 from eileenmcnaughton/top

Fix fatal on topDonor report

6 years agoMerge pull request #11918 from eileenmcnaughton/export
Monish Deb [Mon, 2 Apr 2018 10:53:34 +0000 (16:23 +0530)]
Merge pull request #11918 from eileenmcnaughton/export

Extract fetchRelationshipDetails function

6 years agoFix fatal on topDonor report
eileen [Mon, 2 Apr 2018 08:46:09 +0000 (20:46 +1200)]
Fix fatal on topDonor report

6 years agoMerge pull request #11814 from eileenmcnaughton/report
Yashodha Chaku [Mon, 2 Apr 2018 04:25:30 +0000 (09:55 +0530)]
Merge pull request #11814 from eileenmcnaughton/report

CRM-21677 - Report improvements

6 years agoExtract fetchRelationshipDetails function
eileen [Sun, 1 Apr 2018 23:17:36 +0000 (11:17 +1200)]
Extract fetchRelationshipDetails function

6 years agoMerge pull request #11914 from seamuslee001/CRM-21244-doc
Eileen McNaughton [Sun, 1 Apr 2018 22:51:46 +0000 (10:51 +1200)]
Merge pull request #11914 from seamuslee001/CRM-21244-doc

CRM-21244 Update documetnation so it makes sense when setting is disabled

6 years agoFix bugs in contribution detail report relating to soft credits
eileen [Sun, 1 Apr 2018 22:36:01 +0000 (10:36 +1200)]
Fix bugs in contribution detail report relating to soft credits

6 years agoMerge pull request #11915 from civicrm/5.0
Eileen McNaughton [Sun, 1 Apr 2018 21:52:11 +0000 (09:52 +1200)]
Merge pull request #11915 from civicrm/5.0

5.0

6 years agoMerge pull request #11906 from JMAConsulting/dev-42
Eileen McNaughton [Sun, 1 Apr 2018 21:50:04 +0000 (09:50 +1200)]
Merge pull request #11906 from JMAConsulting/dev-42

(dev/mail/6) On multilingual mode, choosing mailing group doesn't affect recipient count and list

6 years agoMerge pull request #11905 from seamuslee001/CRM-21244-consistancy
Monish Deb [Sun, 1 Apr 2018 11:57:37 +0000 (17:27 +0530)]
Merge pull request #11905 from seamuslee001/CRM-21244-consistancy

CRM-21244 Ensure consistancy with previous behavior where user emails …

6 years agoMerge pull request #11909 from mattwire/membershiptype_comments
Seamus Lee [Sun, 1 Apr 2018 04:12:52 +0000 (14:12 +1000)]
Merge pull request #11909 from mattwire/membershiptype_comments

NFC Minor comments cleanup on MembershipType

6 years agoMerge pull request #11668 from elisseck/CRM-21763
Seamus Lee [Sat, 31 Mar 2018 22:26:06 +0000 (08:26 +1000)]
Merge pull request #11668 from elisseck/CRM-21763

CRM-21763 Util to subtract currencies using integers for precision

6 years agoMerge pull request #11911 from JMAConsulting/dev-7
Seamus Lee [Sat, 31 Mar 2018 22:08:58 +0000 (08:08 +1000)]
Merge pull request #11911 from JMAConsulting/dev-7

(dev/mail/7) On 'New Mailing' review page, it doesn't show recipients count

6 years agoUpdate documetnation so it makes sense when setting is disabled
Seamus Lee [Sat, 31 Mar 2018 21:27:27 +0000 (07:27 +1000)]
Update documetnation so it makes sense when setting is disabled

6 years agoCRM-2144 Ensure consistancy with previous behavior where user emails are first then...
Seamus Lee [Sat, 31 Mar 2018 00:23:57 +0000 (11:23 +1100)]
CRM-2144 Ensure consistancy with previous behavior where user emails are first then system from emails.

Add unit test to try to verify order of emails

Fix issue where email was not being used as array key causing wrong email to be used

6 years ago(dev/mail/7) On 'New Mailing' review page, it doesn't show recipients count
deb.monish [Sat, 31 Mar 2018 11:58:02 +0000 (17:28 +0530)]
(dev/mail/7) On 'New Mailing' review page, it doesn't show recipients count

6 years ago(dev/mail/6) On multilingual mode, choosing mailing group doesn't affect recipient...
deb.monish [Sat, 31 Mar 2018 09:49:45 +0000 (15:19 +0530)]
(dev/mail/6) On multilingual mode, choosing mailing group doesn't affect recipient count and list

6 years agoMinor comments cleanup on MembershipType
Matthew Wire [Sat, 31 Mar 2018 10:16:17 +0000 (11:16 +0100)]
Minor comments cleanup on MembershipType

6 years agoMerge pull request #11904 from totten/5.0-preview-regr
Monish Deb [Sat, 31 Mar 2018 07:25:06 +0000 (12:55 +0530)]
Merge pull request #11904 from totten/5.0-preview-regr

(dev/mail/5) "New Mailing" - Previews should not schedule real blasts

6 years agoCRM-21677 - Report improvements
yashodha [Thu, 18 Jan 2018 10:41:16 +0000 (16:11 +0530)]
CRM-21677 - Report improvements

CRM-21677 - fix DB error and more clean up

CRM-21677 - generalised function

minor fix

CRM-21677 - keep the naming consistent

style fix

6 years agoMerge pull request #11898 from eileenmcnaughton/min_report
Eileen McNaughton [Sat, 31 Mar 2018 02:29:26 +0000 (15:29 +1300)]
Merge pull request #11898 from eileenmcnaughton/min_report

CRM-21677 reduce unnecessary joins in reports

6 years ago(dev/mail/5) "New Mailing" - Previews should not schedule real blasts
Tim Otten [Fri, 30 Mar 2018 22:02:42 +0000 (15:02 -0700)]
(dev/mail/5) "New Mailing" - Previews should not schedule real blasts

In `CRM_Mailing_BAO_Mailing::create` and `Mailing.create` API, there is a
(*ahem*) special behavior where setting the `scheduled_date` will
immediately trigger scheduling.  One shouldn't submit `scheduled_date` for a
preview.

This was not symptomatic before #11142/v4.7.31 because all preview
operations were wrapped in a transaction and rolled back.  But now previews
are allowed to have side-effects, so we need some other means to prevent.

This copies the workaround from `crmMailingMgr.save()` and applies
it to `crmMailingMgr.preview()` (etal).

6 years agoMerge pull request #11878 from mattwire/CRM-21791_financial_batch_pseudoconstant
Eileen McNaughton [Fri, 30 Mar 2018 00:13:05 +0000 (13:13 +1300)]
Merge pull request #11878 from mattwire/CRM-21791_financial_batch_pseudoconstant

CRM-21791 Use name for comparison instead of label (alternative)

6 years agoCRM-21677 reduce unnecessary joins in reports
eileen [Thu, 29 Mar 2018 08:48:39 +0000 (21:48 +1300)]
CRM-21677 reduce unnecessary joins in reports

6 years agoMerge pull request #11889 from eileenmcnaughton/min_report
Eileen McNaughton [Thu, 29 Mar 2018 08:11:48 +0000 (21:11 +1300)]
Merge pull request #11889 from eileenmcnaughton/min_report

CRM-21677 reduce unnecessary joins in reports

6 years agoMerge pull request #11890 from otetard/bugfix/fix-deceases-membership-processing
Eileen McNaughton [Thu, 29 Mar 2018 08:07:06 +0000 (21:07 +1300)]
Merge pull request #11890 from otetard/bugfix/fix-deceases-membership-processing

Fix CRM-19920 regression: “Deceased” status could be translated.

6 years agoFix CRM-19920 regression: “Deceased” status could be translated.
Olivier Tétard [Wed, 28 Mar 2018 12:21:27 +0000 (14:21 +0200)]
Fix CRM-19920 regression: “Deceased” status could be translated.

Find “Deceased” `status_id` by using `CRM_Core_PseudoConstant::getKey()` and check use this status is enabled by using this `status_id` instead of its label (which could be translated).

6 years agoMerge pull request #11703 from eileenmcnaughton/export
Monish Deb [Thu, 29 Mar 2018 05:46:13 +0000 (11:16 +0530)]
Merge pull request #11703 from eileenmcnaughton/export

Remove cloning hack from export and add unit tests

6 years agoMerge pull request #11895 from totten/master-ext-check
Eileen McNaughton [Thu, 29 Mar 2018 02:23:08 +0000 (15:23 +1300)]
Merge pull request #11895 from totten/master-ext-check

CRM_Utils_Check - Soften messages for read-only extensionsDir

6 years agoCRM_Utils_Check_Component_Env::checkExtensions - Fix typo
Tim Otten [Wed, 28 Mar 2018 22:33:57 +0000 (15:33 -0700)]
CRM_Utils_Check_Component_Env::checkExtensions - Fix typo

6 years agoCRM_Utils_Check_Component_Env - Soften messages for read-only extDir
Tim Otten [Wed, 28 Mar 2018 21:59:27 +0000 (14:59 -0700)]
CRM_Utils_Check_Component_Env - Soften messages for read-only extDir

There are competing schools of thought on whether extension folders should be web-writable:

* Sometimes, the most active (or the only) admins are web-based. Making the folder writeable lets them keep extensions up-to-date through the web UI.
  This includes applying security-fixes for extensions. Thus, sites with writeable extdir are harder to attack (more secure).
* Sometimes, the most active (or the only) admins don't use the web-based admin UI, and they don't trust any web-based users to do administration.
  They don't want the folder to be writeable.
* If there's a flaw that allows writing to the filesystem, it could be escalated to writing+executing code. Thus, sites with read-only
  extdir are harder to attack (more secure).

This commit tries to accept each scenario as valid -- but communicate
better.  Instead of flatly describing the read-only dir as erroreous,
present a warning with some choice/trade-off.

6 years agoCRM_Utils_Check_Component_Env - Remove redundant check for extensionsDir
Tim Otten [Wed, 28 Mar 2018 21:39:13 +0000 (14:39 -0700)]
CRM_Utils_Check_Component_Env - Remove redundant check for extensionsDir

When you have a non-writeable extensions directory, *two* status checks will
copmlain about it (`checkDirsWritable`, `checkExtensions`).  Between the two,
`checkExtensions` is smarter.

6 years agoMerge pull request #11891 from nielosz/Add-activities-to-recent-items
Eileen McNaughton [Wed, 28 Mar 2018 20:15:08 +0000 (09:15 +1300)]
Merge pull request #11891 from nielosz/Add-activities-to-recent-items

CRM-21434: Add activities to recent items stack

6 years agoMerge pull request #11888 from mattwire/formrule_typo
Seamus Lee [Wed, 28 Mar 2018 19:11:51 +0000 (06:11 +1100)]
Merge pull request #11888 from mattwire/formrule_typo

NFC Fix function name typo

6 years agoCRM-21763 add money util to subtract currency floats with precisely and implement...
Eli Lisseck [Wed, 14 Feb 2018 20:40:05 +0000 (12:40 -0800)]
CRM-21763 add money util to subtract currency floats with precisely and implement in CRM_Core_BAO_FinancialTrxn::getPartialPaymentWithType

6 years agoAdd items to recents items
Niels Heinemann [Wed, 28 Mar 2018 12:49:06 +0000 (14:49 +0200)]
Add items to recents items

6 years agoMerge pull request #11886 from eileenmcnaughton/varName
Eileen McNaughton [Wed, 28 Mar 2018 10:34:03 +0000 (23:34 +1300)]
Merge pull request #11886 from eileenmcnaughton/varName

[NFC] Fix mispelled variable and simplify a couple of other vars

6 years agoCRM-21677 reduce unnecessary joins in reports
eileen [Wed, 28 Mar 2018 10:30:54 +0000 (23:30 +1300)]
CRM-21677 reduce unnecessary joins in reports

6 years agoMerge pull request #11880 from eileenmcnaughton/min_report
Eileen McNaughton [Wed, 28 Mar 2018 10:24:00 +0000 (23:24 +1300)]
Merge pull request #11880 from eileenmcnaughton/min_report

 CRM-21677 reduce unnecessary joins in Case, Grant, Survey reports

6 years agoFix function name typo
Matthew Wire [Wed, 28 Mar 2018 09:36:57 +0000 (10:36 +0100)]
Fix function name typo

6 years ago CRM-21677 reduce unnecessary joins in Case, Grant, Survey reports
eileen [Mon, 26 Mar 2018 21:10:18 +0000 (10:10 +1300)]
 CRM-21677 reduce unnecessary joins in Case, Grant, Survey reports

6 years ago[NFC] Fix mispelled variable and simplify a couple of other vars
eileen [Wed, 28 Mar 2018 07:30:53 +0000 (20:30 +1300)]
[NFC] Fix mispelled variable and simplify a couple of other vars

6 years agoMerge pull request #11882 from eileenmcnaughton/report_filter
Eileen McNaughton [Wed, 28 Mar 2018 07:15:58 +0000 (20:15 +1300)]
Merge pull request #11882 from eileenmcnaughton/report_filter

Fix report form isTableSelected to treat relative date filters as filters

6 years agoHandle eq (equals) operator in the report url
eileen [Wed, 28 Mar 2018 04:44:41 +0000 (17:44 +1300)]
Handle eq (equals) operator in the report url

6 years agoMerge pull request #11807 from lyyana/patch-1
Eileen McNaughton [Wed, 28 Mar 2018 01:45:50 +0000 (14:45 +1300)]
Merge pull request #11807 from lyyana/patch-1

"hold_date" not updated if civimail_multiple_bulk_emails is true + test

6 years agoMerge pull request #11336 from eileenmcnaughton/live
Seamus Lee [Wed, 28 Mar 2018 00:48:37 +0000 (11:48 +1100)]
Merge pull request #11336 from eileenmcnaughton/live

CRM-21489 document new constant in civicrm.settings.php

6 years agoMerge pull request #11863 from eileenmcnaughton/payment_view
colemanw [Tue, 27 Mar 2018 19:54:33 +0000 (15:54 -0400)]
Merge pull request #11863 from eileenmcnaughton/payment_view

Tweak layout on contribution view screen to make payments clearer

6 years agoFix report form isTableSelected to treat relative date filters as filters.
eileen [Tue, 27 Mar 2018 04:30:43 +0000 (17:30 +1300)]
Fix report form isTableSelected to treat relative date filters as filters.

isTableSelected looks to see if the filter has been passed in. Without this it looks in ->_params[{}_value] &
for {}_op to be null or 'not null' but misses relative date filters.

6 years agoMerge pull request #11879 from MegaphoneJon/CRM-21842
Eileen McNaughton [Tue, 27 Mar 2018 01:06:11 +0000 (14:06 +1300)]
Merge pull request #11879 from MegaphoneJon/CRM-21842

CRM-21842 - Fix links to documentation

6 years agoMerge pull request #11874 from eileenmcnaughton/cust_data
Seamus Lee [Mon, 26 Mar 2018 22:20:46 +0000 (09:20 +1100)]
Merge pull request #11874 from eileenmcnaughton/cust_data

[NFC] remove unused vars

6 years agoCRM-21791 Use name instead of label
Matthew Wire [Mon, 26 Mar 2018 16:20:56 +0000 (17:20 +0100)]
CRM-21791 Use name instead of label

6 years agoMerge pull request #11876 from yashodha/report_improv
Eileen McNaughton [Mon, 26 Mar 2018 20:23:57 +0000 (09:23 +1300)]
Merge pull request #11876 from yashodha/report_improv

CRM-21677 reduce unnecessary joins in mailing reports

6 years agoCRM-21842 - Fix links to documentation
Jon Goldberg [Mon, 26 Mar 2018 17:41:02 +0000 (13:41 -0400)]
CRM-21842 - Fix links to documentation

6 years agoCRM-21677 reduce unnecessary joins in mailing reports
yashodha [Mon, 26 Mar 2018 06:44:49 +0000 (12:14 +0530)]
CRM-21677 reduce unnecessary joins in mailing reports

6 years agoMerge pull request #11875 from eileenmcnaughton/min_report
Yashodha Chaku [Mon, 26 Mar 2018 06:23:35 +0000 (11:53 +0530)]
Merge pull request #11875 from eileenmcnaughton/min_report

CRM-21677 reduce unnecessary joins in pledge reports

6 years agoCRM-21677 reduce unnecessary joins in pledge reports
eileen [Mon, 26 Mar 2018 04:37:29 +0000 (17:37 +1300)]
CRM-21677 reduce unnecessary joins in pledge reports
And walklist report:

Pledge/Detail
pledge/pbnp
pledge/summary
walklist/walklist

6 years agoMerge pull request #11872 from totten/master-test-trait
Seamus Lee [Sat, 24 Mar 2018 05:09:50 +0000 (16:09 +1100)]
Merge pull request #11872 from totten/master-test-trait

CiviUnitTestCase - Extract Api3TestTrait and Api3DocTrait

6 years agoCiviUnitTestCase - Extract Civi\Test\Api3DocTrait
Tim Otten [Fri, 23 Mar 2018 23:27:40 +0000 (16:27 -0700)]
CiviUnitTestCase - Extract Civi\Test\Api3DocTrait

This makes `CiviUnitTestCase` more readable, and it allows other tests to
benefit from these helpers (even if they don't use everything from
`CiviUnitTestCase`).

6 years agoCiviUnitTestCase - Extract Civi\Test\Api3TestTrait
Tim Otten [Fri, 23 Mar 2018 23:16:24 +0000 (16:16 -0700)]
CiviUnitTestCase - Extract Civi\Test\Api3TestTrait

This makes `CiviUnitTestCase` more readable, and it allows other tests to
benefit from these helpers (even if they don't use everything from
`CiviUnitTestCase`).

6 years agoMerge pull request #11697 from mattwire/CRM-21784_recur_customdata
Eileen McNaughton [Sat, 24 Mar 2018 02:54:01 +0000 (15:54 +1300)]
Merge pull request #11697 from mattwire/CRM-21784_recur_customdata

CRM-21784 Display custom data when viewing recurring contributions

6 years ago[NFC] remove unused vars
eileen [Sat, 24 Mar 2018 02:30:37 +0000 (15:30 +1300)]
[NFC] remove unused vars

6 years agoMerge pull request #11826 from eileenmcnaughton/karing
Eileen McNaughton [Fri, 23 Mar 2018 21:54:29 +0000 (10:54 +1300)]
Merge pull request #11826 from eileenmcnaughton/karing

Use try catch when deleting groups (dev/core/issues/22 )

6 years agoMerge pull request #11867 from eileenmcnaughton/min_report
Eileen McNaughton [Fri, 23 Mar 2018 20:10:00 +0000 (09:10 +1300)]
Merge pull request #11867 from eileenmcnaughton/min_report

CRM-21677 reduce unnecessary joins in membership reports

6 years agoMerge pull request #11864 from colemanw/upgradeVersion
colemanw [Fri, 23 Mar 2018 16:10:59 +0000 (12:10 -0400)]
Merge pull request #11864 from colemanw/upgradeVersion

Increment minimum upgradable version

6 years agoMerge pull request #11869 from mukeshcompucorp/fix-template-structure-issues
colemanw [Fri, 23 Mar 2018 14:02:51 +0000 (10:02 -0400)]
Merge pull request #11869 from mukeshcompucorp/fix-template-structure-issues

Fix template structures

6 years agoFix template structures
Mukesh Ram [Fri, 23 Mar 2018 08:32:56 +0000 (14:02 +0530)]
Fix template structures

6 years agoMerge pull request #11609 from andrewpthompson/CRM-21203-andrewpthompson
Eileen McNaughton [Fri, 23 Mar 2018 07:16:01 +0000 (20:16 +1300)]
Merge pull request #11609 from andrewpthompson/CRM-21203-andrewpthompson

CRM-21203 revisited - Joomla 3.8 extra fixes for cli.php

6 years agoCRM-21677 reduce unnecessary joins in membership reports
eileen [Fri, 23 Mar 2018 07:01:04 +0000 (20:01 +1300)]
CRM-21677 reduce unnecessary joins in membership reports

6 years agoMerge pull request #11086 from agileware/CRM-21277
Eileen McNaughton [Fri, 23 Mar 2018 06:30:07 +0000 (19:30 +1300)]
Merge pull request #11086 from agileware/CRM-21277

CRM-21277: Suppress warnings while finding install directory.

6 years agoMerge pull request #11087 from yashodha/CRM-19850
Eileen McNaughton [Fri, 23 Mar 2018 06:28:53 +0000 (19:28 +1300)]
Merge pull request #11087 from yashodha/CRM-19850

CRM-19850 - Add a offline membership without 'record payment' option,…

6 years agoMerge pull request #11825 from mattwire/CRM-21682_commenting
Seamus Lee [Fri, 23 Mar 2018 05:15:39 +0000 (16:15 +1100)]
Merge pull request #11825 from mattwire/CRM-21682_commenting

Add commenting to explain +1/-1 days for membership dates calc

6 years agoMerge pull request #11816 from eileenmcnaughton/fix
Eileen McNaughton [Fri, 23 Mar 2018 02:47:29 +0000 (15:47 +1300)]
Merge pull request #11816 from eileenmcnaughton/fix

core/issues/15 Line item fix with attempt to determine how it is hit

6 years agoMerge pull request #11824 from mattwire/CRM-21682_membership_renewal_tests
Eileen McNaughton [Fri, 23 Mar 2018 02:46:39 +0000 (15:46 +1300)]
Merge pull request #11824 from mattwire/CRM-21682_membership_renewal_tests

CRM-21682 Membership Renewal Tests

6 years agoMerge pull request #11829 from eileenmcnaughton/rules
Eileen McNaughton [Fri, 23 Mar 2018 01:13:44 +0000 (14:13 +1300)]
Merge pull request #11829 from eileenmcnaughton/rules

Fix regression on CiviRules search due to exception handling

6 years agoMerge pull request #11836 from seamuslee001/dev_core_25
Eileen McNaughton [Fri, 23 Mar 2018 01:07:38 +0000 (14:07 +1300)]
Merge pull request #11836 from seamuslee001/dev_core_25

Dev/Core 25 Wrap the mailing split_job function in a transaction to e…

6 years agoMerge pull request #11828 from eileenmcnaughton/revert
colemanw [Fri, 23 Mar 2018 00:58:52 +0000 (20:58 -0400)]
Merge pull request #11828 from eileenmcnaughton/revert

Revert "CRM-8140: Not possible to select fields for export when using Custom Searches"

6 years agoMerge pull request #11862 from mukeshcompucorp/fix-template-structure-issues
colemanw [Fri, 23 Mar 2018 00:52:54 +0000 (20:52 -0400)]
Merge pull request #11862 from mukeshcompucorp/fix-template-structure-issues

Fix template structure

6 years agoMerge pull request #10496 from jitendrapurohit/CRM-20719
colemanw [Fri, 23 Mar 2018 00:48:08 +0000 (20:48 -0400)]
Merge pull request #10496 from jitendrapurohit/CRM-20719

CRM-20719 : Show warning on system status page if reply_id for mailing is not set to any default

6 years agoMerge pull request #11857 from eileenmcnaughton/cust_data_any
colemanw [Thu, 22 Mar 2018 22:05:42 +0000 (18:05 -0400)]
Merge pull request #11857 from eileenmcnaughton/cust_data_any

Consolidate CustomData code into shared tpl

6 years agoMerge pull request #11861 from eileenmcnaughton/task
Eileen McNaughton [Thu, 22 Mar 2018 21:41:09 +0000 (10:41 +1300)]
Merge pull request #11861 from eileenmcnaughton/task

Fix bugs with hook params, functionality on contact searches

6 years agoMerge pull request #11856 from eileenmcnaughton/cust_multi
Seamus Lee [Thu, 22 Mar 2018 21:12:14 +0000 (08:12 +1100)]
Merge pull request #11856 from eileenmcnaughton/cust_multi

Fix ajax error on rendering multi custom data tab when field limit reached

6 years agoMerge pull request #11859 from eileenmcnaughton/import_test
Seamus Lee [Thu, 22 Mar 2018 21:09:11 +0000 (08:09 +1100)]
Merge pull request #11859 from eileenmcnaughton/import_test

[nfc] Add test for thousand separators on import

6 years agoDev/Core 25 Wrap the mailing split_job function in a transaction to ensure that there...
Seamus Lee [Tue, 20 Mar 2018 03:02:08 +0000 (14:02 +1100)]
Dev/Core 25 Wrap the mailing split_job function in a transaction to ensure that there is no possibility of duplicate maiing jobs created

Include the split_jobs in the transaction used to update the parent job

6 years agoIncrement minimum upgradable version
Coleman Watts [Thu, 22 Mar 2018 17:19:00 +0000 (13:19 -0400)]
Increment minimum upgradable version

6 years agoFix colspan
Mukesh Ram [Thu, 22 Mar 2018 14:29:17 +0000 (19:59 +0530)]
Fix colspan

6 years agoMerge pull request #11298 from otetard/feature/merge_memberships
Eileen McNaughton [Thu, 22 Mar 2018 13:10:12 +0000 (02:10 +1300)]
Merge pull request #11298 from otetard/feature/merge_memberships

CRM-19151: Add the ability to merge memberships without data loss

6 years agoTweak layout on contribution view screen to make payments clearer
eileen [Thu, 22 Mar 2018 12:52:39 +0000 (01:52 +1300)]
Tweak layout on contribution view screen to make payments clearer

6 years agoFix bug where search does not load if print is disabled.
eileen [Thu, 22 Mar 2018 12:10:08 +0000 (01:10 +1300)]
Fix bug where search does not load if print is disabled.

This was picked up in QA on search task changes & I was able to replicate - this fixes

6 years agoFix template structure
Mukesh Ram [Thu, 22 Mar 2018 12:00:53 +0000 (17:30 +0530)]
Fix template structure

6 years agoMerge pull request #11860 from eileenmcnaughton/test_fixes
Eileen McNaughton [Thu, 22 Mar 2018 11:51:52 +0000 (00:51 +1300)]
Merge pull request #11860 from eileenmcnaughton/test_fixes

[nfc] Minor test tidy ups

6 years agoFix regression (intra-rc) where entity not passed to hook, and fix CRM-21841 as by...
eileen [Thu, 22 Mar 2018 11:49:02 +0000 (00:49 +1300)]
Fix regression (intra-rc) where entity not passed to hook, and fix CRM-21841 as by-product.

The self::objectType is passing NULL - the object type on the parent.

Switching to static::objectType uses the child.

https://stackoverflow.com/questions/1912902/what-exactly-are-late-static-bindings-in-php

6 years agoConsolidate CustomData code into shared tpl
eileen [Thu, 22 Mar 2018 06:21:59 +0000 (19:21 +1300)]
Consolidate CustomData code into shared tpl

 The only change that I found in function was that the delete icon was originally in a
 table on contact edit but afterwards it was not. However the UI looked the same

6 years agocore/issues/15 Line item fix with attempt to determine how it is hit
eileen [Thu, 15 Mar 2018 06:03:49 +0000 (19:03 +1300)]
core/issues/15 Line item fix with attempt to determine how it is hit

6 years agoMerge pull request #11855 from eileenmcnaughton/report_min
Eileen McNaughton [Thu, 22 Mar 2018 09:58:43 +0000 (22:58 +1300)]
Merge pull request #11855 from eileenmcnaughton/report_min

CRM-21677 - reduce unnecessary address joins on activity & contact detail reports

6 years ago[nfc] Minor test tidy ups
eileen [Thu, 22 Mar 2018 08:59:05 +0000 (21:59 +1300)]
[nfc] Minor test tidy ups

6 years agoAdd test for thousand separators on import
eileen [Thu, 22 Mar 2018 08:50:38 +0000 (21:50 +1300)]
Add test for thousand separators on import