civicrm-core.git
7 years agoCRM-20400, fixed payment receipt
Pradeep Nayak [Fri, 7 Apr 2017 19:47:45 +0000 (01:17 +0530)]
CRM-20400, fixed payment receipt

----------------------------------------
* CRM-20400: Update the Payment Receipt to use for Contribution pyament
  https://issues.civicrm.org/jira/browse/CRM-20400

7 years agoMerge pull request #9773 from monishdeb/CRM-19663
Monish Deb [Fri, 7 Apr 2017 07:18:53 +0000 (12:48 +0530)]
Merge pull request #9773 from monishdeb/CRM-19663

CRM-19663: A scheduled reminder set to use an absolute date does not allow repeats

7 years agoMerge pull request #10113 from JMAConsulting/IIDA-116
Monish Deb [Thu, 6 Apr 2017 12:23:33 +0000 (17:53 +0530)]
Merge pull request #10113 from JMAConsulting/IIDA-116

IIDA-116 Refactored Deferred Revenue report to follow more standardized approach.

7 years agoIIDA-116 Fixed batch labels
Edsel [Thu, 6 Apr 2017 10:30:03 +0000 (16:00 +0530)]
IIDA-116 Fixed batch labels

7 years agoIIDA-116 Added extra columns and made existing columns selectable
Edsel [Fri, 17 Mar 2017 11:55:26 +0000 (17:25 +0530)]
IIDA-116 Added extra columns and made existing columns selectable

Conflicts:
CRM/Report/Form/Contribute/DeferredRevenue.php

Conflicts:
CRM/Report/Form/Contribute/DeferredRevenue.php

IIDA-116 Indentation for better readability

IIDA-116 Refactored deferred revenue report

Conflicts:
CRM/Report/Form/Contribute/DeferredRevenue.php

Conflicts:
CRM/Report/Form/Contribute/DeferredRevenue.php

IIDA-119 Used API rather than query

Conflicts:
CRM/Financial/BAO/FinancialAccount.php

IIDA-116 Added Revenue Recognition date toggle filter

IIDA-116 Added hotlinks

IIDA-116 Fixed jenkins errors

7 years agoMerge pull request #10122 from seamuslee001/CRM-20308
Eileen McNaughton [Thu, 6 Apr 2017 10:25:21 +0000 (22:25 +1200)]
Merge pull request #10122 from seamuslee001/CRM-20308

CRM-20308 CRM-19657 Toward CRM-20308 & support CRM-19657 Extract using domain from and lo…

7 years agoToward CRM-20308 & support CRM-19657 Extract using domain from and logged in user...
Seamus Lee [Thu, 6 Apr 2017 08:56:23 +0000 (18:56 +1000)]
Toward CRM-20308 & support CRM-19657 Extract using domain from and logged in user from email details into separate function for re-use

7 years agoMerge pull request #10028 from jitendrapurohit/is_public_group_fix
Monish Deb [Thu, 6 Apr 2017 07:17:29 +0000 (12:47 +0530)]
Merge pull request #10028 from jitendrapurohit/is_public_group_fix

CRM-20318: Add is_public setting on Custom groups

7 years agoMerge pull request #10120 from seamuslee001/CRM-19741
Eileen McNaughton [Thu, 6 Apr 2017 06:07:08 +0000 (18:07 +1200)]
Merge pull request #10120 from seamuslee001/CRM-19741

CRM-19741 Add back in fix and add in unit tests to lock in fix

7 years agoFix additional issues
Jitendra Purohit [Thu, 6 Apr 2017 04:45:26 +0000 (10:15 +0530)]
Fix additional issues

7 years agoCRM-19741 Add back in fix and add in unit tests to lock in fix
Seamus Lee [Thu, 6 Apr 2017 00:58:29 +0000 (10:58 +1000)]
CRM-19741 Add back in fix and add in unit tests to lock in fix

7 years agoMerge pull request #10084 from jitendrapurohit/CRM-19243
Eileen McNaughton [Thu, 6 Apr 2017 01:13:40 +0000 (13:13 +1200)]
Merge pull request #10084 from jitendrapurohit/CRM-19243

CRM-19243: Free membership results in two email receipts

7 years agoMerge pull request #10116 from colemanw/CRM-20390
Eileen McNaughton [Thu, 6 Apr 2017 00:24:53 +0000 (12:24 +1200)]
Merge pull request #10116 from colemanw/CRM-20390

