civicrm-core.git
7 years agoCRM-20518 Default participant status not set when status name not matches localized...
francescbassas [Wed, 3 May 2017 18:46:57 +0000 (20:46 +0200)]
CRM-20518 Default participant status not set when status name not matches localized string 'Registered'

7 years agoMerge pull request #10296 from JMAConsulting/CRM-20515
Eileen McNaughton [Wed, 3 May 2017 17:57:26 +0000 (05:57 +1200)]
Merge pull request #10296 from JMAConsulting/CRM-20515

CRM-20515: otice errors on dmaster for add petition

7 years agoMerge pull request #10192 from jitendrapurohit/CRM-20452
Monish Deb [Wed, 3 May 2017 15:38:33 +0000 (21:08 +0530)]
Merge pull request #10192 from jitendrapurohit/CRM-20452

CRM-20452: Fatal Error on saving Organisation Info when geocoding is …

7 years agoCRM-20515: otice errors on dmaster for add petition
deb.monish [Wed, 3 May 2017 15:28:15 +0000 (20:58 +0530)]
CRM-20515: otice errors on dmaster for add petition

7 years agoMerge pull request #10293 from civicrm/4.7.19-rc
Eileen McNaughton [Wed, 3 May 2017 06:05:07 +0000 (18:05 +1200)]
Merge pull request #10293 from civicrm/4.7.19-rc

4.7.19 rc

7 years agoMerge pull request #10245 from agh1/4.7.19-releasenotes
Eileen McNaughton [Wed, 3 May 2017 05:56:44 +0000 (17:56 +1200)]
Merge pull request #10245 from agh1/4.7.19-releasenotes

4.7.19 release notes

7 years ago4.7.19 release notes: oops bullet point!
Andrew Hunt [Wed, 3 May 2017 05:18:38 +0000 (01:18 -0400)]
4.7.19 release notes: oops bullet point!

7 years ago4.7.19 release notes: updated contributors
Andrew Hunt [Wed, 3 May 2017 05:15:29 +0000 (01:15 -0400)]
4.7.19 release notes: updated contributors

7 years ago4.7.19 release notes: finished issues
Andrew Hunt [Wed, 3 May 2017 04:44:44 +0000 (00:44 -0400)]
4.7.19 release notes: finished issues

7 years agoMerge pull request #10292 from eileenmcnaughton/dep
Eileen McNaughton [Wed, 3 May 2017 02:14:48 +0000 (14:14 +1200)]
Merge pull request #10292 from eileenmcnaughton/dep

Up the deprecation on old hook

7 years agoMerge pull request #10012 from agh1/crm-20297
Eileen McNaughton [Wed, 3 May 2017 02:11:56 +0000 (14:11 +1200)]
Merge pull request #10012 from agh1/crm-20297

CRM-20297 Display contribution having line items with no price set

7 years agoUp the deprecation on old hook
eileen [Wed, 3 May 2017 01:26:04 +0000 (13:26 +1200)]
Up the deprecation on old hook

7 years agoMerge pull request #10269 from eileenmcnaughton/uffield
Eileen McNaughton [Tue, 2 May 2017 21:27:33 +0000 (09:27 +1200)]
Merge pull request #10269 from eileenmcnaughton/uffield

CRM-20474 update UFField form to use api.

7 years agoMerge pull request #10290 from civicrm/4.7.19-rc
Tim Otten [Tue, 2 May 2017 05:40:22 +0000 (22:40 -0700)]
Merge pull request #10290 from civicrm/4.7.19-rc

Merge forward (4.7.19-rc => master)

7 years agoMerge pull request #10289 from totten/4.7.19-newmailing
Tim Otten [Tue, 2 May 2017 04:26:12 +0000 (21:26 -0700)]
Merge pull request #10289 from totten/4.7.19-newmailing

CRM-20316 - Fix "New Mailing" regression. `subject` should not be required.

7 years agoCRM-20316 - Fix "New Mailing" regression. Update tests.
Tim Otten [Tue, 2 May 2017 03:12:32 +0000 (20:12 -0700)]
CRM-20316 - Fix "New Mailing" regression. Update tests.

