civicrm-core.git
8 years agoindent and title fix
jitendrapurohit [Wed, 25 May 2016 04:44:45 +0000 (10:14 +0530)]
indent and title fix

8 years agoCRM-17606 - Create multiple documents from Find Cases search result
jitendrapurohit [Mon, 23 May 2016 11:22:54 +0000 (16:52 +0530)]
CRM-17606 - Create multiple documents from Find Cases search result

8 years agoMerge pull request #8725 from colemanw/CRM-17608
colemanw [Tue, 19 Jul 2016 23:30:49 +0000 (19:30 -0400)]
Merge pull request #8725 from colemanw/CRM-17608

CRM-17608 - Merge document form tweaks

8 years agoCRM-17608 - Merge document form tweaks
Coleman Watts [Tue, 19 Jul 2016 22:04:06 +0000 (18:04 -0400)]
CRM-17608 - Merge document form tweaks

8 years agoMerge pull request #8474 from monishdeb/CRM-17608
colemanw [Tue, 19 Jul 2016 18:49:01 +0000 (14:49 -0400)]
Merge pull request #8474 from monishdeb/CRM-17608

CRM-17608: Merge to DOCx or ODT template

8 years agoFix capitalization
Coleman Watts [Tue, 19 Jul 2016 17:00:30 +0000 (13:00 -0400)]
Fix capitalization

8 years agoMerge pull request #8720 from yashodha/CRM-18472
Monish Deb [Tue, 19 Jul 2016 10:41:42 +0000 (16:11 +0530)]
Merge pull request #8720 from yashodha/CRM-18472

CRM-18472: fix notice

8 years agoCRM-18472: fix notice
yashodha [Tue, 19 Jul 2016 05:49:58 +0000 (11:19 +0530)]
CRM-18472: fix notice

----------------------------------------
* CRM-18472: Notice fixes
  https://issues.civicrm.org/jira/browse/CRM-18472

8 years agoMerge pull request #8715 from seamuslee001/CRM-19098
Yashodha Chaku [Tue, 19 Jul 2016 05:35:22 +0000 (11:05 +0530)]
Merge pull request #8715 from seamuslee001/CRM-19098

CRM-19098 Add in Group Settings to add new group on Import

8 years agoMerge pull request #8716 from monishdeb/CRM-19096
Yashodha Chaku [Tue, 19 Jul 2016 05:26:41 +0000 (10:56 +0530)]
Merge pull request #8716 from monishdeb/CRM-19096

CRM-19096: Parent group arrow mis-aligned

8 years agoMerge pull request #8703 from yashodha/CRM-19078
Yashodha Chaku [Tue, 19 Jul 2016 03:24:19 +0000 (08:54 +0530)]
Merge pull request #8703 from yashodha/CRM-19078

CRM-19078: Cannot search memberships by auto-renew OR not-auto-renew

8 years agoCRM-19096: Parent group arrow mis-aligned
deb.monish [Mon, 18 Jul 2016 09:53:19 +0000 (15:23 +0530)]
CRM-19096: Parent group arrow mis-aligned

8 years agoAdd in checking on if groupType is set
Seamus Lee [Mon, 18 Jul 2016 09:30:44 +0000 (09:30 +0000)]
Add in checking on if groupType is set

8 years agoUpdate template
Seamus Lee [Mon, 18 Jul 2016 09:29:42 +0000 (09:29 +0000)]
Update template

8 years agoCRM-19098 Add in Group Settings to add new group on import
Seamus Lee [Mon, 18 Jul 2016 09:27:05 +0000 (09:27 +0000)]
CRM-19098 Add in Group Settings to add new group on import

8 years agoMerge pull request #8705 from francescbassas/refs/remotes/origin/patch-3
Yashodha Chaku [Mon, 18 Jul 2016 07:47:58 +0000 (13:17 +0530)]
Merge pull request #8705 from francescbassas/refs/remotes/origin/patch-3

CRM-19088 : Always build contact subtype field

8 years agomodified docx pagebreak, optimisation and added unit test
deb.monish [Sat, 16 Jul 2016 22:04:23 +0000 (03:34 +0530)]
modified docx pagebreak, optimisation and added unit test