CRM-20390 - Fix select2 data type mismatch

7 years agoMerge pull request #10119 from eileenmcnaughton/deprecated
Eileen McNaughton [Thu, 6 Apr 2017 00:02:15 +0000 (12:02 +1200)]
Merge pull request #10119 from eileenmcnaughton/deprecated

Add deprecation comments, CRM-19987

7 years agoMerge pull request #10021 from jitendrapurohit/CRM-20246
Eileen McNaughton [Wed, 5 Apr 2017 23:44:45 +0000 (11:44 +1200)]
Merge pull request #10021 from jitendrapurohit/CRM-20246

CRM-20246: maxfilesize on import should respect 0 as meaning 'no limit'

7 years agoMerge pull request #10093 from jitendrapurohit/CRM-20343
Eileen McNaughton [Wed, 5 Apr 2017 23:39:39 +0000 (11:39 +1200)]
Merge pull request #10093 from jitendrapurohit/CRM-20343

CRM-20343: skip status calculation when form dates are not modified.

7 years agoMerge pull request #9276 from seamuslee001/CRM-19517
Eileen McNaughton [Wed, 5 Apr 2017 23:16:22 +0000 (11:16 +1200)]
Merge pull request #9276 from seamuslee001/CRM-19517

CRM-19517 allow price fields that use disabled financial types to sho…

7 years agoAdd deprecation comments, CRM-19987
eileen [Wed, 5 Apr 2017 23:05:48 +0000 (11:05 +1200)]
Add deprecation comments, CRM-19987

7 years agoMerge pull request #10095 from mattwire/membership_force_auto_renew
Eileen McNaughton [Wed, 5 Apr 2017 22:15:59 +0000 (10:15 +1200)]
Merge pull request #10095 from mattwire/membership_force_auto_renew

CRM-20375: Show message instead of checkbox when renew required. Hide checkbox w…

7 years agoMerge pull request #10118 from civicrm/4.7.18-rc
Tim Otten [Wed, 5 Apr 2017 21:59:49 +0000 (14:59 -0700)]
Merge pull request #10118 from civicrm/4.7.18-rc

4.7.18 rc

7 years agoMerge pull request #10096 from jmcclelland/CRM-20376
Eileen McNaughton [Wed, 5 Apr 2017 21:37:17 +0000 (09:37 +1200)]
Merge pull request #10096 from jmcclelland/CRM-20376

Crm 20376 - Fix field names on PDF/Print vesion of survey report

7 years agoMerge pull request #9916 from JMAConsulting/CRM-20207
Eileen McNaughton [Wed, 5 Apr 2017 21:36:13 +0000 (09:36 +1200)]
Merge pull request #9916 from JMAConsulting/CRM-20207

CRM-20207 Added invocation for selectWhereClause hook in activity SQL

7 years agoMerge pull request #10117 from colemanw/CRM-20179
Tim Otten [Wed, 5 Apr 2017 20:09:45 +0000 (13:09 -0700)]
Merge pull request #10117 from colemanw/CRM-20179

CRM-20179 - Fix race condition on manage group page

7 years agoCRM-20179 - Fix race condition on manage group page
Coleman Watts [Wed, 5 Apr 2017 18:39:06 +0000 (14:39 -0400)]
CRM-20179 - Fix race condition on manage group page

7 years agoCRM-20390 - Fix select2 data type mismatch
Coleman Watts [Wed, 5 Apr 2017 16:44:38 +0000 (12:44 -0400)]
CRM-20390 - Fix select2 data type mismatch

7 years agoCRM-20376 - fix typo in variable name.
Jamie McClelland [Wed, 5 Apr 2017 14:49:32 +0000 (10:49 -0400)]
CRM-20376 - fix typo in variable name.

7 years agoMerge pull request #10110 from mattwire/contributor
Eileen McNaughton [Wed, 5 Apr 2017 12:50:47 +0000 (00:50 +1200)]
Merge pull request #10110 from mattwire/contributor

Add my details

7 years agoMerge pull request #9880 from JMAConsulting/CRM-20158-4
Eileen McNaughton [Wed, 5 Apr 2017 12:17:40 +0000 (00:17 +1200)]
Merge pull request #9880 from JMAConsulting/CRM-20158-4