`testWithoutParam_create()` asserts that *generally* you need to provide
some params to create a record.  This was true for Mailings in <=4.7.18
because `create_id` was required.  The main goal of a98504a72 was to make
`created_id` optional, which actually meant that *no data* would be
required (making `testWithoutParam_create()` non-applicable/inaccurate.

(This was obscured at the time because a98504a72 simultaneously made
`subject` mandatory, but that led to the regression in "New Mailing".  Since
neither `created_id` nor `subject` is required...  there's nothing left to
be required.  The correct behavior is to skip `testWithoutParam_create()`
for mailings.)

7 years agoCRM-20316 - Fix "New Mailing" regression. `subject` should not be required.
Tim Otten [Tue, 2 May 2017 02:01:41 +0000 (19:01 -0700)]
CRM-20316 - Fix "New Mailing" regression. `subject` should not be required.

When you navigate to "New Mailing" (`civicrm/a/#/mailing/new`) in the UI, it
crashes on a white-screen.  Inspecting the console shows that the call to
`Mailing.create` is failing because `subject` is missing.  But at this point
we're only creating a *draft* mailing -- so you don't have or need a
fully-formed mailing yet.

7 years ago4.7.19 release notes: formatting and links from main list
Andrew Hunt [Tue, 25 Apr 2017 19:55:54 +0000 (15:55 -0400)]
4.7.19 release notes: formatting and links from main list

7 years ago4.7.19 release notes: updated from script
Andrew Hunt [Tue, 2 May 2017 01:07:24 +0000 (21:07 -0400)]
4.7.19 release notes: updated from script

7 years agoMerge pull request #10285 from JMAConsulting/IIDA-108-2
Eileen McNaughton [Tue, 2 May 2017 00:44:01 +0000 (12:44 +1200)]
Merge pull request #10285 from JMAConsulting/IIDA-108-2

CRM-20392: remove cruft code and added unit test

7 years agoMerge pull request #10281 from agh1/crm-20478
colemanw [Mon, 1 May 2017 16:36:01 +0000 (12:36 -0400)]
Merge pull request #10281 from agh1/crm-20478

Fixes to activity display in case timeline

7 years agoCRM-20478 Case type: test missing activity types for lookup
Andrew Hunt [Mon, 1 May 2017 15:19:05 +0000 (11:19 -0400)]
CRM-20478 Case type: test missing activity types for lookup

7 years agoCRM-20392: remove cruft code and add unit test
Pradeep Nayak [Sat, 29 Apr 2017 09:28:39 +0000 (14:58 +0530)]
CRM-20392: remove cruft code and add unit test

7 years agoMerge pull request #10287 from eileenmcnaughton/master
Eileen McNaughton [Sun, 30 Apr 2017 21:14:20 +0000 (09:14 +1200)]
Merge pull request #10287 from eileenmcnaughton/master

comment possible breakage from CRM-16460

7 years agocomment possible breakage from CRM-16460
eileen [Sun, 30 Apr 2017 01:20:16 +0000 (13:20 +1200)]
comment possible breakage from CRM-16460

I only saw this breakage in a test, but speculate that config-dependent it would affect people.
Have added comments to help anyone who actually does hit it

7 years agoMerge pull request #10286 from eileenmcnaughton/master
Eileen McNaughton [Sun, 30 Apr 2017 01:17:57 +0000 (13:17 +1200)]
Merge pull request #10286 from eileenmcnaughton/master

Fix test cleanup to turn tax & invoicing off after the test.

7 years agoFix test cleanup to turn tax & invoicing off after the test.
eileen [Sun, 30 Apr 2017 00:31:32 +0000 (12:31 +1200)]
Fix test cleanup to turn tax & invoicing off after the test.

Also one typo fix (QAd from another patch)

7 years agoMerge pull request #10283 from eileenmcnaughton/master
Eileen McNaughton [Sat, 29 Apr 2017 23:00:57 +0000 (11:00 +1200)]
Merge pull request #10283 from eileenmcnaughton/master

Merge 4.7.19-rc to master

7 years agoMerge pull request #10271 from eileenmcnaughton/tidy
Eileen McNaughton [Sat, 29 Apr 2017 03:17:00 +0000 (15:17 +1200)]
Merge pull request #10271 from eileenmcnaughton/tidy

CRM-20392 (IIDA-108), Fixed submit Credit Card transaction for partia…

7 years agoMerge branch '4.7.19-rc' of https://github.com/civicrm/civicrm-core
eileen [Sat, 29 Apr 2017 02:40:52 +0000 (14:40 +1200)]
Merge branch '4.7.19-rc' of https://github.com/civicrm/civicrm-core

7 years agoMerge commit 'fd6277c70f95fac'
eileen [Sat, 29 Apr 2017 02:40:36 +0000 (14:40 +1200)]
Merge commit 'fd6277c70f95fac'

7 years agoMerge pull request #10282 from eileenmcnaughton/4.7.19-rc
Eileen McNaughton [Sat, 29 Apr 2017 02:37:34 +0000 (14:37 +1200)]
Merge pull request #10282 from eileenmcnaughton/4.7.19-rc

Fix spelling.

7 years agoFix spelling.
eileen [Sat, 29 Apr 2017 02:37:00 +0000 (14:37 +1200)]
Fix spelling.

I need a commit after the commit-to-be-skipped to fix the merge, so this is it

7 years agoMerge pull request #10280 from eileenmcnaughton/4.7.19-rc
Eileen McNaughton [Sat, 29 Apr 2017 02:31:16 +0000 (14:31 +1200)]
Merge pull request #10280 from eileenmcnaughton/4.7.19-rc

CRM-20481 temporarily switch back while we assess / fix performance.

7 years agoMerge pull request #10273 from eileenmcnaughton/activity
Eileen McNaughton [Sat, 29 Apr 2017 02:30:39 +0000 (14:30 +1200)]
Merge pull request #10273 from eileenmcnaughton/activity

CRM-19821 set activity_status_id to 'export'

7 years agoCRM-20392 (IIDA-108), Fixed submit Credit Card transaction for partially paid contrib...
deb.monish [Sat, 29 Apr 2017 02:23:32 +0000 (14:23 +1200)]
CRM-20392 (IIDA-108), Fixed submit Credit Card transaction for partially paid contribution

7 years agoCRM-20478 Case type: translate newest & oldest
Andrew Hunt [Sat, 29 Apr 2017 02:10:18 +0000 (22:10 -0400)]
CRM-20478 Case type: translate newest & oldest

7 years agoCRM-20478 Case type: timeline displayed activity type and status names
Andrew Hunt [Sat, 29 Apr 2017 01:46:47 +0000 (21:46 -0400)]
CRM-20478 Case type: timeline displayed activity type and status names
rather than labels

7 years agoCRM-20481 temporarily switch back while we assess / fix performance.
eileen [Fri, 28 Apr 2017 22:25:31 +0000 (10:25 +1200)]
CRM-20481 temporarily switch back while we assess / fix performance.

We have been seeing performance issues with the use of the api for the dashboard. This is a back-out so
we can figure that out before re-adding. Note this should not be merged to master as there are
commits that 'add up to this' in master. There has been some git mistake this round :-(

I'll figure out how to exclude

7 years agoMerge branch '4.7.19-rc-new' into master-new
Tim Otten [Fri, 28 Apr 2017 22:04:04 +0000 (15:04 -0700)]
Merge branch '4.7.19-rc-new' into master-new

7 years agoCRM-20493 Payment instrument id is incorrectly a required field for online additional...
eileen [Fri, 28 Apr 2017 01:27:36 +0000 (13:27 +1200)]
CRM-20493 Payment instrument id is incorrectly a required field for online additional payments

7 years agoMerge pull request #10278 from JMAConsulting/CRM-20498
colemanw [Fri, 28 Apr 2017 16:06:19 +0000 (12:06 -0400)]
Merge pull request #10278 from JMAConsulting/CRM-20498

CRM-20498, removed code from run() since its been invoked in parent f…

7 years agoCRM-20478 Case type timeline: restore list of activity types
Andrew Hunt [Fri, 28 Apr 2017 14:51:03 +0000 (10:51 -0400)]
CRM-20478 Case type timeline: restore list of activity types

7 years agoCRM-20498, removed code from run() since its been invoked in parent function
Pradeep Nayak [Fri, 28 Apr 2017 14:29:34 +0000 (19:59 +0530)]
CRM-20498, removed code from run() since its been invoked in parent function

----------------------------------------
* CRM-20498: buildform hook invoked twice
  https://issues.civicrm.org/jira/browse/CRM-20498

7 years agoCRM-20474 update UFField form to use api.
Saurabh Batra [Thu, 27 Apr 2017 23:34:06 +0000 (11:34 +1200)]
CRM-20474 update UFField form to use api.

This removes the UFField::Add function, only called from the form & create. Create it still pretty jumbled, but all
in one place now

7 years agoMerge pull request #10275 from eileenmcnaughton/4.7.19-rc
Eileen McNaughton [Fri, 28 Apr 2017 04:07:48 +0000 (16:07 +1200)]
Merge pull request #10275 from eileenmcnaughton/4.7.19-rc

4.7.19 rc

7 years agoCRM-19821 set activity_status_id to 'export'
eileen [Fri, 28 Apr 2017 03:10:21 +0000 (15:10 +1200)]
CRM-19821 set activity_status_id to 'export'

Export is a kind of weird & wonderful setting that is undocumented. It affects
whether fields are available by default in export & search, sometimes.

Generally I would say all 'user facing fields' should be set to export or somewhere
or other we will wind up hacking around it. I recently removed a lot
of code for payment_instrument_id that was just compensating for this var being
false rather than true.

7 years agoCRM-20493 Payment instrument id is incorrectly a required field for online additional...
eileen [Fri, 28 Apr 2017 01:27:36 +0000 (13:27 +1200)]
CRM-20493 Payment instrument id is incorrectly a required field for online additional payments

7 years agoMerge pull request #10236 from eileenmcnaughton/uffield
Eileen McNaughton [Fri, 28 Apr 2017 00:17:45 +0000 (12:17 +1200)]
Merge pull request #10236 from eileenmcnaughton/uffield

CRM-20474 Refactor UFField api to be standardised

7 years agoMerge pull request #10268 from eileenmcnaughton/master
Eileen McNaughton [Thu, 27 Apr 2017 23:24:56 +0000 (11:24 +1200)]
Merge pull request #10268 from eileenmcnaughton/master

Fix merge conflict

7 years agoFix merge conflict
eileen [Thu, 27 Apr 2017 23:24:15 +0000 (11:24 +1200)]
Fix merge conflict

7 years agoTowards CRM-20474 Refactor UFField api to be standardised - move functionality to...
Saurabh Batra [Thu, 27 Apr 2017 22:41:10 +0000 (10:41 +1200)]
Towards CRM-20474 Refactor UFField api to be standardised - move functionality to BAO::create

7 years agoMinor tidy ups.
Saurabh Batra [Thu, 27 Apr 2017 22:34:10 +0000 (10:34 +1200)]
Minor tidy ups.

Fix comments. Remove unused function. The function has a mismatch between input & parameter so can never work

7 years agoMerge pull request #10266 from civicrm/4.7.19-rc
Eileen McNaughton [Thu, 27 Apr 2017 22:24:08 +0000 (10:24 +1200)]
Merge pull request #10266 from civicrm/4.7.19-rc

4.7.19 rc

7 years agoMerge branch 'master' into 4.7.19-rc
Eileen McNaughton [Thu, 27 Apr 2017 22:23:59 +0000 (10:23 +1200)]
Merge branch 'master' into 4.7.19-rc

7 years agoMerge pull request #10261 from eileenmcnaughton/activitybackout
Eileen McNaughton [Thu, 27 Apr 2017 22:10:42 +0000 (10:10 +1200)]
Merge pull request #10261 from eileenmcnaughton/activitybackout

CRM-20481 temporarily switch back while we assess / fix performance i…

7 years agoCRM-20481 temporarily switch back while we assess / fix performance
eileen [Thu, 27 Apr 2017 08:53:17 +0000 (20:53 +1200)]
CRM-20481 temporarily switch back while we assess / fix performance

7 years agoMerge pull request #10263 from eileenmcnaughton/case
Eileen McNaughton [Thu, 27 Apr 2017 20:57:47 +0000 (08:57 +1200)]
Merge pull request #10263 from eileenmcnaughton/case

Remove unused var. emailActivityTypeIDs is retrieved twice, statusTit…

7 years agoMerge pull request #10259 from eileenmcnaughton/caserc
Eileen McNaughton [Thu, 27 Apr 2017 20:49:37 +0000 (08:49 +1200)]
Merge pull request #10259 from eileenmcnaughton/caserc

CRM-20424 remove call to deprecated function.

7 years agoMerge pull request #10235 from eileenmcnaughton/follow_on
Monish Deb [Thu, 27 Apr 2017 11:50:04 +0000 (17:20 +0530)]
Merge pull request #10235 from eileenmcnaughton/follow_on

CRM-20276 update line item financial amount when updating line item.

7 years agominor change
deb.monish [Thu, 27 Apr 2017 11:42:11 +0000 (17:12 +0530)]
minor change

7 years agoRemove unused var. emailActivityTypeIDs is retrieved twice, statusTitle never used
eileen [Thu, 27 Apr 2017 10:27:52 +0000 (22:27 +1200)]
Remove unused var. emailActivityTypeIDs is retrieved twice, statusTitle never used

7 years agoCRM-20424 remove call to deprecated function.
eileen [Wed, 26 Apr 2017 23:37:45 +0000 (11:37 +1200)]
CRM-20424 remove call to deprecated function.

This is the one covering the UI with errors. The fact it did not cause any test fails means it is
not covered by unit tests :-(.

As long as the Open Case link is still present for CiviCase users this is working

7 years agoCRM-20276 update line item financial amount when updating line item.
eileen [Wed, 15 Mar 2017 10:52:13 +0000 (23:52 +1300)]
CRM-20276 update line item financial amount when updating line item.

We don't have to leave the e-notice in, but I suspect that line is never called & it would be good
to figure that out rather than leave it 'in case', hence the enotice

7 years agoMerge pull request #10257 from JMAConsulting/CRM-20308
Eileen McNaughton [Thu, 27 Apr 2017 00:13:00 +0000 (12:13 +1200)]
Merge pull request #10257 from JMAConsulting/CRM-20308

CRM-20308: Document the new behaivour under help icon

7 years agoMerge pull request #10124 from adixon/CRM-20396
Eileen McNaughton [Wed, 26 Apr 2017 21:15:19 +0000 (09:15 +1200)]
Merge pull request #10124 from adixon/CRM-20396

CRM-20396 Corrected payment_processor in contrib params

7 years agoadded unit test
deb.monish [Wed, 26 Apr 2017 18:14:42 +0000 (23:44 +0530)]
added unit test

7 years agoCRM-20396 Corrected payment_processor in contrib params
adixon [Thu, 6 Apr 2017 21:41:45 +0000 (17:41 -0400)]
CRM-20396 Corrected payment_processor in contrib params

7 years agoCRM-20308: Document the new behaivour under help icon
deb.monish [Wed, 26 Apr 2017 14:14:33 +0000 (19:44 +0530)]
CRM-20308: Document the new behaivour under help icon

7 years agoMerge pull request #10244 from eileenmcnaughton/uffield1
Eileen McNaughton [Wed, 26 Apr 2017 12:53:43 +0000 (00:53 +1200)]
Merge pull request #10244 from eileenmcnaughton/uffield1

CRM-20474 Refactor UFField api to be standardised

7 years agoMerge pull request #10226 from eileenmcnaughton/master
Eileen McNaughton [Wed, 26 Apr 2017 05:45:20 +0000 (17:45 +1200)]
Merge pull request #10226 from eileenmcnaughton/master

Minor code tidy ups.

7 years agoMerge pull request #10254 from seamuslee001/4.7.19-rc
Eileen McNaughton [Wed, 26 Apr 2017 05:15:52 +0000 (17:15 +1200)]
Merge pull request #10254 from seamuslee001/4.7.19-rc

4.7.19 rc

7 years agoCRM-20441 always do acl checks from api
eileen [Tue, 25 Apr 2017 22:59:12 +0000 (10:59 +1200)]
CRM-20441 always do acl checks from api

7 years agoCRM-20441 add test for no activities viewable and add test fix
eileen [Tue, 25 Apr 2017 22:25:37 +0000 (10:25 +1200)]
CRM-20441 add test for no activities viewable and add test fix

7 years agoTest preparatory cleanup
eileen [Tue, 25 Apr 2017 22:01:15 +0000 (10:01 +1200)]
Test preparatory cleanup

7 years agoMerge branch 'master' into 4.7.19-rc
Eileen McNaughton [Wed, 26 Apr 2017 04:29:29 +0000 (16:29 +1200)]
Merge branch 'master' into 4.7.19-rc

7 years agoMerge pull request #10251 from eileenmcnaughton/4.7.19-rc2
Eileen McNaughton [Wed, 26 Apr 2017 04:27:22 +0000 (16:27 +1200)]
Merge pull request #10251 from eileenmcnaughton/4.7.19-rc2

CRM-20441 further fixes & tests for api + acl

7 years agoMerge pull request #10195 from seanmadsen/CRM-20453
Eileen McNaughton [Wed, 26 Apr 2017 03:34:12 +0000 (15:34 +1200)]
Merge pull request #10195 from seanmadsen/CRM-20453

CRM-20453 Fix inconsistencies in XML schema definitions

7 years agoMerge pull request #10165 from jitendrapurohit/mailingfix
Eileen McNaughton [Wed, 26 Apr 2017 03:15:59 +0000 (15:15 +1200)]
Merge pull request #10165 from jitendrapurohit/mailingfix

CRM-20431 - Fix unsubscribe group list

7 years agoCRM-20441 always do acl checks from api
eileen [Tue, 25 Apr 2017 22:59:12 +0000 (10:59 +1200)]
CRM-20441 always do acl checks from api

7 years agoCRM-20441 add test for no activities viewable and add test fix
eileen [Tue, 25 Apr 2017 22:25:37 +0000 (10:25 +1200)]
CRM-20441 add test for no activities viewable and add test fix

7 years agoTest preparatory cleanup
eileen [Tue, 25 Apr 2017 22:01:15 +0000 (10:01 +1200)]
Test preparatory cleanup

7 years agoCRM-20453 - DAO changes after running GenCode.php
Sean Madsen [Tue, 25 Apr 2017 21:11:44 +0000 (15:11 -0600)]
CRM-20453 - DAO changes after running GenCode.php

7 years agoMerge pull request #10246 from civicrm/4.7.19-rc
Eileen McNaughton [Tue, 25 Apr 2017 20:24:24 +0000 (08:24 +1200)]
Merge pull request #10246 from civicrm/4.7.19-rc

4.7.19 rc

7 years agoCRM-20474 Refactor UFField api to be standardised
Author: Saurabh Batra [Tue, 25 Apr 2017 19:34:28 +0000 (07:34 +1200)]
CRM-20474 Refactor UFField api to be standardised

Move to standardise duplicateField function

Format fields on the form, rather than trying to mimic weird form
formatting in api & BAO

7 years agoMerge pull request #10243 from JMAConsulting/CRM-20467
Eileen McNaughton [Tue, 25 Apr 2017 18:45:44 +0000 (06:45 +1200)]
Merge pull request #10243 from JMAConsulting/CRM-20467

CRM-20467: PHP notices on contact search for ACL'd user

7 years agoCRM-20467: PHP notices on contact search for ACL'd user
deb.monish [Tue, 25 Apr 2017 18:40:41 +0000 (00:10 +0530)]
CRM-20467: PHP notices on contact search for ACL'd user

7 years agoMerge pull request #10241 from aydun/CRM-20312
Eileen McNaughton [Tue, 25 Apr 2017 18:26:28 +0000 (06:26 +1200)]
Merge pull request #10241 from aydun/CRM-20312

CRM-20312 Fix typo

7 years agoMerge pull request #10238 from eileenmcnaughton/log
Eileen McNaughton [Tue, 25 Apr 2017 18:22:53 +0000 (06:22 +1200)]
Merge pull request #10238 from eileenmcnaughton/log

CRM-13639 minor tidy up from larger pr on logging

7 years agoFix typo
Aidan Saunders [Tue, 25 Apr 2017 15:24:54 +0000 (16:24 +0100)]
Fix typo

7 years agoMerge pull request #10208 from jitendrapurohit/CRM-20461
Monish Deb [Tue, 25 Apr 2017 12:31:41 +0000 (18:01 +0530)]
Merge pull request #10208 from jitendrapurohit/CRM-20461

CRM-20461 - Use api instead of query so that post hook gets invoked for additional participants

7 years agoMerge pull request #10237 from seamuslee001/CRM-20441-4
Eileen McNaughton [Tue, 25 Apr 2017 11:34:20 +0000 (23:34 +1200)]
Merge pull request #10237 from seamuslee001/CRM-20441-4

CRM-20441 Return early if we have removed all Activity IDs as got no …

7 years agoCRM-13639 minor tidy up from larger pr on logging
Chris Burgess [Tue, 25 Apr 2017 10:51:41 +0000 (22:51 +1200)]
CRM-13639 minor tidy up from larger pr on logging

The PR is stalled but I wanted to pull out these comment changes for now

7 years agoCRM-20441 Return early if we have removed all Activity IDs as got no access to them
Seamus Lee [Tue, 25 Apr 2017 10:41:44 +0000 (20:41 +1000)]
CRM-20441 Return early if we have removed all Activity IDs as got no access to them

7 years agoMerge pull request #9984 from eileenmcnaughton/sales
Eileen McNaughton [Tue, 25 Apr 2017 09:18:06 +0000 (21:18 +1200)]
Merge pull request #9984 from eileenmcnaughton/sales

CRM-20260 fix data errors creation in financial_line_item when editin…

7 years agoMerge pull request #10234 from JMAConsulting/IIDA-127
Eileen McNaughton [Tue, 25 Apr 2017 08:07:53 +0000 (20:07 +1200)]
Merge pull request #10234 from JMAConsulting/IIDA-127

CRM-20264: additional fixes for online Event registration, backoffice, membership and other validation

7 years agoMerge pull request #10233 from twomice/CRM-20472_soft_credit_validation_error_display
Eileen McNaughton [Tue, 25 Apr 2017 07:50:08 +0000 (19:50 +1200)]
Merge pull request #10233 from twomice/CRM-20472_soft_credit_validation_error_display

CRM-20472: Fix field name in error so validation will display.

7 years agoCRM-20264: additional fixes for online Event registration, backoffice membership...
deb.monish [Tue, 25 Apr 2017 07:03:27 +0000 (12:33 +0530)]
CRM-20264: additional fixes for online Event registration, backoffice membership and validation

7 years agoCRM-20472: Fix field name in error so validation will display.
Allen Shaw [Tue, 25 Apr 2017 04:45:40 +0000 (23:45 -0500)]
CRM-20472: Fix field name in error so validation will display.

7 years agoMerge pull request #10232 from seamuslee001/CRM-20441-3
Eileen McNaughton [Tue, 25 Apr 2017 04:00:21 +0000 (16:00 +1200)]
Merge pull request #10232 from seamuslee001/CRM-20441-3

CRM-20441 Check to see if user has permission on the activities befor…