civicrm-core.git
7 years agoIcons for attachments
Coleman Watts [Wed, 29 Mar 2017 18:11:36 +0000 (14:11 -0400)]
Icons for attachments

7 years agoMerge pull request #9694 from systopia/CRM-19892
Joe Murray [Mon, 27 Mar 2017 18:24:50 +0000 (14:24 -0400)]
Merge pull request #9694 from systopia/CRM-19892

Proposed fix for CRM-19892

7 years agoMerge pull request #10024 from rnao/fix-mem-cancel-activity
Eileen McNaughton [Mon, 27 Mar 2017 05:45:08 +0000 (18:45 +1300)]
Merge pull request #10024 from rnao/fix-mem-cancel-activity

CRM-20311 - Membership cancelation via contribution doesn't create me…

7 years agoMerge pull request #9991 from JMAConsulting/CRM-20278
Eileen McNaughton [Mon, 27 Mar 2017 05:22:27 +0000 (18:22 +1300)]
Merge pull request #9991 from JMAConsulting/CRM-20278

CRM-20278 Added credit card type field for top donors report

7 years agoMerge pull request #9989 from JMAConsulting/CRM-20275
Eileen McNaughton [Mon, 27 Mar 2017 03:48:36 +0000 (16:48 +1300)]
Merge pull request #9989 from JMAConsulting/CRM-20275

CRM-20275 Added credit card type field for contributions by organization report

7 years agoMerge pull request #9990 from JMAConsulting/CRM-20277
Eileen McNaughton [Mon, 27 Mar 2017 03:47:57 +0000 (16:47 +1300)]
Merge pull request #9990 from JMAConsulting/CRM-20277

CRM-20277 Added credit card type field for contributions by household report

7 years agoMerge pull request #9992 from JMAConsulting/CRM-20279
Eileen McNaughton [Mon, 27 Mar 2017 03:46:40 +0000 (16:46 +1300)]
Merge pull request #9992 from JMAConsulting/CRM-20279

CRM-20279 Added credit card type field for SYBUNT report

7 years agoMerge pull request #9993 from JMAConsulting/CRM-20280
Eileen McNaughton [Mon, 27 Mar 2017 03:46:09 +0000 (16:46 +1300)]
Merge pull request #9993 from JMAConsulting/CRM-20280

CRM-20280 Added credit card type field for LYBUNT report

7 years agoMerge pull request #9994 from JMAConsulting/CRM-20281
Eileen McNaughton [Mon, 27 Mar 2017 03:45:28 +0000 (16:45 +1300)]
Merge pull request #9994 from JMAConsulting/CRM-20281

CRM-20281 Added credit card type field for Soft Credit report

7 years agoMerge pull request #9997 from JMAConsulting/CRM-20284
Eileen McNaughton [Mon, 27 Mar 2017 03:44:40 +0000 (16:44 +1300)]
Merge pull request #9997 from JMAConsulting/CRM-20284

CRM-20284 Added credit card type field for Contribution Aggregate by Relationship Report

7 years agoMerge pull request #10048 from totten/master-gcs
Eileen McNaughton [Mon, 27 Mar 2017 01:34:15 +0000 (14:34 +1300)]
Merge pull request #10048 from totten/master-gcs

(NFC) Update stale GenCode checksums

7 years agoMerge pull request #10047 from yashodha/CRM-20340
Eileen McNaughton [Mon, 27 Mar 2017 01:31:00 +0000 (14:31 +1300)]
Merge pull request #10047 from yashodha/CRM-20340

CRM-20340 - translate string

7 years agoMerge pull request #10001 from JMAConsulting/CRM-20285
Eileen McNaughton [Sun, 26 Mar 2017 21:19:16 +0000 (10:19 +1300)]
Merge pull request #10001 from JMAConsulting/CRM-20285

CRM-20285 Added credit card type field to recurring contributions report

7 years agoMerge pull request #10003 from eileenmcnaughton/cust_date2
Eileen McNaughton [Sun, 26 Mar 2017 21:18:12 +0000 (10:18 +1300)]
Merge pull request #10003 from eileenmcnaughton/cust_date2

CRM-20011 fix loss of data for yyyy-mm custom field

7 years ago(NFC) Update stale GenCode checksums
Tim Otten [Fri, 24 Mar 2017 19:59:00 +0000 (12:59 -0700)]
(NFC) Update stale GenCode checksums

The checksums in `CRM/Activity/DAO/Activity.php` and `CRM/Core/DAO/AllCoreTables.data.php` are
stale (although the logic is current).