CRM-20158, added function to update credit card details like card typ…

7 years agominor
deb.monish [Wed, 5 Apr 2017 12:06:36 +0000 (17:36 +0530)]
minor

7 years agoAdd is_public setting on Custom groups
Jitendra Purohit [Wed, 22 Mar 2017 04:53:11 +0000 (10:23 +0530)]
Add is_public setting on Custom groups

7 years agoAdditional test fixes and adding CRM unit test
deb.monish [Mon, 3 Apr 2017 11:05:45 +0000 (16:35 +0530)]
Additional test fixes and adding CRM unit test

7 years agorefactor activity listing using API instead of SQL
deb.monish [Fri, 31 Mar 2017 10:40:14 +0000 (16:10 +0530)]
refactor activity listing using API instead of SQL

7 years agoCRM-20207 Added invocation for selectWhereClause hook in activity SQL
Edsel [Thu, 2 Mar 2017 11:48:08 +0000 (17:18 +0530)]
CRM-20207 Added invocation for selectWhereClause hook in activity SQL

----------------------------------------
* CRM-20207: Introduce selectWhereClause hook for activity results on activity tab contact summary page
  https://issues.civicrm.org/jira/browse/CRM-20207

7 years agoCRM-20158, added comments
Pradeep Nayak [Wed, 5 Apr 2017 09:46:37 +0000 (15:16 +0530)]
CRM-20158, added comments

----------------------------------------
* CRM-20158: Store card type and last 4 digits of credit card
  https://issues.civicrm.org/jira/browse/CRM-20158

7 years ago CRM-20158, added function to update credit card details like card type and pan trunc...
Pradeep Nayak [Wed, 22 Feb 2017 23:31:05 +0000 (05:01 +0530)]
 CRM-20158, added function to update credit card details like card type and pan truncation for contribution

----------------------------------------
* CRM-20158: Store card type and last 4 digits of credit card
  https://issues.civicrm.org/jira/browse/CRM-20158

CRM-20158, added test

----------------------------------------
* CRM-20158: Store card type and last 4 digits of credit card
  https://issues.civicrm.org/jira/browse/CRM-20158

CRM-20158, changed code to use api for update to financial trxn table and to retrieve data from financial trxn table

----------------------------------------
* CRM-20158: Store card type and last 4 digits of credit card
  https://issues.civicrm.org/jira/browse/CRM-20158

CRM-20158, placed function contribution BAO to update card details

----------------------------------------
* CRM-20158: Store card type and last 4 digits of credit card
  https://issues.civicrm.org/jira/browse/CRM-20158

CRM-20158, changed function defination and params and updated function calling

----------------------------------------
* CRM-20158: Store card type and last 4 digits of credit card
  https://issues.civicrm.org/jira/browse/CRM-20158

7 years agoAdd my details
Matthew Wire [Wed, 5 Apr 2017 08:06:22 +0000 (09:06 +0100)]
Add my details

7 years agoMerge pull request #10106 from eileenmcnaughton/index
Eileen McNaughton [Wed, 5 Apr 2017 04:25:04 +0000 (16:25 +1200)]
Merge pull request #10106 from eileenmcnaughton/index

CRM-20312 Add indices to DAO classes

7 years ago CRM-20312 regenerated DAOS with indexes
Aidan Saunders [Wed, 5 Apr 2017 03:05:06 +0000 (15:05 +1200)]
 CRM-20312 regenerated DAOS with indexes

7 years agoCRM-20312 Add indices to DAO classes
Aidan Saunders [Tue, 4 Apr 2017 22:56:29 +0000 (10:56 +1200)]
CRM-20312 Add indices to DAO classes

7 years agoMerge pull request #10108 from eileenmcnaughton/localizable
Eileen McNaughton [Wed, 5 Apr 2017 02:14:17 +0000 (14:14 +1200)]
Merge pull request #10108 from eileenmcnaughton/localizable

CRM-20312 add field localisation data to DAO.  …

7 years agoMerge pull request #10098 from agh1/4.7.18-release-notes
colemanw [Wed, 5 Apr 2017 01:48:43 +0000 (21:48 -0400)]
Merge pull request #10098 from agh1/4.7.18-release-notes

Release notes 4.7.18

7 years ago4.7.18 release notes: update contributors and key
Andrew Hunt [Wed, 5 Apr 2017 01:40:24 +0000 (21:40 -0400)]
4.7.18 release notes: update contributors and key