8 years agowrong formatted filetype fix
deb.monish [Fri, 15 Jul 2016 15:50:49 +0000 (21:20 +0530)]
wrong formatted filetype fix

8 years ago[ready-for-core-team-review]CRM-16189, added code to create entries in accounting...
Pradeep Nayak [Fri, 15 Jul 2016 17:39:53 +0000 (23:09 +0530)]
[ready-for-core-team-review]CRM-16189, added code to create entries in accounting tables for defe… (#8576)

* CRM-16189, added code to create entries in accounting tables for deferred revenue

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, added code to set recognition date for membership

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, added code to create entries for revenue recognition

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* --CRM-16189, removed function calling

* CRM-16189, updated function to ignore deferred trxns entries

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, added code to create entries for deferred revenue for event registration

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, store financial item DAO values in variable and return variable

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, added code to create financial trxn entries

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, removed white space

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, fixed notice error

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189, changed class name

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* --CRM-16189, fixed code for updating of line item

8 years agofetch content of HTML rather then creating and using the generated HTML file
deb.monish [Fri, 15 Jul 2016 14:17:56 +0000 (19:47 +0530)]
fetch content of HTML rather then creating and using the generated HTML file

8 years agostyle change
deb.monish [Fri, 15 Jul 2016 10:52:10 +0000 (16:22 +0530)]
style change

8 years agoMerge pull request #8704 from psampont/CRM-19072
Monish Deb [Fri, 15 Jul 2016 12:19:41 +0000 (17:49 +0530)]
Merge pull request #8704 from psampont/CRM-19072

CRM-19072 - Batch update custom fields for a contacts with 2 subtypes

8 years agoMerge pull request #8709 from jitendrapurohit/CRM-19085
Monish Deb [Fri, 15 Jul 2016 12:14:58 +0000 (17:44 +0530)]
Merge pull request #8709 from jitendrapurohit/CRM-19085

CRM-19085 - Fix "Add to Group" in Reports

8 years agoAdd test and minor fixes
jitendrapurohit [Fri, 15 Jul 2016 11:06:07 +0000 (16:36 +0530)]
Add test and minor fixes

8 years agoMerge pull request #8708 from JMAConsulting/CRM-16189-36
Yashodha Chaku [Fri, 15 Jul 2016 07:00:13 +0000 (12:30 +0530)]
Merge pull request #8708 from JMAConsulting/CRM-16189-36

[ready-for-core-team-review]CRM-16189, fixed batch name display for Contribution and Membership r…

8 years agoCRM-17608 - Fix missing tokens in docx
Coleman Watts [Thu, 14 Jul 2016 17:24:50 +0000 (13:24 -0400)]
CRM-17608 - Fix missing tokens in docx

8 years agoCRM-17608 - Only unzip file once
Coleman Watts [Thu, 14 Jul 2016 16:54:55 +0000 (12:54 -0400)]
CRM-17608 - Only unzip file once

8 years agoCRM-17608 - Preserve formatting of output document
Coleman Watts [Thu, 14 Jul 2016 16:34:43 +0000 (12:34 -0400)]
CRM-17608 - Preserve formatting of output document

Output document directly instead of going through phpWord

8 years agoCRM-17608 - Improve help text
Coleman Watts [Tue, 12 Jul 2016 18:29:45 +0000 (14:29 -0400)]
CRM-17608 - Improve help text

8 years agoadditional fixes
deb.monish [Wed, 13 Jul 2016 08:23:10 +0000 (13:53 +0530)]
additional fixes

8 years agochange document type select field to radio button
deb.monish [Mon, 27 Jun 2016 13:24:58 +0000 (18:54 +0530)]
change document type select field to radio button

8 years agoimplement document merge using TbsZip
deb.monish [Tue, 14 Jun 2016 11:48:06 +0000 (17:18 +0530)]
implement document merge using TbsZip

8 years agohide document type on upload and improve template processing
deb.monish [Thu, 9 Jun 2016 15:23:43 +0000 (20:53 +0530)]
hide document type on upload and improve template processing

8 years agoimprovement in docReader fn
deb.monish [Mon, 6 Jun 2016 10:42:14 +0000 (16:12 +0530)]
improvement in docReader fn

8 years agoadded document upload element
deb.monish [Fri, 3 Jun 2016 14:59:44 +0000 (20:29 +0530)]
added document upload element

8 years agoadditional fixes
deb.monish [Wed, 1 Jun 2016 06:21:29 +0000 (11:51 +0530)]
additional fixes

8 years agoMerge to DOCx or ODT template
deb.monish [Tue, 31 May 2016 07:19:34 +0000 (12:49 +0530)]
Merge to DOCx or ODT template

8 years agoCRM-19085 - Fix Add to Group Functionality in Reports
jitendrapurohit [Thu, 14 Jul 2016 13:18:00 +0000 (18:48 +0530)]
CRM-19085 - Fix Add to Group Functionality in Reports

8 years agoCRM-16189, fixed batch name display for Contribution and Membership report
Pradeep Nayak [Thu, 14 Jul 2016 13:06:25 +0000 (18:36 +0530)]
CRM-16189, fixed batch name display for Contribution and Membership report

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

8 years agoMerge refs/remotes/origin/patch-2 into refs/remotes/origin/patch-3
Francesc Bassas i Bullich [Thu, 14 Jul 2016 11:19:04 +0000 (13:19 +0200)]
Merge refs/remotes/origin/patch-2 into refs/remotes/origin/patch-3

8 years agoAlways build contact subtype field
francescbassas [Thu, 14 Jul 2016 11:12:36 +0000 (13:12 +0200)]
Always build contact subtype field

If a contact subtype can be of more contact subtypes then make sense to always show contact subtype on form contact.

8 years agoAlways build contact subtype field
francescbassas [Thu, 14 Jul 2016 11:09:14 +0000 (13:09 +0200)]
Always build contact subtype field

If a contact subtype can be of more contact subtypes then make sense to always show contact subtype on form contact.

8 years agoCRM-19072 - Batch update custom fields for a contacts with 2 subtypes
Philippe SAMPONT [Thu, 14 Jul 2016 11:04:48 +0000 (13:04 +0200)]
CRM-19072 - Batch update custom fields for a contacts with 2 subtypes

8 years agoCRM-19078: Cannot search memberships by auto-renew OR not-auto-renew
yashodha [Thu, 14 Jul 2016 08:03:16 +0000 (13:33 +0530)]
CRM-19078: Cannot search memberships by auto-renew OR not-auto-renew

----------------------------------------
* CRM-19078: Cannot search memberships by auto-renew OR not-auto-renew
  https://issues.civicrm.org/jira/browse/CRM-19078

8 years agoMerge pull request #8701 from jitendrapurohit/CRM-19080
Monish Deb [Thu, 14 Jul 2016 07:32:45 +0000 (13:02 +0530)]
Merge pull request #8701 from jitendrapurohit/CRM-19080

CRM-19080 - fix enotice in advance search

8 years agoCRM-19080 - fix enotice in advance search
jitendrapurohit [Thu, 14 Jul 2016 05:55:03 +0000 (11:25 +0530)]
CRM-19080 - fix enotice in advance search

8 years agoMerge pull request #8698 from mlutfy/crm19077
Yashodha Chaku [Thu, 14 Jul 2016 04:23:13 +0000 (09:53 +0530)]
Merge pull request #8698 from mlutfy/crm19077

CRM-19077: Participant listing report: add event End Date field/filter to the report

8 years agoMerge pull request #8636 from eileenmcnaughton/slow_query
Eileen McNaughton [Thu, 14 Jul 2016 04:04:16 +0000 (16:04 +1200)]
Merge pull request #8636 from eileenmcnaughton/slow_query

CRM-19027 clean up use of slow query to get tables.

8 years agoMerge pull request #8645 from eileenmcnaughton/group_query
Eileen McNaughton [Thu, 14 Jul 2016 01:27:03 +0000 (13:27 +1200)]
Merge pull request #8645 from eileenmcnaughton/group_query

CRM-17213 add tests for group search

8 years agoCRM-19077: Participant listing report: add event End Date field/filter to the report.
Mathieu Lutfy [Wed, 13 Jul 2016 16:35:08 +0000 (12:35 -0400)]
CRM-19077: Participant listing report: add event End Date field/filter to the report.

8 years agoMerge pull request #8692 from mfb/CRM-19070
Monish Deb [Wed, 13 Jul 2016 14:03:43 +0000 (19:33 +0530)]
Merge pull request #8692 from mfb/CRM-19070

CRM-19070 - CiviMail - Schedule job after recipients have been populated

8 years agoMerge pull request #8511 from jitendrapurohit/CRM-18439
Yashodha Chaku [Wed, 13 Jul 2016 10:11:55 +0000 (15:41 +0530)]
Merge pull request #8511 from jitendrapurohit/CRM-18439

CRM-18439 - support MySQL 5.7 sql_mode=only_full_group_by

8 years agoMerge pull request #8689 from eileenmcnaughton/dupe_pairs
Eileen McNaughton [Wed, 13 Jul 2016 08:51:04 +0000 (20:51 +1200)]
Merge pull request #8689 from eileenmcnaughton/dupe_pairs

CRM-19035 fix mixing of dst & srcid by eliminating autoflip

8 years agoMerge pull request #8685 from jitendrapurohit/CRM-19056
Monish Deb [Wed, 13 Jul 2016 08:35:37 +0000 (14:05 +0530)]
Merge pull request #8685 from jitendrapurohit/CRM-19056

CRM-19056 - Add record button edits existing custom field record instead

8 years agofix membership summary report group by clause
jitendrapurohit [Wed, 13 Jul 2016 06:53:03 +0000 (12:23 +0530)]
fix membership summary report group by clause

8 years agoMerge pull request #8686 from monishdeb/CRM-19006
Yashodha Chaku [Wed, 13 Jul 2016 05:23:23 +0000 (10:53 +0530)]
Merge pull request #8686 from monishdeb/CRM-19006

CRM-19006: Unit test to assert special characters in custom value

8 years agoCRM-19070 - CiviMail - Schedule job after recipients have been populated
mark burdett [Wed, 13 Jul 2016 04:09:07 +0000 (21:09 -0700)]
CRM-19070 - CiviMail - Schedule job after recipients have been populated

8 years agofix bracket values in api and search builder
jitendrapurohit [Tue, 12 Jul 2016 11:33:03 +0000 (17:03 +0530)]
fix bracket values in api and search builder

8 years agoCRM-19035 follow on tidy up
eileen [Tue, 12 Jul 2016 10:04:33 +0000 (22:04 +1200)]
CRM-19035 follow on tidy up

8 years agoCRM-19035 Tests for organization get dupes
eileen [Tue, 12 Jul 2016 08:46:12 +0000 (20:46 +1200)]
CRM-19035 Tests for organization get dupes

(just adding general coverage around the area - esp as there is a perf bug in this query
I also want to fix).

8 years agoMerge pull request #8690 from jitendrapurohit/CRM-18585
Monish Deb [Tue, 12 Jul 2016 09:26:48 +0000 (14:56 +0530)]
Merge pull request #8690 from jitendrapurohit/CRM-18585

CRM-18585 - Fix Smart Group operator

8 years agoMerge pull request #8688 from seamuslee001/sl_recurr_test
Eileen McNaughton [Tue, 12 Jul 2016 07:17:00 +0000 (19:17 +1200)]
Merge pull request #8688 from seamuslee001/sl_recurr_test

NFC Add test of Supports Financial Type Change in Contribution Recur

8 years agoCRM-18585 - Fix Smart Group operator
jitendrapurohit [Tue, 12 Jul 2016 06:57:59 +0000 (12:27 +0530)]
CRM-18585 - Fix Smart Group operator

8 years agoCRM-19035 update tests to reflect consist use of entity1 for dstID
eileen [Tue, 12 Jul 2016 06:51:18 +0000 (18:51 +1200)]
CRM-19035 update tests to reflect consist use of entity1 for dstID

Since we should always see the lower id in dstID now and that should always map to entity1
the tests need updating

8 years agominor fix
deb.monish [Tue, 12 Jul 2016 05:56:02 +0000 (11:26 +0530)]
minor fix

8 years agowarning fixes
jitendrapurohit [Mon, 6 Jun 2016 05:47:47 +0000 (11:17 +0530)]
warning fixes

8 years agomake it compatible with only 5.7+
jitendrapurohit [Thu, 2 Jun 2016 06:22:19 +0000 (11:52 +0530)]
make it compatible with only 5.7+

8 years agoCRM-19035 fix UI to be consistent in dstID & srcID handling.
eileen [Tue, 12 Jul 2016 05:01:04 +0000 (17:01 +1200)]
CRM-19035 fix UI to be consistent in dstID & srcID handling.

Note this assumes the contact to keep stays on the left.

Also note that after you flip a contact the merge link does not flip - this is not new

8 years agooptimisation fixes CRM-18439
jitendrapurohit [Tue, 31 May 2016 09:52:10 +0000 (15:22 +0530)]
optimisation fixes CRM-18439

8 years agoAdditional fixes for summary reports
jitendrapurohit [Tue, 17 May 2016 13:25:33 +0000 (18:55 +0530)]
Additional fixes for summary reports

8 years agoCRM-18439 - Fix Queries to include Full Group By sql mode
jitendrapurohit [Tue, 17 May 2016 06:35:18 +0000 (12:05 +0530)]
CRM-18439 - Fix Queries to include Full Group By sql mode

8 years agoCRM-18439 - Report Fixes to include Full Group by clause
jitendrapurohit [Tue, 17 May 2016 05:47:42 +0000 (11:17 +0530)]
CRM-18439 - Report Fixes to include Full Group by clause

8 years agoCRM-19035 clean up references to srcID & dstID
eileen [Tue, 12 Jul 2016 04:33:34 +0000 (16:33 +1200)]
CRM-19035 clean up references to srcID & dstID

8 years agoCRM-19035 Remove code duplication in the processing of duplicate matches
eileen [Tue, 12 Jul 2016 04:14:50 +0000 (16:14 +1200)]
CRM-19035 Remove code duplication in the processing of duplicate matches

8 years agoAdd test of Supports Financial Type Change in Contribution Recur
Seamus Lee [Tue, 12 Jul 2016 02:56:07 +0000 (02:56 +0000)]
Add test of Supports Financial Type Change in Contribution Recur

8 years agoMerge pull request #8615 from bsilvern/crm-18805
Eileen McNaughton [Tue, 12 Jul 2016 00:23:03 +0000 (12:23 +1200)]
Merge pull request #8615 from bsilvern/crm-18805

CRM-18805 - Contribute - record contribution_page_id on recurring tra…

8 years agoMerge pull request #8547 from xurizaemon/patch-2
Joe Murray [Mon, 11 Jul 2016 19:04:15 +0000 (15:04 -0400)]
Merge pull request #8547 from xurizaemon/patch-2

(WIP) CRM-18810 remove redundant / silly consts

8 years agoCRM-19006: Unit test to assert special characters in custom value
deb.monish [Mon, 11 Jul 2016 11:45:37 +0000 (17:15 +0530)]
CRM-19006: Unit test to assert special characters in custom value

8 years agoMerge pull request #8680 from jitendrapurohit/CRM-18989fix
Monish Deb [Mon, 11 Jul 2016 12:19:20 +0000 (17:49 +0530)]
Merge pull request #8680 from jitendrapurohit/CRM-18989fix

CRM-18989 - Fix custom data display for money

8 years agoextend the test for three custom values
jitendrapurohit [Mon, 11 Jul 2016 12:09:02 +0000 (17:39 +0530)]
extend the test for three custom values

8 years agoCRM-19056 - Add record button edits existing custom field record instead
jitendrapurohit [Mon, 11 Jul 2016 11:16:48 +0000 (16:46 +0530)]
CRM-19056 - Add record button edits existing custom field record instead

8 years agoMerge pull request #8666 from eileenmcnaughton/bug
Yashodha Chaku [Mon, 11 Jul 2016 10:15:00 +0000 (15:45 +0530)]
Merge pull request #8666 from eileenmcnaughton/bug

CRM-19045 contribution.api  total_amount cannot be returned using ope…

8 years agoMerge pull request #8634 from konadave/CRM-19007-master
Eileen McNaughton [Sun, 10 Jul 2016 23:28:36 +0000 (11:28 +1200)]
Merge pull request #8634 from konadave/CRM-19007-master

CRM-19007 Optionally disable USPS address validation during contact import

8 years agoMerge pull request #8644 from monishdeb/CRM-19006
Monish Deb [Sat, 9 Jul 2016 18:14:17 +0000 (23:44 +0530)]
Merge pull request #8644 from monishdeb/CRM-19006

CRM-19006: option values with commas are unsearchable

8 years agoCRM-18502 - Fix payment reminder activity creation (#8309)
Marty Wright [Sat, 9 Jul 2016 15:45:02 +0000 (09:45 -0600)]
CRM-18502 - Fix payment reminder activity creation (#8309)

* CRM-18502 - Fix payment reminder activity creation

* CRM-18502 - Add exception handling to api3 call

8 years agoMerge pull request #8681 from seamuslee001/CRM-19055
Eileen McNaughton [Fri, 8 Jul 2016 22:20:47 +0000 (10:20 +1200)]
Merge pull request #8681 from seamuslee001/CRM-19055

CRM-19055 remove error alert email function from eway

8 years agoCRM-18854 [needs-review] Added support for recurring contributions for online pledges...
Edsel Roque Lopez [Fri, 8 Jul 2016 17:43:25 +0000 (23:13 +0530)]
CRM-18854 [needs-review] Added support for recurring contributions for online pledges (#8558)

* MISC-110 Added pledge start date for pledge block

* MISC-110 Added pledge start date to online contribution form

* MISC-110 Added recur record for pledge

* MISC-110 Added changes suggested by Eileen

* MISC-110 Added upgrade code for pledge_start_date

* MISC-110 Added unit test for createRecur function

* MISC-110 Removed use of form and set payment instrument id

* MISC-110 Added webtest for Pledge Recurring contribution

* MISC-110 Removed unfinished unit test

* MISC-110 Resolved Jenkins errors

* MISC-110 Added apiSuccess assertion

* MISC-110 Added changes from UP-3

* MISC-113 Added UI for frontend and set defaults

* MISC-113 Bug fixes and improvements

* MISC-113 Added date fields for start date on online contribution form

* MISC-113 Added fields in payment processor table

* MISC-113 Added processing for start date

* MISC-110 Added changes to set contribution receive date for future payments

* MISC-110 Typo error fixes

* MISC-110 Added future start date to payment processor

MISC-113 Added JS for adjust recurring start date

MISC-110 Added future start date values on install

MISC-113 Added script on install and upgrade

MISC-110 Added form rule for pledge start date

MISC-110 Removed explicit create of recur record

-- minor change

-- minor change

-- minor change

MISC-113 Added unit test

MISC-113 Removed old webtest

MISC-113 Resolved jenkins errors

MISC-110 Style changes

MISC-113 Allowed NULL values for future start date

MISC-110 Removed future_start_date field from payment processor

MISC-110 Removed future_start_date field from data

* MISC-113 Changed serialize to json_encode

MISC-113 Jenkins style fixes

* MISC-113 Bug fixes for start date

* MISC-113 Added unit test for contribution page submit with pledge with future start date

MISC-110 Bug fix

* MISC-113 Added id = 0 instead of pay_later text

* MISC-110 Refactored assignment of contributionRecurID

Conflicts:
CRM/Contribute/BAO/Contribution/Utils.php

* MISC-113 Handled issue with membership recur payments

* MISC-110 Added upgrade script to 4.7.10

8 years agoMerge pull request #8683 from jitendrapurohit/PaypalPro
Monish Deb [Fri, 8 Jul 2016 13:08:51 +0000 (18:38 +0530)]
Merge pull request #8683 from jitendrapurohit/PaypalPro

CRM-18483 - Fix variable typo for Paypal Pro

8 years agoMerge pull request #8679 from monishdeb/CRM-15656
Monish Deb [Fri, 8 Jul 2016 12:53:33 +0000 (18:23 +0530)]
Merge pull request #8679 from monishdeb/CRM-15656

CRM-15656: Synchronize PHP and MySQL time zones

8 years agoFix variable typo for Paypal Pro
jitendrapurohit [Fri, 8 Jul 2016 11:55:55 +0000 (17:25 +0530)]
Fix variable typo for Paypal Pro

8 years agoMerge pull request #8678 from eileenmcnaughton/paypalstd
Monish Deb [Fri, 8 Jul 2016 11:46:52 +0000 (17:16 +0530)]
Merge pull request #8678 from eileenmcnaughton/paypalstd

CRM-18483: Refactor for std to support testing & replaying

8 years agoCRM-19055 remove error alert email function from eway
Seamus Lee [Fri, 8 Jul 2016 09:40:41 +0000 (09:40 +0000)]
CRM-19055 remove error alert email function from eway

8 years agominor fix
jitendrapurohit [Fri, 8 Jul 2016 08:42:36 +0000 (14:12 +0530)]
minor fix

8 years agoFix custom data display for money
jitendrapurohit [Fri, 8 Jul 2016 07:10:33 +0000 (12:40 +0530)]
Fix custom data display for money

8 years agoMerge pull request #8663 from Upperholme/master
Yashodha Chaku [Fri, 8 Jul 2016 06:48:00 +0000 (12:18 +0530)]
Merge pull request #8663 from Upperholme/master

CRM-18294 Fix Case Summary report to display multiple cases per client

8 years agoMerge pull request #8667 from JKingsnorth/CRM-18186
Yashodha Chaku [Fri, 8 Jul 2016 04:11:46 +0000 (09:41 +0530)]
Merge pull request #8667 from JKingsnorth/CRM-18186

[WIP] CRM-18186: Participant API: registered by id fixes

8 years ago[ready-for-core-team-review]CRM-16189, added function to create deferred transactions...
Pradeep Nayak [Thu, 7 Jul 2016 19:58:14 +0000 (01:28 +0530)]
[ready-for-core-team-review]CRM-16189, added function to create deferred transactions (#8579)

* CRM-16189, added function to create deferred transactions

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

Conflicts:
CRM/Core/BAO/FinancialTrxn.php

* CRM-16189, updated function

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

Conflicts:
CRM/Core/BAO/FinancialTrxn.php

* CRM-16189, fixed Jenkin errors

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189 Added unit test for createDeferredTrxn function

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189 Resolved jenkins errors

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189 Removed count since individual test passes but multiple tests do not clear the db

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189 Added params to unit test to avoid clashing with results from other test

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189 Removed unintentional rebase code

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

8 years agoCRM-16189, added script for new activity type 'Closing Accounting period' (#8584)
Pradeep Nayak [Thu, 7 Jul 2016 19:57:29 +0000 (01:27 +0530)]
CRM-16189, added script for new activity type 'Closing Accounting period' (#8584)

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

Conflicts:
CRM/Upgrade/Incremental/sql/4.7.9.mysql.tpl

8 years agoCRM-16189, added Closing Accounting form (#8583)
Pradeep Nayak [Thu, 7 Jul 2016 19:54:56 +0000 (01:24 +0530)]
CRM-16189, added Closing Accounting form (#8583)

* CRM-16189, added Closing Accounting form

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189 Removed invalid return statement

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189 Fixed upgrade script

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

8 years ago[ready-for-core-team-review]CRM-16189, added code to redirect batch search when statu...
Pradeep Nayak [Thu, 7 Jul 2016 19:53:51 +0000 (01:23 +0530)]
[ready-for-core-team-review]CRM-16189, added code to redirect batch search when status is changed (#8582)

* CRM-16189, added code to redirect batch search when status is changed

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* --CRM-16189, fixed jenkin errors

* CRM-16189 Removed refresh of datatable

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189 Added status id to test as it is a required param

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189 Changes to batch AJAX fiel and test

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189 Fixed string returned

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

* CRM-16189 Added check only on add and not edit

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189