Probable explanation: there was a recent whitespace cleanup to
`xml/schema/Activity/Activity.xml` (165a7fc03b86).  This would affect the
checksum of anything derived from there -- but it wouldn't cause a
substantive change.

7 years agoCRM-20340 - translate string
yashodha [Fri, 24 Mar 2017 15:13:08 +0000 (20:43 +0530)]
CRM-20340 - translate string

7 years agoMerge pull request #10025 from civicrm/JoeMurray-patch-1
Yashodha Chaku [Fri, 24 Mar 2017 08:34:46 +0000 (14:04 +0530)]
Merge pull request #10025 from civicrm/JoeMurray-patch-1

CRM-20313 whitespace cleanup

7 years agoCRM-20275 Added credit card type field for contributions by organization report
Edsel [Mon, 13 Feb 2017 13:25:40 +0000 (18:55 +0530)]
CRM-20275 Added credit card type field for contributions by organization report

7 years agoCRM-20277 Added credit card type field to contributions by household report
Edsel [Wed, 15 Feb 2017 10:33:40 +0000 (16:03 +0530)]
CRM-20277 Added credit card type field to contributions by household report

7 years agoCRM-20278 Added credit card type field to top donor report
Edsel [Wed, 15 Feb 2017 10:37:48 +0000 (16:07 +0530)]
CRM-20278 Added credit card type field to top donor report

----------------------------------------
* CRM-19997: Add Credit card type fields in contribution related reports
  https://issues.civicrm.org/jira/browse/CRM-19997

7 years agoCRM-20279 Added credit card type field to SYBUNT report
Edsel [Wed, 15 Feb 2017 10:49:06 +0000 (16:19 +0530)]
CRM-20279 Added credit card type field to SYBUNT report

----------------------------------------
* CRM-19997: Add Credit card type fields in contribution related reports
  https://issues.civicrm.org/jira/browse/CRM-19997

----------------------------------------
* CRM-20279:
  https://issues.civicrm.org/jira/browse/CRM-20279

CRM-20279 Added credit card type field for SYBUNT report

----------------------------------------
* CRM-20279: Add credit card type field for SYBUNT report
  https://issues.civicrm.org/jira/browse/CRM-20279

CRM-20279 Fixed report to read from card type rather than credit card type

----------------------------------------
* CRM-20279: Add credit card type field for SYBUNT report
  https://issues.civicrm.org/jira/browse/CRM-20279

CRM-20279 Removed line break

----------------------------------------
* CRM-20279:
  https://issues.civicrm.org/jira/browse/CRM-20279

7 years agoCRM-20280 Added credit card type field to LYBUNT report
Edsel [Wed, 15 Feb 2017 10:55:39 +0000 (16:25 +0530)]
CRM-20280 Added credit card type field to LYBUNT report

----------------------------------------
* CRM-19997: Add Credit card type fields in contribution related reports
  https://issues.civicrm.org/jira/browse/CRM-19997

----------------------------------------
* CRM-20280:
  https://issues.civicrm.org/jira/browse/CRM-20280

CRM-20280 Added credit card type field for LYBUNT report

----------------------------------------
* CRM-20280: Add credit card type field for LYBUNT report
  https://issues.civicrm.org/jira/browse/CRM-20280

CRM-20280 Fixed report to read from card type rather than credit card type

----------------------------------------
* CRM-20280: Add credit card type field for LYBUNT report
  https://issues.civicrm.org/jira/browse/CRM-20280

CRM-20280 Removed line break

----------------------------------------
* CRM-20280:
  https://issues.civicrm.org/jira/browse/CRM-20280

7 years agoCRM-20281 Added credit card type field to soft credit report
Edsel [Wed, 15 Feb 2017 11:15:23 +0000 (16:45 +0530)]
CRM-20281 Added credit card type field to soft credit report

----------------------------------------
* CRM-19997: Add Credit card type fields in contribution related reports
  https://issues.civicrm.org/jira/browse/CRM-19997

----------------------------------------
* CRM-20281:
  https://issues.civicrm.org/jira/browse/CRM-20281

CRM-20281 Added credit card type field for Soft Credit report

----------------------------------------
* CRM-20281: Add credit card type field for Soft Credit Report
  https://issues.civicrm.org/jira/browse/CRM-20281

CRM-20281 Fixed report to read from card type rather than credit card type

----------------------------------------
* CRM-20281: Add credit card type field for Soft Credit Report
  https://issues.civicrm.org/jira/browse/CRM-20281