7 years agoCRM-20312 regenerated DAO with localisation
Aidan Saunders [Wed, 5 Apr 2017 01:27:34 +0000 (13:27 +1200)]
CRM-20312 regenerated DAO with localisation

7 years agoCRM-20312 add field localisation data to DAO.
Aidan Saunders [Wed, 5 Apr 2017 01:19:50 +0000 (13:19 +1200)]
CRM-20312 add field localisation data to DAO.

Towards index reconciliation

7 years agoMerge pull request #10107 from eileenmcnaughton/index_tidy
Eileen McNaughton [Wed, 5 Apr 2017 00:38:24 +0000 (12:38 +1200)]
Merge pull request #10107 from eileenmcnaughton/index_tidy

Minor spelling & casing  tidy ups

7 years agoMinor spelling & casing tidy ups
Aidan Saunders [Tue, 4 Apr 2017 23:09:41 +0000 (11:09 +1200)]
Minor spelling & casing  tidy ups

7 years ago4.7.18 release notes: finished issues, still need to fix credits
Andrew Hunt [Tue, 4 Apr 2017 21:57:15 +0000 (17:57 -0400)]
4.7.18 release notes: finished issues, still need to fix credits

7 years agoMerge pull request #9616 from ErichBSchulz/feature/drupal_boot_no_exit
Tim Otten [Tue, 4 Apr 2017 19:05:35 +0000 (12:05 -0700)]
Merge pull request #9616 from ErichBSchulz/feature/drupal_boot_no_exit

Feature/drupal boot no exit

7 years agoCRM-20376 - ensure questions are labelled Q1, Q2, etc in pdf report.
Jamie McClelland [Mon, 3 Apr 2017 17:44:32 +0000 (13:44 -0400)]
CRM-20376 - ensure questions are labelled Q1, Q2, etc in pdf report.

Also, replace deprecated method.

7 years agoMerge pull request #10036 from jitendrapurohit/CRM-20329
Monish Deb [Tue, 4 Apr 2017 12:24:39 +0000 (17:54 +0530)]
Merge pull request #10036 from jitendrapurohit/CRM-20329

CRM-20329: Backend Membership with Payment set to Failed results in M…

7 years agoMerge pull request #10101 from eileenmcnaughton/contribution
Eileen McNaughton [Tue, 4 Apr 2017 06:54:09 +0000 (18:54 +1200)]
Merge pull request #10101 from eileenmcnaughton/contribution

CRM-20379 move payment details above less important info

7 years agoMerge pull request #10100 from seamuslee001/CRM-19961-schema
Eileen McNaughton [Tue, 4 Apr 2017 06:02:57 +0000 (18:02 +1200)]
Merge pull request #10100 from seamuslee001/CRM-19961-schema

CRM-19961 Schema changes to make sms provider multisite aware

7 years agoCRM-20379 move payment details above less important info
eileen [Tue, 4 Apr 2017 05:49:12 +0000 (17:49 +1200)]
CRM-20379 move payment details above less important info

7 years agoMerge pull request #9371 from seamuslee001/CRM-19633
Eileen McNaughton [Tue, 4 Apr 2017 05:23:01 +0000 (17:23 +1200)]
Merge pull request #9371 from seamuslee001/CRM-19633

CRM-19633 Allow for Contribution pages to be viewed from any domain in a multisite setup

7 years agoCRM-19961 Schema changes to make sms provider multisite aware
Seamus Lee [Tue, 4 Apr 2017 04:51:31 +0000 (14:51 +1000)]
CRM-19961 Schema changes to make sms provider multisite aware

7 years agoMove upgrade logic to .19
Seamus Lee [Tue, 4 Apr 2017 04:32:26 +0000 (14:32 +1000)]
Move upgrade logic to .19

7 years agoMove upgrade logic to .16
Seamus Lee [Mon, 19 Dec 2016 20:42:46 +0000 (07:42 +1100)]
Move upgrade logic to .16

7 years agoCRM-19517 allow disabled financial types to show
Seamus Lee [Mon, 17 Oct 2016 20:37:02 +0000 (07:37 +1100)]
CRM-19517 allow disabled financial types to show

