civicrm-core.git
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 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 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 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 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 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 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

8 years agoCRM-15656: Synchronize PHP and MySQL time zones
deb.monish [Thu, 7 Jul 2016 08:34:48 +0000 (14:04 +0530)]
CRM-15656: Synchronize PHP and MySQL time zones

8 years agoRefactor for std to support testing & replaying
eileen [Wed, 6 Jul 2016 09:07:08 +0000 (21:07 +1200)]
Refactor for std to support testing & replaying

8 years agoMerge pull request #8648 from seamuslee001/CRM-19038
Tim Otten [Thu, 7 Jul 2016 00:23:12 +0000 (17:23 -0700)]
Merge pull request #8648 from seamuslee001/CRM-19038

CRM-19038 NFC shift safeDropFK code to SchemaHandler Class from Upgra…

8 years agoMerge pull request #8641 from civicrm/4.7.9-rc
Yashodha Chaku [Wed, 6 Jul 2016 13:58:20 +0000 (19:28 +0530)]
Merge pull request #8641 from civicrm/4.7.9-rc

Merge 4.7.9-rc into master

8 years agoMerge pull request #8675 from eileenmcnaughton/in_prog_tests
Eileen McNaughton [Wed, 6 Jul 2016 10:13:25 +0000 (22:13 +1200)]
Merge pull request #8675 from eileenmcnaughton/in_prog_tests

[NFC] CRM-19033 improve standardisation of tests

8 years ago[NFC] CRM-19033 improve standardisation of tests
eileen [Wed, 6 Jul 2016 08:25:01 +0000 (20:25 +1200)]
[NFC] CRM-19033 improve standardisation of tests

NB jenkins is doing wierd things here so trying a small subset to see what jenkins does

8 years agoMerge pull request #8674 from eileenmcnaughton/in_prog_tests
Eileen McNaughton [Wed, 6 Jul 2016 08:24:38 +0000 (20:24 +1200)]
Merge pull request #8674 from eileenmcnaughton/in_prog_tests

[NFC] CRM-19033 improve standardisation of tests

8 years ago[NFC] CRM-19033 improve standardisation of tests
eileen [Wed, 6 Jul 2016 06:35:18 +0000 (18:35 +1200)]
[NFC] CRM-19033 improve standardisation of tests

NB jenkins is doing wierd things here so trying a small subset to see what jenkins does

8 years agoMerge pull request #8673 from eileenmcnaughton/in_prog_tests
Eileen McNaughton [Wed, 6 Jul 2016 06:23:22 +0000 (18:23 +1200)]
Merge pull request #8673 from eileenmcnaughton/in_prog_tests

[NFC] CRM-19033 improve standardisation of tests

8 years ago[NFC] CRM-19033 improve standardisation of tests
eileen [Wed, 6 Jul 2016 05:05:19 +0000 (17:05 +1200)]
[NFC] CRM-19033 improve standardisation of tests

NB jenkins is doing wierd things here so trying a small subset to see what jenkins does

8 years agoMerge pull request #8672 from eileenmcnaughton/in_prog_tests
Eileen McNaughton [Wed, 6 Jul 2016 04:42:49 +0000 (16:42 +1200)]
Merge pull request #8672 from eileenmcnaughton/in_prog_tests

[NFC] CRM-19033 improve standardisation of tests

8 years ago[NFC] CRM-19033 improve standardisation of tests
eileen [Wed, 6 Jul 2016 04:03:55 +0000 (16:03 +1200)]
[NFC] CRM-19033 improve standardisation of tests

NB jenkins is doing wierd things here so trying a small subset to see what jenkins does