CRM-20281 Removed line break

----------------------------------------
* CRM-20281:
  https://issues.civicrm.org/jira/browse/CRM-20281

7 years agoCRM-20284 Added credit card type field to contribute aggregate by relationship report
Edsel [Wed, 15 Feb 2017 11:29:55 +0000 (16:59 +0530)]
CRM-20284 Added credit card type field to contribute aggregate by relationship report

----------------------------------------
* CRM-19997: Add Credit card type fields in contribution related reports
  https://issues.civicrm.org/jira/browse/CRM-19997

----------------------------------------
* CRM-20284:
  https://issues.civicrm.org/jira/browse/CRM-20284

CRM-20284 Added credit card type field for Contribution Aggregate by relationship report

----------------------------------------
* CRM-20284: Add credit card type field for Contribution Aggregate by Relationship report
  https://issues.civicrm.org/jira/browse/CRM-20284

CRM-20284 Fixed report to read from card type rather than credit card type

----------------------------------------
* CRM-20284: Add credit card type field for Contribution Aggregate by Relationship report
  https://issues.civicrm.org/jira/browse/CRM-20284

CRM-20284 Removed line break

----------------------------------------
* CRM-20284:
  https://issues.civicrm.org/jira/browse/CRM-20284

7 years agoQa fix
deb.monish [Fri, 24 Mar 2017 04:48:31 +0000 (10:18 +0530)]
Qa fix

7 years agoCRM-20285 Added credit card type field to recurring contributions report
Edsel [Wed, 15 Feb 2017 11:34:47 +0000 (17:04 +0530)]
CRM-20285 Added credit card type field to recurring contributions report

----------------------------------------
* CRM-19997: Add Credit card type fields in contribution related reports
  https://issues.civicrm.org/jira/browse/CRM-19997

----------------------------------------
* CRM-20285:
  https://issues.civicrm.org/jira/browse/CRM-20285

CRM-20285 Added credit card type field for recurring contributions report

----------------------------------------
* CRM-20285: Add credit card type field for Recurring Contributions report
  https://issues.civicrm.org/jira/browse/CRM-20285

CRM-20285 Fixed report to read from card type rather than credit card type

----------------------------------------
* CRM-20285: Add credit card type field for Recurring Contributions report
  https://issues.civicrm.org/jira/browse/CRM-20285

CRM-20285 Removed line break

----------------------------------------
* CRM-20285:
  https://issues.civicrm.org/jira/browse/CRM-20285

7 years agoMerge pull request #10037 from JMAConsulting/CRM-20331
Eileen McNaughton [Fri, 24 Mar 2017 01:23:51 +0000 (14:23 +1300)]
Merge pull request #10037 from JMAConsulting/CRM-20331

CRM-20331, added code to show card type and pan truncation besides pa…