7 years ago4.7.18 release notes: features done, Heels won, I'll finish up tomorrow
Andrew Hunt [Tue, 4 Apr 2017 04:28:50 +0000 (00:28 -0400)]
4.7.18 release notes: features done, Heels won, I'll finish up tomorrow

7 years agoAlter var and comment as per Eileen
Seamus Lee [Tue, 4 Apr 2017 04:27:48 +0000 (14:27 +1000)]
Alter var and comment as per Eileen

7 years agoEnsure we clear out the cache just to be sure
Seamus Lee [Thu, 10 Nov 2016 20:25:30 +0000 (07:25 +1100)]
Ensure we clear out the cache just to be sure

Fix docblock

7 years agoRetrieve all pamyent processors if we have had an id passed in as most likely coming...
Seamus Lee [Thu, 10 Nov 2016 20:23:36 +0000 (07:23 +1100)]
Retrieve all pamyent processors if we have had an id passed in as most likely coming from a contribution form

7 years agoMerge pull request #9724 from civicrm/michaelmcandrew-CRM-19921
Eileen McNaughton [Tue, 4 Apr 2017 04:20:53 +0000 (16:20 +1200)]
Merge pull request #9724 from civicrm/michaelmcandrew-CRM-19921

CRM-19921

7 years agoMerge pull request #9960 from colemanw/CRM-20029
Eileen McNaughton [Tue, 4 Apr 2017 03:20:47 +0000 (15:20 +1200)]
Merge pull request #9960 from colemanw/CRM-20029

CRM-20029 - Copy custom files when duplicating an event

7 years agoMerge pull request #10040 from jaapjansma/CRM-20333
Eileen McNaughton [Tue, 4 Apr 2017 03:16:34 +0000 (15:16 +1200)]
Merge pull request #10040 from jaapjansma/CRM-20333

Fixed CRM-20333: search menu visible even when a user does not has access to any contacts.

7 years agoMerge pull request #10094 from mattwire/updatesubscription_fatal
Eileen McNaughton [Mon, 3 Apr 2017 22:21:31 +0000 (10:21 +1200)]
Merge pull request #10094 from mattwire/updatesubscription_fatal

CRM-20374 Be a bit more friendly rather than crashing with fatal when we can't …

7 years agoMerge pull request #10097 from jmcclelland/CRM-20378
Eileen McNaughton [Mon, 3 Apr 2017 22:05:40 +0000 (10:05 +1200)]
Merge pull request #10097 from jmcclelland/CRM-20378

Crm 20378 - simplify SurveyDetail report - improve line breaks in PDF, etc.

7 years ago4.7.18 release notes: raw from script
Andrew Hunt [Mon, 3 Apr 2017 21:58:16 +0000 (17:58 -0400)]
4.7.18 release notes: raw from script

7 years agoCRM-20378 - populate select aliases so totals in parens work
Jamie McClelland [Mon, 3 Apr 2017 20:26:12 +0000 (16:26 -0400)]
CRM-20378 - populate select aliases so totals in parens work

Without populating this variable, we get empty () when grouping.

7 years agoCRM-20378 - use Form.php to handle page breaks
Jamie McClelland [Mon, 3 Apr 2017 20:23:09 +0000 (16:23 -0400)]
CRM-20378 - use Form.php to handle page breaks

The only reason to override postProcess is for the page breaks
and for the custom cover sheet. We can handle the cover sheet
in compileContent and Form.php handles the page breaks for us.

7 years agoMerge pull request #10049 from twomice/CRM-19400_osm_tileserver
Eileen McNaughton [Mon, 3 Apr 2017 19:54:09 +0000 (07:54 +1200)]
Merge pull request #10049 from twomice/CRM-19400_osm_tileserver

CRM-19400: Use Carto tileserver for OpenStreetMap.

7 years agoBe a bit more friendly rather than crashing with fatal when we can't update the subsc...
Matthew Wire [Mon, 3 Apr 2017 14:15:41 +0000 (15:15 +0100)]
Be a bit more friendly rather than crashing with fatal when we can't update the subscription

7 years agoCRM-20343: skip status calculation when form dates are not modified.
Jitendra Purohit [Mon, 3 Apr 2017 10:04:10 +0000 (15:34 +0530)]
CRM-20343: skip status calculation when form dates are not modified.