8 years ago[ready-for-core-team-review]CRM-16189, added form fields on financial account form...
Pradeep Nayak [Wed, 6 Jul 2016 03:19:35 +0000 (08:49 +0530)]
[ready-for-core-team-review]CRM-16189, added form fields on financial account form (#8581)

* CRM-16189, added form fields on financial account form

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

* CRM-16189, updated code to change class and other changes

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

* CRM-16189, fixed jenkins error

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

* --CRM-16189, updated JS

8 years ago[ready-for-core-team-review]CRM-16189, added function to calculate revenue amount...
Pradeep Nayak [Wed, 6 Jul 2016 03:18:39 +0000 (08:48 +0530)]
[ready-for-core-team-review]CRM-16189, added function to calculate revenue amount for membership (#8577)

* CRM-16189, added function to calculate revenue amount for membership

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

* CRM-16189, updated function

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

* CRM-16189, fixed Jenkins error

----------------------------------------
* 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 checks to validate financial type to...
Pradeep Nayak [Wed, 6 Jul 2016 03:18:01 +0000 (08:48 +0530)]
[ready-for-core-team-review]CRM-16189, Added checks to validate financial type to have deferred r… (#8585)

* CRM-16189, Added checks to validate financial type to have deferred relationship

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

* CRM-16189, fixed notice error and code stylings

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

* CRM-16189, updated code to include error msg

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

8 years agoMerge pull request #8671 from eileenmcnaughton/in_prog_tests
Eileen McNaughton [Wed, 6 Jul 2016 01:52:46 +0000 (13:52 +1200)]
Merge pull request #8671 from eileenmcnaughton/in_prog_tests

[NFC] CRM-19033 improve standardisation of tests

8 years ago[NFC] CRM-19033 improve standardisation of tests
eileen [Wed, 6 Jul 2016 01:16:00 +0000 (13:16 +1200)]
[NFC] CRM-19033 improve standardisation of tests

NB jenkins is doing wierd things here so trying a small subset to see what jenkins does

8 years agoMerge pull request #8670 from eileenmcnaughton/in_prog_tests
Eileen McNaughton [Wed, 6 Jul 2016 01:15:22 +0000 (13:15 +1200)]
Merge pull request #8670 from eileenmcnaughton/in_prog_tests

[NFC] CRM-19033 improve standardisation of tests

8 years ago[NFC] CRM-19033 improve standardisation of tests
eileen [Wed, 6 Jul 2016 00:20:24 +0000 (12:20 +1200)]
[NFC] CRM-19033 improve standardisation of tests

NB jenkins is doing wierd things here so trying a small subset to see what jenkins does

8 years agoMerge pull request #8669 from eileenmcnaughton/in_prog_tests
Eileen McNaughton [Wed, 6 Jul 2016 00:19:01 +0000 (12:19 +1200)]
Merge pull request #8669 from eileenmcnaughton/in_prog_tests

[NFC] CRM-19033 improve standardisation of tests

8 years ago[NFC] CRM-19033 improve standardisation of tests
eileen [Tue, 5 Jul 2016 23:09:46 +0000 (11:09 +1200)]
[NFC] CRM-19033 improve standardisation of tests

NB jenkins is doing wierd things here so trying a small subset to see what jenkins does

8 years agoMerge pull request #8668 from eileenmcnaughton/in_prog_tests
Eileen McNaughton [Tue, 5 Jul 2016 23:41:26 +0000 (11:41 +1200)]
Merge pull request #8668 from eileenmcnaughton/in_prog_tests

[NFC] CRM-19033 improve standardisation of tests

8 years ago[NFC] CRM-19033 improve standardisation of tests
eileen [Tue, 5 Jul 2016 23:04:47 +0000 (11:04 +1200)]
[NFC] CRM-19033 improve standardisation of tests

NB jenkins is doing wierd things here so trying a small subset to see what jenkins does

8 years agoMerge pull request #8643 from eileenmcnaughton/in_prog_tests
Eileen McNaughton [Tue, 5 Jul 2016 23:04:24 +0000 (11:04 +1200)]
Merge pull request #8643 from eileenmcnaughton/in_prog_tests

[NFC] CRM-19033 improve standardisation of tests

8 years ago[NFC] CRM-19033 improve standardisation of tests
eileen [Tue, 5 Jul 2016 22:29:28 +0000 (10:29 +1200)]
[NFC] CRM-19033 improve standardisation of tests

NB jenkins is doing wierd things here so trying a small subset to see what jenkins does

Change-Id: Ia4d74eeddff5ea159fbbb4eead9da6ec42028d00

8 years ago[ready-for-core-team-review]CRM-16189, added code to add recognition date on contribu...
Pradeep Nayak [Tue, 5 Jul 2016 21:48:33 +0000 (03:18 +0530)]
[ready-for-core-team-review]CRM-16189, added code to add recognition date on contribution form (#8588)

* CRM-16189, added code to add recognition date on contribution form

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

* CRM-16189, added webtest

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

* --CRM-16189, changed the field from date picker to drop down and added validation rule

* --CRM-16189, updated function class

* CRM-16189, added Revenue recognition date on COntribution View form

----------------------------------------
* 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 function to get previous financial item...
Pradeep Nayak [Tue, 5 Jul 2016 21:46:32 +0000 (03:16 +0530)]
[ready-for-core-team-review]CRM-16189, added function to get previous financial item for line item (#8654)

* CRM-16189, added function to get previous financial item for line item

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

* CRM-16189 Added unit test for getPreviousFinancialItem

----------------------------------------
* 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 function to retrieve all financial accou...
Pradeep Nayak [Tue, 5 Jul 2016 21:45:54 +0000 (03:15 +0530)]
[ready-for-core-team-review]CRM-16189, added function to retrieve all financial account with Defe… (#8655)

* CRM-16189, added function to retrieve all financial account with Deferred revenue relationship

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

* CRM-16189 Added unit test for getAllDeferredFinancialAccount function

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

* CRM-16189 Fixed jenkins errors

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

8 years agoMerge pull request #8665 from yashodha/CRM-16189-remove_ts
colemanw [Tue, 5 Jul 2016 21:36:52 +0000 (17:36 -0400)]
Merge pull request #8665 from yashodha/CRM-16189-remove_ts

CRM-16189: remove ts from name for more instances

8 years ago[ready-for-core-team-review]CRM-16189, added Deferred Revenue report (#8656)
Pradeep Nayak [Tue, 5 Jul 2016 21:33:45 +0000 (03:03 +0530)]
[ready-for-core-team-review]CRM-16189, added Deferred Revenue report (#8656)

* CRM-16189, added Deferred Revenue report

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

* --CRM-16189, fixed jenkin errors

* CRM-16189, added Install code

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

* CRM-16189, used financial trxn table to get other details

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

* CRM-16189, added transaction date

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

* CRM-16189 Fixed jenkins error

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

* CRm-16189 Removed whitespace at EOL

8 years agoMerge pull request #8658 from JMAConsulting/CRM-16189-33
colemanw [Tue, 5 Jul 2016 21:31:42 +0000 (17:31 -0400)]
Merge pull request #8658 from JMAConsulting/CRM-16189-33

[ready-for-core-team-review]CRM-16189, modified code to fix onselection of financial account rela…

8 years agoCRM-18186: Tests for getting participants by registered_by_id
JKingsnorth [Tue, 5 Jul 2016 10:30:03 +0000 (11:30 +0100)]
CRM-18186: Tests for getting participants by registered_by_id

8 years agoCRM-18186: Participant API filter by registered by id
JKingsnorth [Tue, 5 Jul 2016 10:00:59 +0000 (11:00 +0100)]
CRM-18186: Participant API filter by registered by id

8 years agoCRM-19045 contribution.api total_amount cannot be returned using operators
eileen [Tue, 5 Jul 2016 07:50:33 +0000 (19:50 +1200)]
CRM-19045 contribution.api  total_amount cannot be returned using operators

8 years agoCRM-16189: remove ts from name for more instances
yashodha [Tue, 5 Jul 2016 06:14:36 +0000 (11:44 +0530)]
CRM-16189: remove ts from name for more instances

----------------------------------------
* 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 batch filter on contribution summary...
Pradeep Nayak [Tue, 5 Jul 2016 01:01:01 +0000 (06:31 +0530)]
[ready-for-core-team-review]CRM-16189, added batch filter on contribution summary report (#8598)

* CRM-16189, added batch filter on contribution summary report

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

* CRM-16189, changed code to use same function as of Detail report to list batches

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

Conflicts:

CRM/Batch/BAO/Batch.php

* --CRM-16189, order batch by title

* CRM-16189, generalized and improved code

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

* CRM-16189, generalized and improved code

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

8 years agoMerge pull request #8587 from JMAConsulting/CRM-16189-18
colemanw [Mon, 4 Jul 2016 23:24:31 +0000 (19:24 -0400)]
Merge pull request #8587 from JMAConsulting/CRM-16189-18

[ready-for-core-team-review]CRM-16189, fixed code to view payments for contribution

8 years agoMerge pull request #8580 from JMAConsulting/CRM-16189-23
colemanw [Mon, 4 Jul 2016 16:30:04 +0000 (12:30 -0400)]
Merge pull request #8580 from JMAConsulting/CRM-16189-23

[ready-for-core-team-review]--CRM-16189, generalized code, removed hardcoded values, used function

8 years agoMerge pull request #1 from Upperholme/Case-Report-fix
Upperholme [Mon, 4 Jul 2016 16:27:14 +0000 (17:27 +0100)]
Merge pull request #1 from Upperholme/Case-Report-fix

Update Summary.php

8 years agoUpdate Summary.php
Upperholme [Mon, 4 Jul 2016 16:22:07 +0000 (17:22 +0100)]
Update Summary.php

CRM-18294: Remove grouping by contact enabling more than one case per contact to be listed in the report.

8 years agoMerge pull request #8657 from JMAConsulting/CRM-16189-32
colemanw [Mon, 4 Jul 2016 15:09:04 +0000 (11:09 -0400)]
Merge pull request #8657 from JMAConsulting/CRM-16189-32

[ready-for-core-team-review]CRM-16189 Added payments view on contribution view form

8 years ago[ready-for-core-team-review]CRM-16189, added code to validate relationship before...
Pradeep Nayak [Mon, 4 Jul 2016 15:07:29 +0000 (20:37 +0530)]
[ready-for-core-team-review]CRM-16189, added code to validate relationship before creating entrie… (#8578)

* CRM-16189, added code to validate relationship before creating entries in civicrm_entity_financial_account

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

* CRM-16189, fixed CRM test

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

* --CRM-16189, added return defination

8 years agoMerge pull request #8625 from futurefirst/4.7-crm-19012
Monish Deb [Mon, 4 Jul 2016 11:14:45 +0000 (16:44 +0530)]
Merge pull request #8625 from futurefirst/4.7-crm-19012

CRM-19012 - Fix log_user_id not being recorded for REST calls

8 years agoMerge pull request #8661 from GinkgoFJG/CRM-18347
Monish Deb [Mon, 4 Jul 2016 09:31:35 +0000 (15:01 +0530)]
Merge pull request #8661 from GinkgoFJG/CRM-18347

CRM-18347: Fix fatal error caused by unnecessary params to settings API in WP environments

8 years ago[ready-for-core-team-review]CRM-16189, added code to add settings for accrual (#8573)
Pradeep Nayak [Sat, 2 Jul 2016 20:05:36 +0000 (01:35 +0530)]
[ready-for-core-team-review]CRM-16189, added code to add settings for accrual (#8573)

* CRM-16189, added code to add settings for accrual

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

* --CRM-16189, added webtest

* --CRM-16189, changd code to show message on pop up and to highlight error field

* CRM-16189, fixed indentation

----------------------------------------
* 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, changed to JS function as per doc in https://wiki.civicrm.org/confluence/display/CRMDOC/Javascript+Reference

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

* --CRM-16189, removed cuft code, used on jq function to trigger click function

* CRM-16189, updated code as per standards

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

8 years agoCRM-18347: Blacklisted params accidentally passed by WordPress to the settings API.
Frank J. Gómez [Sat, 2 Jul 2016 14:53:31 +0000 (10:53 -0400)]
CRM-18347: Blacklisted params accidentally passed by WordPress to the settings API.

----------------------------------------
* CRM-18347: error message after clearing security release message
  https://issues.civicrm.org/jira/browse/CRM-18347

8 years agoRemoved unused variable.
Frank J. Gómez [Sat, 2 Jul 2016 14:37:06 +0000 (10:37 -0400)]
Removed unused variable.

8 years agoCRM-16189, modified code to fix onselection of financial account relationship
Pradeep Nayak [Sat, 2 Jul 2016 03:54:46 +0000 (09:24 +0530)]
CRM-16189, modified code to fix onselection of financial account relationship

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

8 years agoCRM-16189 Added payments view to contribution view
Edsel [Wed, 29 Jun 2016 10:47:47 +0000 (16:17 +0530)]
CRM-16189 Added payments view to contribution view

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

8 years agoMerge pull request #8651 from nielosz/add-regions-to-summary
colemanw [Fri, 1 Jul 2016 16:48:19 +0000 (12:48 -0400)]
Merge pull request #8651 from nielosz/add-regions-to-summary

CRM-19040: Add regions to gain more flexibilty for extension developers

8 years agoCRM-16189, added function to validate toggling of deferred revenue ch… (#8572)
Pradeep Nayak [Fri, 1 Jul 2016 16:41:26 +0000 (22:11 +0530)]
CRM-16189, added function to validate toggling of deferred revenue ch… (#8572)

* CRM-16189, added function to validate toggling of deferred revenue check box

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

* CRM-16189, added ts tag for status message

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

* CRM-16189 Added unit test for validateTogglingDeferredRevenue

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

Conflicts:

tests/phpunit/CRM/Financial/BAO/FinancialAccountTest.php

* --CRM-16189, removed white space

* --CRM-16189, fixed CRM test

8 years agoMerge pull request #8574 from JMAConsulting/CRM-16189-14
Yashodha Chaku [Fri, 1 Jul 2016 15:20:24 +0000 (20:50 +0530)]
Merge pull request #8574 from JMAConsulting/CRM-16189-14

CRM-16189, fixed code to export reopen batches

8 years agoCRM-16189, modified code to use variable and assign it using the variable
Pradeep Nayak [Fri, 1 Jul 2016 14:07:18 +0000 (19:37 +0530)]
CRM-16189, modified code to use variable and assign it using the variable

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

8 years agoCRM-16189, fixed code to export reopen batches
Pradeep Nayak [Wed, 15 Jun 2016 15:24:19 +0000 (20:54 +0530)]
CRM-16189, fixed code to export reopen batches

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

8 years agoMerge pull request #8617 from cividesk/CRM-18997-4.7
Yashodha Chaku [Fri, 1 Jul 2016 11:06:11 +0000 (16:36 +0530)]
Merge pull request #8617 from cividesk/CRM-18997-4.7

CRM-18997 DB error, incorrect truncating multibyte string

8 years agoAdd regions to gain more flexibilty for extension developers
nielosz [Fri, 1 Jul 2016 08:47:31 +0000 (10:47 +0200)]
Add regions to gain more flexibilty for extension developers

8 years agoMerge pull request #8649 from jitendrapurohit/CRM-19014
Monish Deb [Fri, 1 Jul 2016 06:55:44 +0000 (12:25 +0530)]
Merge pull request #8649 from jitendrapurohit/CRM-19014

CRM-19014 - Avoid the fix to affect Activity Dashlet.

8 years agoMerge pull request #8650 from jitendrapurohit/CRM-18803
Monish Deb [Fri, 1 Jul 2016 06:35:42 +0000 (12:05 +0530)]
Merge pull request #8650 from jitendrapurohit/CRM-18803

CRM-18803 - CiviReports REGEXP incorrectly filters selected values

8 years agoCRM-18803 - CiviReports REGEXP incorrectly filters selected values
jitendrapurohit [Fri, 1 Jul 2016 05:50:12 +0000 (11:20 +0530)]
CRM-18803 - CiviReports REGEXP incorrectly filters selected values

8 years agoCRM-19014 - Avoid the fix to affect Activity Dashlet.
jitendrapurohit [Fri, 1 Jul 2016 05:01:56 +0000 (10:31 +0530)]
CRM-19014 - Avoid the fix to affect Activity Dashlet.

8 years agoMerge pull request #8627 from nielosz/contact-icons-to-activities-list
Monish Deb [Fri, 1 Jul 2016 04:52:01 +0000 (10:22 +0530)]
Merge pull request #8627 from nielosz/contact-icons-to-activities-list

CRM-19014: Add summery/overlay icons to contacts in activities list

8 years agoFix up Tests and add in return statements
Seamus Lee [Fri, 1 Jul 2016 02:44:56 +0000 (12:44 +1000)]
Fix up Tests and add in return statements

8 years agoCRM-19038 NFC shift safeDropFK code to SchemaHandler Class from Upgrade Code
Seamus Lee [Fri, 1 Jul 2016 02:30:46 +0000 (12:30 +1000)]
CRM-19038 NFC shift safeDropFK code to SchemaHandler Class from Upgrade Code

8 years agoStyle fix
nielosz [Thu, 30 Jun 2016 13:18:33 +0000 (15:18 +0200)]
Style fix

8 years agoupper case boolean flag
sunil [Thu, 30 Jun 2016 12:33:37 +0000 (18:03 +0530)]
upper case boolean flag

8 years agoadded testcase to verify utf-8 string
sunil [Thu, 30 Jun 2016 12:27:49 +0000 (17:57 +0530)]
added testcase to verify utf-8 string

8 years agoMerge pull request #8646 from yashodha/CRM-16189
Yashodha Chaku [Thu, 30 Jun 2016 10:38:56 +0000 (16:08 +0530)]
Merge pull request #8646 from yashodha/CRM-16189

CRM-16189: remove ts from name

8 years agoDont show overlay on dashlets which limit space
nielosz [Thu, 30 Jun 2016 09:38:30 +0000 (11:38 +0200)]
Dont show overlay on dashlets which limit space

8 years agoCRM-19006: option values with commas are unsearchable
deb.monish [Thu, 30 Jun 2016 05:39:06 +0000 (11:09 +0530)]
CRM-19006: option values with commas are unsearchable

8 years agoCRM-16189: remove ts from name
yashodha [Thu, 30 Jun 2016 07:27:42 +0000 (12:57 +0530)]
CRM-16189: remove ts from name

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

8 years agoMerge pull request #8642 from jitendrapurohit/CRM-12252
Monish Deb [Wed, 29 Jun 2016 12:42:51 +0000 (18:12 +0530)]
Merge pull request #8642 from jitendrapurohit/CRM-12252

CRM-12252 - Minor fixes

8 years agoMerge pull request #8638 from eileenmcnaughton/notices
Yashodha Chaku [Wed, 29 Jun 2016 11:09:24 +0000 (16:39 +0530)]
Merge pull request #8638 from eileenmcnaughton/notices

CRM-14872 adjust notice fix