7 years ago4.7.18 rc (#10045)
Eileen McNaughton [Fri, 24 Mar 2017 01:12:11 +0000 (14:12 +1300)]
4.7.18 rc (#10045)

* CRM-20334, some times payment object is not set and is protected variable

----------------------------------------
* CRM-20334: Fatal Error on Submit Credit Card Form
  https://issues.civicrm.org/jira/browse/CRM-20334

* Minor test tidy up.

(this is actually because we need a commit to do a merge to master after the same commit was merged to both).

7 years agoMerge pull request #10038 from jaapjansma/CRM-20330
Eileen McNaughton [Thu, 23 Mar 2017 22:00:19 +0000 (11:00 +1300)]
Merge pull request #10038 from jaapjansma/CRM-20330

Fixed CRM-20330: composite primary keys

7 years agoMerge pull request #10039 from JMAConsulting/CRM-20334
Eileen McNaughton [Thu, 23 Mar 2017 21:52:55 +0000 (10:52 +1300)]
Merge pull request #10039 from JMAConsulting/CRM-20334

CRM-20334, Fatal Error on Submit Credit Card Contribution Form

7 years agoCRM-20283 Added credit card type field for PCP report (#9996)
Edsel Roque Lopez [Thu, 23 Mar 2017 21:44:37 +0000 (03:14 +0530)]
CRM-20283 Added credit card type field for PCP report (#9996)

* CRM-20283 Added credit card type field to PCP report

----------------------------------------
* CRM-19997: Add Credit card type fields in contribution related reports
  https://issues.civicrm.org/jira/browse/CRM-19997

----------------------------------------
* CRM-20283:
  https://issues.civicrm.org/jira/browse/CRM-20283

CRM-20283 Added credit card type field for PCP report

----------------------------------------
* CRM-20283: Add credit card type field for PCP report
  https://issues.civicrm.org/jira/browse/CRM-20283

CRM-20283 Bug fixes

----------------------------------------
* CRM-20283: Add credit card type field for PCP report
  https://issues.civicrm.org/jira/browse/CRM-20283

CRM-20283 Fixed report to read from card type rather than credit card type

----------------------------------------
* CRM-20283: Add credit card type field for PCP report
  https://issues.civicrm.org/jira/browse/CRM-20283

CRM-20283 Removed line break

----------------------------------------
* CRM-20283:
  https://issues.civicrm.org/jira/browse/CRM-20283

* QA fixes

7 years agoCRM-20334, some times payment object is not set and is protected variable
Pradeep Nayak [Thu, 23 Mar 2017 14:24:24 +0000 (19:54 +0530)]
CRM-20334, some times payment object is not set and is protected variable

----------------------------------------
* CRM-20334: Fatal Error on Submit Credit Card Form
  https://issues.civicrm.org/jira/browse/CRM-20334

7 years agoFixed CRM-20330: provided a way to generate a table with a composite primary key...
Jaap Jansma [Thu, 23 Mar 2017 13:35:12 +0000 (14:35 +0100)]
Fixed CRM-20330: provided a way to generate a table with a composite primary key. Because the generation of dao functionality is changed all the DAO's had to be regenerated.

7 years agoCRM-20331, added code to show card type and pan truncation besides payment method...
Pradeep Nayak [Thu, 23 Mar 2017 12:54:57 +0000 (18:24 +0530)]
CRM-20331, added code to show card type and pan truncation besides payment method under transaction listing for contribution

----------------------------------------
* CRM-20331: Add card type and pan truncation besides payment method
  https://issues.civicrm.org/jira/browse/CRM-20331

7 years agoMerge pull request #9968 from fuzionnz/remove_crm_core_form_generateid
Eileen McNaughton [Thu, 23 Mar 2017 10:53:23 +0000 (23:53 +1300)]
Merge pull request #9968 from fuzionnz/remove_crm_core_form_generateid

Remove CRM_Core_Form::generateID().

7 years agoSet version to 4.7.19
Tim Otten [Thu, 23 Mar 2017 07:56:15 +0000 (00:56 -0700)]
Set version to 4.7.19

7 years agoMerge pull request #9869 from omarabuhussein/CRM-20140-fix-alterMailParams-hook
Tim Otten [Thu, 23 Mar 2017 07:55:08 +0000 (00:55 -0700)]
Merge pull request #9869 from omarabuhussein/CRM-20140-fix-alterMailParams-hook

CRM-20140: Fix alterMailParams hook to accept custom subject tokens

7 years agoMerge pull request #10035 from eileenmcnaughton/dedup_remove
Eileen McNaughton [Thu, 23 Mar 2017 06:12:17 +0000 (19:12 +1300)]
Merge pull request #10035 from eileenmcnaughton/dedup_remove

Towards CRM-19612 improve tests to allow replication of the issue

7 years agoTowards CRM-19612 improve tests to allow replication of the issue
eileen [Thu, 23 Mar 2017 04:49:58 +0000 (17:49 +1300)]
Towards CRM-19612 improve tests to allow replication of the issue

7 years agoMerge pull request #10033 from colemanw/CRM-20327
Eileen McNaughton [Thu, 23 Mar 2017 04:50:31 +0000 (17:50 +1300)]
Merge pull request #10033 from colemanw/CRM-20327

CRM-20327 - API chaining - replace $value when using operators.

7 years agoMerge pull request #10034 from eileenmcnaughton/dedup_remove
Eileen McNaughton [Thu, 23 Mar 2017 04:50:18 +0000 (17:50 +1300)]
Merge pull request #10034 from eileenmcnaughton/dedup_remove

Towards CRM-20155 remove duplicate calls to dedupe functions.

7 years agoCRM-20327 - API chaining - replace $value when using operators.
Coleman Watts [Wed, 22 Mar 2017 23:24:16 +0000 (19:24 -0400)]
CRM-20327 - API chaining - replace $value when using operators.

7 years agoTowards CRM-20155 remove duplicate calls to dedupe functions.
eileen [Thu, 23 Mar 2017 02:18:17 +0000 (15:18 +1300)]
Towards CRM-20155 remove duplicate calls to dedupe functions.

This is a partial commit which covers the best tested section of these & establishes the new functions.

I didn't want to make the commit too daunting. The bin file probably has not been used in years
hence all the require_once calls :-)

7 years agoMerge pull request #10032 from eileenmcnaughton/enotice
Eileen McNaughton [Wed, 22 Mar 2017 22:44:28 +0000 (11:44 +1300)]
Merge pull request #10032 from eileenmcnaughton/enotice

Enotice fix

7 years agoEnotice fix
eileen [Wed, 22 Mar 2017 20:51:17 +0000 (09:51 +1300)]
Enotice fix

7 years agoMerge pull request #9970 from eileenmcnaughton/front_end_recur
Eileen McNaughton [Wed, 22 Mar 2017 20:49:50 +0000 (09:49 +1300)]
Merge pull request #9970 from eileenmcnaughton/front_end_recur

CRM-20251 Make it easier to overwrite front end form help text regard…

7 years agoMerge pull request #10005 from eileenmcnaughton/membership_date
Eileen McNaughton [Wed, 22 Mar 2017 20:21:04 +0000 (09:21 +1300)]
Merge pull request #10005 from eileenmcnaughton/membership_date

CRM-20294 Update membership dates in profiles to use datepicker

7 years agoCRM-20251 Make it easier to overwrite front end form help text regarding recurring
eileen [Mon, 13 Mar 2017 07:57:56 +0000 (20:57 +1300)]
CRM-20251 Make it easier to overwrite front end form help text regarding recurring

7 years agoLabels instead of IDs
Stan Dragnev [Wed, 22 Mar 2017 15:18:58 +0000 (11:18 -0400)]
Labels instead of IDs

CRM-20311 - Membership cancelation activity

----------------------------------------
* CRM-20311: Membership cancelation via contribution doesn't create membership status change activity
  https://issues.civicrm.org/jira/browse/CRM-20311

7 years agoOne less look up as suggested
Stan Dragnev [Wed, 22 Mar 2017 15:14:29 +0000 (11:14 -0400)]
One less look up as suggested

CRM-20311 - Membership cancelation via contribution activity

----------------------------------------
* CRM-20311: Membership cancelation via contribution doesn't create membership status change activity
  https://issues.civicrm.org/jira/browse/CRM-20311

7 years agoMerge pull request #10029 from eileenmcnaughton/test
Eileen McNaughton [Wed, 22 Mar 2017 10:53:06 +0000 (23:53 +1300)]
Merge pull request #10029 from eileenmcnaughton/test

Fix up test to create line_items & memberships accurately

7 years agoFix up test to create line_items & memberships accurately
eileen [Wed, 22 Mar 2017 10:06:05 +0000 (23:06 +1300)]
Fix up test to create line_items & memberships accurately

7 years agoMerge pull request #10017 from colemanw/CRM-20302
Tim Otten [Wed, 22 Mar 2017 07:10:25 +0000 (00:10 -0700)]
Merge pull request #10017 from colemanw/CRM-20302

CRM-20302 - Support search by/return tags in case api

7 years agowhitespace cleanup
Joe Murray [Tue, 21 Mar 2017 20:33:53 +0000 (16:33 -0400)]
whitespace cleanup

removed a space and several blank lines

7 years agoMerge pull request #9788 from fliespl/patch-1
Eileen McNaughton [Tue, 21 Mar 2017 19:29:02 +0000 (08:29 +1300)]
Merge pull request #9788 from fliespl/patch-1

CRM-19914 - civicrmHooks.php issues on windows

7 years agoCRM-20311 - Membership cancelation via contribution doesn't create membership status...
Stan Dragnev [Tue, 21 Mar 2017 18:29:34 +0000 (14:29 -0400)]
CRM-20311 - Membership cancelation via contribution doesn't create membership status change activity

Proposed fix adds the activity bit of code to the deprecated function in CRM_Contribute_BAO_Contribution. Long term fix will probably depend on what happens with this function in the future.

7 years agoMerge pull request #10016 from ErichBSchulz/refaction_entity_action_permissions
Tim Otten [Tue, 21 Mar 2017 08:02:27 +0000 (01:02 -0700)]
Merge pull request #10016 from ErichBSchulz/refaction_entity_action_permissions

extract two core API permission functions

7 years agoCRM-20102 - Fix case role lookup by name instead of label
Coleman Watts [Tue, 21 Mar 2017 01:43:24 +0000 (21:43 -0400)]
CRM-20102 - Fix case role lookup by name instead of label

7 years agoApi3 - Fix metadata for getsingle
Coleman Watts [Mon, 20 Mar 2017 14:45:45 +0000 (10:45 -0400)]
Api3 - Fix metadata for getsingle

7 years agoCRM-20302 - Support search by/return tags in case api
Coleman Watts [Mon, 20 Mar 2017 14:45:18 +0000 (10:45 -0400)]
CRM-20302 - Support search by/return tags in case api

7 years agoActivity API - Remove redundant input checks
Coleman Watts [Mon, 20 Mar 2017 14:43:17 +0000 (10:43 -0400)]
Activity API - Remove redundant input checks

Validate integer is performed by the api wrapper.

7 years agoMerge pull request #10020 from jitendrapurohit/CRM-20216
Yashodha Chaku [Mon, 20 Mar 2017 11:30:43 +0000 (17:00 +0530)]
Merge pull request #10020 from jitendrapurohit/CRM-20216

CRM-20216 - Dedupe rules should be prevented from being saved if Weig…

7 years agoMerge pull request #10019 from eileenmcnaughton/cacheid
Eileen McNaughton [Mon, 20 Mar 2017 07:13:59 +0000 (20:13 +1300)]
Merge pull request #10019 from eileenmcnaughton/cacheid

CRM-19385 - remove dependence on ids in cache tables.

7 years agoCRM-20216 - Dedupe rules should be prevented from being saved if Weight Threshold...
Jitendra Purohit [Mon, 20 Mar 2017 05:40:58 +0000 (11:10 +0530)]
CRM-20216 - Dedupe rules should be prevented from being saved if Weight Threshold is null or zero

7 years agoCRM-19385 - remove dependence on ids in cache tables.
eileen [Mon, 20 Mar 2017 04:34:00 +0000 (17:34 +1300)]
CRM-19385 - remove dependence on ids in cache tables.

This removes the use of the primary id keys in the cache tables. The upgrade part of this
has gone stale a few times but I feel sure that this part is tested & confirmed
and committing this part will make testing easier

7 years agofix comment to comply with style
Erich Schulz [Mon, 20 Mar 2017 00:34:07 +0000 (10:34 +1000)]
fix comment to comply with style

7 years agoextract two core API permission functions
Erich Schulz [Sun, 19 Mar 2017 10:28:10 +0000 (20:28 +1000)]
extract two core API permission functions

This will enable a bit of discoverability for the entity x action
matrix.

This is pretty much a cut and paste job so should be no functional
change.

7 years agoMerge pull request #8980 from ergonlogic/dev/CRM-19308
Eileen McNaughton [Sun, 19 Mar 2017 06:18:02 +0000 (19:18 +1300)]
Merge pull request #8980 from ergonlogic/dev/CRM-19308

Fixes CRM-19308: Disallow false-y values for paths purged during cach…

7 years agoMerge pull request #10014 from totten/master-email-recip
Eileen McNaughton [Sun, 19 Mar 2017 05:51:07 +0000 (18:51 +1300)]
Merge pull request #10014 from totten/master-email-recip

CRM-20299 - CiviMail UI - Cleanup "Location Type" and "Selection Method"

7 years agoMerge pull request #9789 from fliespl/patch-2
Eileen McNaughton [Sun, 19 Mar 2017 05:38:16 +0000 (18:38 +1300)]
Merge pull request #9789 from fliespl/patch-2

CRM-19979 - Too big amount saved despite error

7 years agoMerge pull request #9971 from eileenmcnaughton/delayed_recur
Eileen McNaughton [Sat, 18 Mar 2017 03:20:18 +0000 (16:20 +1300)]
Merge pull request #9971 from eileenmcnaughton/delayed_recur

CRM-20252 Improve text when processing possibly-delayed-payments

7 years agoMerge pull request #10013 from seanmadsen/GenCodeChecksum
Eileen McNaughton [Sat, 18 Mar 2017 02:37:52 +0000 (15:37 +1300)]
Merge pull request #10013 from seanmadsen/GenCodeChecksum

New GenCodeChecksum for auto-generated DAO files

7 years agoMerge pull request #9751 from eileenmcnaughton/report
Eileen McNaughton [Sat, 18 Mar 2017 01:49:54 +0000 (14:49 +1300)]
Merge pull request #9751 from eileenmcnaughton/report

Minor comment fixes & function extraction.

7 years agoFix mis-cased class ref
eileen [Mon, 30 Jan 2017 07:55:12 +0000 (20:55 +1300)]
Fix mis-cased class ref

7 years agoCRM-20299 - CiviMail - "Location Type" requirement feels wonky
Tim Otten [Fri, 17 Mar 2017 23:25:22 +0000 (16:25 -0700)]
CRM-20299 - CiviMail - "Location Type" requirement feels wonky

If you select a "Location Type" and then deselect it, the field changes
to "Automatic". This is the default value (which is acceptable), but the UI
flags it as erroneous.

The "Selection Method" also defaults to "Automatic".  These fields are oddly
a bit different (e.g.  "Automatic" translates to `location_type_id==null`
and `email_selection_method=automatic`), so the fields are a little
different, but this revision brings them closer.

7 years agoCRM-20299 - CiviMail UI - Refresh recipient list after changing advanced options
Tim Otten [Fri, 17 Mar 2017 23:23:36 +0000 (16:23 -0700)]
CRM-20299 - CiviMail UI - Refresh recipient list after changing advanced options

When composing a new mailing, there are advanced options for targetting
recipients by location type (`location_type_id`, `email_selection_method`).
This ensures that the estimate recipient count updates to match the
selection.

7 years agoComment fixes
eileen [Sun, 29 Jan 2017 21:53:06 +0000 (10:53 +1300)]
Comment fixes

7 years agoExtract report functions for readability & overidabiity
eileen [Mon, 30 Jan 2017 07:53:50 +0000 (20:53 +1300)]
Extract report functions for readability & overidabiity

7 years agoNew GenCodeChecksum for auto-generated DAO files
Sean Madsen [Fri, 17 Mar 2017 22:06:30 +0000 (16:06 -0600)]
New GenCodeChecksum for auto-generated DAO files
@totten recommended that I submit this PR
http://civicrm.stackexchange.com/questions/17722/why-do-i-have-gencodechecksum-uncommitted-changes-after-a-fresh-civibuild-create/17724#17724

7 years agoCRM-20252 Improve text when processing possibly-delayed-payments
eileen [Mon, 13 Mar 2017 08:40:33 +0000 (21:40 +1300)]
CRM-20252 Improve text when processing possibly-delayed-payments

7 years agoMerge pull request #10011 from eileenmcnaughton/test
Eileen McNaughton [Fri, 17 Mar 2017 21:13:55 +0000 (10:13 +1300)]
Merge pull request #10011 from eileenmcnaughton/test

Fix test to use name that will not cause intermittant errors

7 years agoMerge pull request #9999 from JMAConsulting/CRM-20286
Eileen McNaughton [Fri, 17 Mar 2017 20:25:10 +0000 (09:25 +1300)]
Merge pull request #9999 from JMAConsulting/CRM-20286

CRM-20286, added card type field on contribution search form

7 years agoFix test to use name that will not cause intermittant errors
eileen [Fri, 17 Mar 2017 20:23:27 +0000 (09:23 +1300)]
Fix test to use name that will not cause intermittant errors

7 years agoMerge pull request #10008 from civicrm/JoeMurray-patch-1
Eileen McNaughton [Fri, 17 Mar 2017 20:16:23 +0000 (09:16 +1300)]
Merge pull request #10008 from civicrm/JoeMurray-patch-1

Correct description of order api

7 years agoCorrect description
Joe Murray [Fri, 17 Mar 2017 18:02:38 +0000 (14:02 -0400)]
Correct description

There are no order records as there is no order table.

7 years agoCRM-20286, added card type form fields
Pradeep Nayak [Wed, 15 Mar 2017 12:30:05 +0000 (18:00 +0530)]
CRM-20286, added card type form fields

----------------------------------------
* CRM-20286: Add card type field on search form
  https://issues.civicrm.org/jira/browse/CRM-20286

CRM-20286, code cleanup and defined $_wheretables and $_tables correctly for batch and is_payment fields

----------------------------------------
* CRM-20286: Add card type field on search form
  https://issues.civicrm.org/jira/browse/CRM-20286

CRM-20286, added where clause for card type

----------------------------------------
* CRM-20286: Add card type field on search form
  https://issues.civicrm.org/jira/browse/CRM-20286

CRM-20286, added unit test

----------------------------------------
* CRM-20286: Add card type field on search form
  https://issues.civicrm.org/jira/browse/CRM-20286

Use metadata based method to add field to form

CRM-20286 Minor changes

----------------------------------------
* CRM-20286: Add card type field on search form
  https://issues.civicrm.org/jira/browse/CRM-20286

7 years agoMerge pull request #9995 from JMAConsulting/CRM-20282
Eileen McNaughton [Fri, 17 Mar 2017 07:20:23 +0000 (20:20 +1300)]
Merge pull request #9995 from JMAConsulting/CRM-20282

CRM-20282 Added credit card type field to bookkeeping report

7 years agoMerge pull request #10004 from eileenmcnaughton/selector
Yashodha Chaku [Fri, 17 Mar 2017 07:12:03 +0000 (12:42 +0530)]
Merge pull request #10004 from eileenmcnaughton/selector

CRM-20208 rename 'In Selector' to 'Results Column' on Profile admin s…

7 years agoCRM-20294 Update membership dates in profiles to use datepicker
eileen [Fri, 17 Mar 2017 07:03:01 +0000 (20:03 +1300)]
CRM-20294 Update membership dates in profiles to use datepicker

7 years agoMerge pull request #10002 from colemanw/News
Eileen McNaughton [Fri, 17 Mar 2017 06:25:51 +0000 (19:25 +1300)]
Merge pull request #10002 from colemanw/News

News dashlet - don't show count when it's zero

7 years agoCRM-20208 rename 'In Selector' to 'Results Column' on Profile admin screens.
eileen [Fri, 17 Mar 2017 03:10:47 +0000 (16:10 +1300)]
CRM-20208 rename 'In Selector' to 'Results Column' on Profile admin screens.

THis is based on a recommendatation in the JIRA suggesting this would be less confusing & inline with the documentation

7 years agoCRM-20011 fix loss of data for yyyy-mm custom field
eileen [Mon, 13 Feb 2017 10:08:10 +0000 (23:08 +1300)]
CRM-20011 fix loss of data for yyyy-mm custom field

7 years agoNews dashlet - don't show count when it's zero
Coleman Watts [Fri, 17 Mar 2017 02:49:57 +0000 (22:49 -0400)]
News dashlet - don't show count when it's zero

7 years agoMerge pull request #9979 from mattwire/disable_payment_processor2
Eileen McNaughton [Fri, 17 Mar 2017 02:26:55 +0000 (15:26 +1300)]
Merge pull request #9979 from mattwire/disable_payment_processor2

CRM-19900: Disable/enable both processors directly in BAO create function

7 years agoMerge pull request #9421 from eileenmcnaughton/recur_icon
Eileen McNaughton [Fri, 17 Mar 2017 01:40:26 +0000 (14:40 +1300)]
Merge pull request #9421 from eileenmcnaughton/recur_icon

CRM-19674 Add ability to see at a glance if a contribution is part of…

7 years agoMerge pull request #10000 from eileenmcnaughton/agile
Eileen McNaughton [Fri, 17 Mar 2017 00:44:00 +0000 (13:44 +1300)]
Merge pull request #10000 from eileenmcnaughton/agile

CRM-19710 - Preserve is_email_receipt parameter through to email sent

7 years agoMerge pull request #9986 from JMAConsulting/CRM-20272
Eileen McNaughton [Thu, 16 Mar 2017 19:29:22 +0000 (08:29 +1300)]
Merge pull request #9986 from JMAConsulting/CRM-20272

CRM-20272 Added credit card type field for contribution summary report

7 years agoMerge pull request #9980 from mickadoo/CRM-20254-cache-busting-custom-css
Tim Otten [Thu, 16 Mar 2017 18:49:46 +0000 (11:49 -0700)]
Merge pull request #9980 from mickadoo/CRM-20254-cache-busting-custom-css

CRM-20254: add cache buster string for custom CSS

7 years agoMerge pull request #9802 from eileenmcnaughton/lower
colemanw [Thu, 16 Mar 2017 14:02:52 +0000 (10:02 -0400)]
Merge pull request #9802 from eileenmcnaughton/lower

 CRM-19980, CRM-19811 - Fix slow queries due to LOWER on contact name…

7 years agoCRM-20282 Added credit card type field to bookkeeping report
Edsel [Wed, 15 Feb 2017 11:19:22 +0000 (16:49 +0530)]
CRM-20282 Added credit card type field to bookkeeping report

----------------------------------------
* CRM-19997: Add Credit card type fields in contribution related reports
  https://issues.civicrm.org/jira/browse/CRM-19997

----------------------------------------
* CRM-20282:
  https://issues.civicrm.org/jira/browse/CRM-20282

CRM-20282 Fixed report to read from card type rather than credit card type

----------------------------------------
* CRM-20282: Add credit card type field for Bookkeeping report
  https://issues.civicrm.org/jira/browse/CRM-20282