7 years agoMerge pull request #10091 from eileenmcnaughton/trans
Eileen McNaughton [Mon, 3 Apr 2017 07:46:37 +0000 (19:46 +1200)]
Merge pull request #10091 from eileenmcnaughton/trans

CRM-20371 set is_transaction on best-effort attempt to create members…

7 years agoCRM-20371 set is_transaction on best-effort attempt to create membership payment
eileenmcnaugton [Mon, 3 Apr 2017 04:10:41 +0000 (16:10 +1200)]
CRM-20371 set is_transaction on best-effort attempt to create membership payment

7 years agoAdd test to check mail count
Jitendra Purohit [Mon, 3 Apr 2017 02:44:10 +0000 (08:14 +0530)]
Add test to check mail count

7 years agoMerge pull request #10090 from fuzionnz/CRM-19967-contact_query_docs
Eileen McNaughton [Mon, 3 Apr 2017 01:23:08 +0000 (13:23 +1200)]
Merge pull request #10090 from fuzionnz/CRM-19967-contact_query_docs

CRM-19967 contact query docs

7 years agoTheoretically harmless docs fixes and rearrangement of MODE_* contstants.
Chris Burgess [Fri, 3 Feb 2017 19:13:50 +0000 (08:13 +1300)]
Theoretically harmless docs fixes and rearrangement of MODE_* contstants.

7 years agoLink to CRM-19967 in function docs.
Chris Burgess [Sun, 2 Apr 2017 22:11:33 +0000 (10:11 +1200)]
Link to CRM-19967 in function docs.

7 years agoCRM-19967: Proposed docs improvements.
Chris Burgess [Fri, 3 Feb 2017 19:12:56 +0000 (08:12 +1300)]
CRM-19967: Proposed docs improvements.

Conflicts:
CRM/Contact/BAO/Query.php

7 years agoMerge pull request #10088 from lcdservices/CRM-20369
Eileen McNaughton [Sun, 2 Apr 2017 05:28:33 +0000 (17:28 +1200)]
Merge pull request #10088 from lcdservices/CRM-20369

CRM-20369

7 years agoCRM-20369 code cleanup
Brian Shaughnessy [Sun, 2 Apr 2017 02:25:52 +0000 (22:25 -0400)]
CRM-20369 code cleanup

7 years agoCRM-20369 mailing detail report
Brian Shaughnessy [Sun, 2 Apr 2017 02:18:17 +0000 (22:18 -0400)]
CRM-20369 mailing detail report

7 years agoCRM-20369 mailing opened report
Brian Shaughnessy [Sun, 2 Apr 2017 02:15:15 +0000 (22:15 -0400)]
CRM-20369 mailing opened report

7 years agoCRM-20369 mailing summary report
Brian Shaughnessy [Sun, 2 Apr 2017 02:12:49 +0000 (22:12 -0400)]
CRM-20369 mailing summary report

7 years agoCRM-20369 mailing clicks report
Brian Shaughnessy [Sun, 2 Apr 2017 02:11:37 +0000 (22:11 -0400)]
CRM-20369 mailing clicks report

7 years agoCRM-20369 mailing bounce report
Brian Shaughnessy [Sun, 2 Apr 2017 01:59:56 +0000 (21:59 -0400)]
CRM-20369 mailing bounce report

7 years agoMerge pull request #10058 from colemanw/CRM-20345
colemanw [Sat, 1 Apr 2017 04:13:35 +0000 (00:13 -0400)]
Merge pull request #10058 from colemanw/CRM-20345

CRM-20345 - Case API - Sort by client & addtimeline action

7 years agoCRM-20345 - CRM_Utils_SQL_Select::orderBy() (#4)
Tim Otten [Sat, 1 Apr 2017 01:59:44 +0000 (18:59 -0700)]
CRM-20345 - CRM_Utils_SQL_Select::orderBy() (#4)

* CRM-20345 - CRM_Utils_Array::crmArraySortByField - Add test. Allow multiple fields.

* CRM-20345 - CRM_Utils_SQL_Select::orderBy - Use more deterministic ordering

The technique of computing default `$weight = count($this->orderBys)`
addresses a valid point: we need to preserve ordering for existing callers
who don't specify weights -- while also allowing weights.

However, it feels weird in my gut. Not sure why -- maybe it's something like this:

```php
// A1: Non-deterministic ordering
$select->orderBy('alpha', 1);
$select->orderBy('beta');
$select->orderBy('delta', 2);
$select->orderBy('gamma', 3);

// A2: Deterministic ordering
$select->orderBy('alpha', 10);
$select->orderBy('beta');
$select->orderBy('delta', 20);
$select->orderBy('gamma', 30);

// B1: Deterministic ordering
$select->orderBy('alpha');
$select->orderBy('beta');
$select->orderBy('delta');
$select->orderBy('gamma');

// B2: Non-deterministic ordering
$select->orderBy('alpha', 1);
$select->orderBy('beta', 1);
$select->orderBy('delta', 1);
$select->orderBy('gamma', 1);
```

As a reader, I would expect A1/A2 to be the same, and I would expect B1/B2
to be the same.  But they're not.  If there's a collision in the `weight`s,
the ordering becomes non-deterministic (depending on obscure details or
happenstance of the PHP runtime).

Of course, there's no right answer: in A1/A2, you can plausibly put `beta`
before `alpha` or after `alpha` or after `gamma`.  But it should be
determinstic so that it always winds up in the same place.

7 years agoMerge pull request #10086 from JMAConsulting/CRM-20367
colemanw [Sat, 1 Apr 2017 00:00:17 +0000 (20:00 -0400)]
Merge pull request #10086 from JMAConsulting/CRM-20367

CRM-20367: Add wrapper function for adding and dropping Index in Upgrder

7 years agoShow message instead of checkbox when renew required. Hide checkbox when renew not...
Matthew Wire [Fri, 31 Mar 2017 22:45:42 +0000 (23:45 +0100)]
Show message instead of checkbox when renew required. Hide checkbox when renew not allowed. On confirmation page change message depending if user selected auto-renew or it was mandatory

7 years agoCRM-20367: Add wrapper function for adding and dropping Index in Upgrader
deb.monish [Fri, 31 Mar 2017 19:49:27 +0000 (01:19 +0530)]
CRM-20367: Add wrapper function for adding and dropping Index in Upgrader

7 years agotest fix
Jitendra Purohit [Fri, 31 Mar 2017 13:48:08 +0000 (19:18 +0530)]
test fix

7 years agoCRM-19243: Free membership results in two email receipts
Jitendra Purohit [Fri, 31 Mar 2017 04:56:25 +0000 (10:26 +0530)]
CRM-19243: Free membership results in two email receipts

7 years agoMerge pull request #10083 from JMAConsulting/CRM-19715-2
Eileen McNaughton [Thu, 30 Mar 2017 23:24:04 +0000 (12:24 +1300)]
Merge pull request #10083 from JMAConsulting/CRM-19715-2

CRM-19715, added upgrade script to delete current_period_opening_bala…

7 years agoCRM-19715, added upgrade script to delete current_period_opening_balance and opening_...
Pradeep Nayak [Thu, 30 Mar 2017 21:56:50 +0000 (03:26 +0530)]
CRM-19715, added upgrade script to delete current_period_opening_balance and opening_balance if they are <> 0

----------------------------------------
* CRM-19715: Remove Close Accounting Period code
  https://issues.civicrm.org/jira/browse/CRM-19715

7 years agoMerge pull request #10006 from JMAConsulting/CRM-20022
Monish Deb [Thu, 30 Mar 2017 05:13:25 +0000 (10:43 +0530)]
Merge pull request #10006 from JMAConsulting/CRM-20022

CRM-20022 Extended function to support multiple batch labels

7 years agoMerge pull request #10055 from jitendrapurohit/CRM-20344
Eileen McNaughton [Thu, 30 Mar 2017 01:54:22 +0000 (14:54 +1300)]
Merge pull request #10055 from jitendrapurohit/CRM-20344

CRM-20344: Make 'Member Since' displayed on membership tabs for Inac…

7 years agoCRM-20345 - Don't be tripped up by deleted contacts or inactive relationships
Coleman Watts [Thu, 30 Mar 2017 00:29:24 +0000 (20:29 -0400)]
CRM-20345 - Don't be tripped up by deleted contacts or inactive relationships

7 years agoMerge pull request #10041 from mlutfy/master-crm20336
Eileen McNaughton [Wed, 29 Mar 2017 23:15:24 +0000 (12:15 +1300)]
Merge pull request #10041 from mlutfy/master-crm20336

CRM-20336: Failed contributions should be set as failed, not left as pending