civicrm-core.git
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 #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 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 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 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 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 agoCRM-12252 - Minor fixes
jitendrapurohit [Wed, 29 Jun 2016 11:07:34 +0000 (16:37 +0530)]
CRM-12252 - Minor fixes

8 years agoMerge pull request #8521 from seamuslee001/CRM-12252
Monish Deb [Wed, 29 Jun 2016 10:26:47 +0000 (15:56 +0530)]
Merge pull request #8521 from seamuslee001/CRM-12252

CRM-12252 Add in help_pre and help_post fields for price field options

8 years agoMerge pull request #8602 from eileenmcnaughton/master
Eileen McNaughton [Wed, 29 Jun 2016 07:59:32 +0000 (19:59 +1200)]
Merge pull request #8602 from eileenmcnaughton/master

CRM-18435 handling for membership type etc fields

8 years agoFix up upgrade and get it to rebuild multilingual schema after adding base columns
Seamus Lee [Wed, 29 Jun 2016 06:23:16 +0000 (16:23 +1000)]
Fix up upgrade and get it to rebuild multilingual schema after adding base columns

8 years agoMerge pull request #8632 from monishdeb/CRM-19004
Monish Deb [Wed, 29 Jun 2016 05:45:29 +0000 (11:15 +0530)]
Merge pull request #8632 from monishdeb/CRM-19004

CRM-19004: Event/BAO/Query.php role search fails

8 years agoMove upgrade to 4.7.10 version and also test to see if it needs locale in table name...
Seamus Lee [Wed, 29 Jun 2016 04:52:20 +0000 (14:52 +1000)]
Move upgrade to 4.7.10 version and also test to see if it needs locale in table name as well

8 years agoRe-run regen.sh
Seamus Lee [Wed, 29 Jun 2016 04:42:54 +0000 (14:42 +1000)]
Re-run regen.sh

8 years agoAttempt to fix issue where doesn't save to multilingual db
Seamus Lee [Thu, 23 Jun 2016 07:30:26 +0000 (17:30 +1000)]
Attempt to fix issue where doesn't save to multilingual db

8 years agoFix function calling as per comment from Eileen :)
Seamus Lee [Thu, 23 Jun 2016 04:46:16 +0000 (14:46 +1000)]
Fix function calling as per comment from Eileen :)

8 years agoShift add table to php to make use of checking if field already exists
Seamus Lee [Wed, 29 Jun 2016 04:39:19 +0000 (14:39 +1000)]
Shift add table to php to make use of checking if field already exists

8 years agofinish adding description class to help pre and help post
Seamus Lee [Mon, 20 Jun 2016 23:56:23 +0000 (09:56 +1000)]
finish adding description class to help pre and help post

8 years ago Add in help pre and help post fields to price option form
Seamus Lee [Thu, 16 Jun 2016 23:16:21 +0000 (09:16 +1000)]
 Add in help pre and help post fields to price option form

8 years agoAdd in description class and add a class for the label seprator
Seamus Lee [Wed, 29 Jun 2016 04:38:11 +0000 (14:38 +1000)]
Add in description class and add a class for the label seprator

8 years agoAdd in mulyilingual handiling in upgrade script
Seamus Lee [Mon, 6 Jun 2016 01:55:15 +0000 (11:55 +1000)]
Add in mulyilingual handiling in upgrade script

8 years agoCRM-12252 Add in help_pre and help_post fields for price field options
Seamus Lee [Wed, 29 Jun 2016 04:37:14 +0000 (14:37 +1000)]
CRM-12252 Add in help_pre and help_post fields for price field options

8 years agoMerge pull request #8427 from eileenmcnaughton/event_cart
Eileen McNaughton [Tue, 28 Jun 2016 21:02:39 +0000 (09:02 +1200)]
Merge pull request #8427 from eileenmcnaughton/event_cart

Event cart   CRM-16481

8 years agoCRM-19004: Event/BAO/Query.php role search fails
deb.monish [Tue, 28 Jun 2016 11:13:20 +0000 (16:43 +0530)]
CRM-19004: Event/BAO/Query.php role search fails

8 years agoFix messed display with multiple contacts in one col
nielosz [Tue, 28 Jun 2016 13:36:38 +0000 (15:36 +0200)]
Fix messed display with multiple contacts in one col

8 years agoMerge pull request #8626 from jmcclelland/CRM-18713-simple
Yashodha Chaku [Tue, 28 Jun 2016 05:16:34 +0000 (10:46 +0530)]
Merge pull request #8626 from jmcclelland/CRM-18713-simple

CRM-18713 - simple fix, ensure mobile # is not overwritten by primary.

8 years agoCRM-18713 - simple fix, ensure mobile # is not overwritten by primary.
Jamie McClelland [Mon, 27 Jun 2016 17:53:17 +0000 (13:53 -0400)]
CRM-18713 - simple fix, ensure mobile # is not overwritten by primary.

8 years agoCRM-16189, added function to validate financial type (#8570)
Pradeep Nayak [Mon, 27 Jun 2016 14:54:33 +0000 (20:24 +0530)]
CRM-16189, added function to validate financial type (#8570)

* CRM-16189, added function to validate financial type

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

Conflicts:

CRM/Financial/BAO/FinancialAccount.php

* CRM-16189 Added unit test for ValidateFinancialType

----------------------------------------
* 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, fixed stylings

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

Conflicts:

CRM/Financial/BAO/FinancialAccount.php

* --CRM-16189, updated code and removed unwanted checks

* CRM-16189, updated class name

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

* --CRM-16189, fixed array indentation

* --CRM-16189, removed conflicts

* --CRM-16189, fixed return value to use it as bool

8 years ago Add summery-overlay contact icons to activity's participants
nielosz [Mon, 27 Jun 2016 14:51:01 +0000 (16:51 +0200)]
 Add summery-overlay contact icons to activity's participants

When listing activities, the contacts columns are enriched with the contact type icons opening summary overlay on hover.

8 years agoMerge pull request #8623 from yashodha/fix-version
Yashodha Chaku [Mon, 27 Jun 2016 05:08:29 +0000 (10:38 +0530)]
Merge pull request #8623 from yashodha/fix-version

Set version to 4.7.10

8 years ago--CRM-16189, don't add entries for line qty is 0
Pradeep Nayak [Wed, 15 Jun 2016 19:35:04 +0000 (01:05 +0530)]
--CRM-16189, don't add entries for line qty is 0

8 years agoCRM-16189, fixed sql for fetching payment for partial paid contribution
Pradeep Nayak [Wed, 15 Jun 2016 19:33:45 +0000 (01:03 +0530)]
CRM-16189, fixed sql for fetching payment for partial paid contribution

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

8 years ago--CRM-16189, removed spaces
Pradeep Nayak [Sun, 26 Jun 2016 23:34:37 +0000 (05:04 +0530)]
--CRM-16189, removed spaces

8 years ago--CRM-16189, added ts tag
Pradeep Nayak [Sun, 26 Jun 2016 23:04:04 +0000 (04:34 +0530)]
--CRM-16189, added ts tag

8 years ago--CRM-16189, generalized code, removed hardcoded values, used function
Pradeep Nayak [Wed, 15 Jun 2016 20:17:28 +0000 (01:47 +0530)]
--CRM-16189, generalized code, removed hardcoded values, used function

8 years agoCRM-19012 set @civicrm_user_id in the DB for REST calls
David Knoll [Sun, 26 Jun 2016 22:13:23 +0000 (23:13 +0100)]
CRM-19012 set @civicrm_user_id in the DB for REST calls

8 years agoSet version to 4.7.10
yashodha [Sun, 26 Jun 2016 13:37:03 +0000 (19:07 +0530)]
Set version to 4.7.10

8 years agoMerge pull request #8529 from eileenmcnaughton/reports
Yashodha Chaku [Sun, 26 Jun 2016 11:42:02 +0000 (17:12 +0530)]
Merge pull request #8529 from eileenmcnaughton/reports

CRM-17154 report actions improvement

8 years agoMerge pull request #8456 from eileenmcnaughton/merge_perms
Yashodha Chaku [Sun, 26 Jun 2016 11:37:52 +0000 (17:07 +0530)]
Merge pull request #8456 from eileenmcnaughton/merge_perms

Dedupe fixes (many)

8 years agoCRM-16481
zorgalina [Sat, 25 Jun 2016 20:22:40 +0000 (13:22 -0700)]
CRM-16481

8 years agoMerge pull request #8273 from seamuslee001/CRM-18485
Monish Deb [Sun, 26 Jun 2016 08:48:26 +0000 (14:18 +0530)]
Merge pull request #8273 from seamuslee001/CRM-18485

CRM-18485 Delete activity Tab filter settings before upgrade

8 years agoCRM-16481
zorgalina [Sat, 25 Jun 2016 07:05:06 +0000 (00:05 -0700)]
CRM-16481

8 years agoCRM-16189, added function to check if financial type has Deferred Inc… (#8565)
Pradeep Nayak [Sat, 25 Jun 2016 02:48:26 +0000 (08:18 +0530)]
CRM-16189, added function to check if financial type has Deferred Inc… (#8565)

* CRM-16189, added function to check if financial type has Deferred Income Account is relationship

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

Conflicts:

CRM/Financial/BAO/FinancialAccount.php

* CRM-16189 Added unit test for checkForValidFinancialType function

----------------------------------------
* 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, changed the function name

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

* CRM-16189, updated class name

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

8 years agoCRM-18958 add setting to control addion of limit to the dedupe screen.
eileen [Sat, 25 Jun 2016 02:19:53 +0000 (14:19 +1200)]
CRM-18958 add setting to control addion of limit to the dedupe screen.

We have struggled to find a compromise between the needs of larger sites not to crash when deduping & the UI experience of a 'batch' not being a batch - ie. finding duplicates for the first 1000 contacts could result in 67 or 6700. In discussion it was clear that even if we agreed on a UI to make this work the default for a large site (e.g 1000 to prevent crashes) was different to what would work for a small site - so I concluded we would need a setting. Given that it seemed to make sense to focus on adding the setting, which would provide the immediate protection needed for larger sites without compromising UI on small sites, and to put the time into that rather than solving the now less important batchin issue.

Note I did some tidy up on the settings form code too...

8 years agoCRM-18577 fix dedupe search by postcode
eileen [Tue, 21 Jun 2016 06:42:20 +0000 (18:42 +1200)]
CRM-18577 fix dedupe search by postcode

Note there is a separate issue to add regex to this, but I opted to
restrict this to refactoring + the bug fix, rather than include the improvement.

Let's add a test when we improve! (CRM-18694)

8 years agoCRM-18547 keep group context when marking dupes
eileen [Tue, 21 Jun 2016 02:58:49 +0000 (14:58 +1200)]
CRM-18547 keep group context when marking dupes

8 years agoCRM-17597 test to attempt to replicate bug (could not replicate in UI
eileen [Tue, 21 Jun 2016 02:21:06 +0000 (14:21 +1200)]
CRM-17597 test to attempt to replicate bug (could not replicate in UI
But in the test I found a related bug where 0 was not treated as a conflict.
I suspect this bug is broader & will dig more.

8 years agoCRM-18575 autoflip fix. Do not pass autoflip when batch merging.
eileen [Fri, 17 Jun 2016 23:34:03 +0000 (11:34 +1200)]
CRM-18575 autoflip  fix. Do not pass autoflip when batch merging.

Fix autoflip by passing do not autoflip to respect prevnext contents & fully altering those contents.

I was going to refactor further but without an api for the entity it's a drag & there is contention
about adding apis just to help improve code quality because they aren't 'protected'

8 years agoMinor code tidy-ups. Remove unused var, add comments
eileen [Thu, 16 Jun 2016 05:43:50 +0000 (17:43 +1200)]
Minor code tidy-ups. Remove unused var, add comments

8 years agoCRM-18522 tests to attempt to reproduce the reported sql error.
eileen [Wed, 15 Jun 2016 09:10:30 +0000 (21:10 +1200)]
CRM-18522 tests to attempt to reproduce the reported sql error.

I could not reproduce the error through the UI alone. I had to basically hack the rules out in the db. I guess the config
arguably makes sense when configured in conjunction with the extension but that is not 100% clear.

However the code is a little less hacky & a lot better tested as a result of committing this

8 years agoCRM-18958 add limit to dedupe screen
eileen [Wed, 15 Jun 2016 02:31:29 +0000 (14:31 +1200)]
CRM-18958 add limit to dedupe screen

8 years agoCRM-18674 fix date merging for view_only custom fields
eileen [Thu, 26 May 2016 09:00:58 +0000 (21:00 +1200)]
CRM-18674 fix date merging for view_only custom fields

8 years agoCRM-18685, CRM-18674 tests
eileen [Thu, 26 May 2016 10:43:23 +0000 (22:43 +1200)]
CRM-18685, CRM-18674 tests

Change-Id: I672399d3c82a885d04eb663e3f3287bb3b4cdfa6

8 years agoCRM-18685 Batch merge - custom data not treated as a conflict - resulting in dataloss
eileen [Thu, 26 May 2016 10:42:39 +0000 (22:42 +1200)]
CRM-18685 Batch merge - custom data not treated as a conflict - resulting in dataloss

8 years agoMake the changes John suggested last time, so the tests don't break EVERY time ...
eileen [Thu, 26 May 2016 07:26:51 +0000 (19:26 +1200)]
Make the changes John suggested last time, so the tests don't break EVERY time ...

8 years agoCleanup a couple of unused vars
eileen [Thu, 26 May 2016 02:46:27 +0000 (14:46 +1200)]
Cleanup a couple of unused vars

8 years agoCRM-18681 respect api permissions flag on batch merge job
eileen [Thu, 26 May 2016 01:43:38 +0000 (13:43 +1200)]
CRM-18681 respect api permissions flag on batch merge job

8 years agoCRM-17154 Update actions - save rather than update, no duplicate refresh, clear task...
eileen [Fri, 24 Jun 2016 10:12:59 +0000 (22:12 +1200)]
CRM-17154 Update actions - save rather than update, no duplicate refresh, clear task on click (for csv)

8 years agoMerge pull request #8569 from JMAConsulting/CRM-16189-10
colemanw [Fri, 24 Jun 2016 23:51:36 +0000 (19:51 -0400)]
Merge pull request #8569 from JMAConsulting/CRM-16189-10

CRM-16189, added function to validate financial account

8 years agoMerge pull request #8562 from JMAConsulting/CRM-16189-4
colemanw [Fri, 24 Jun 2016 21:59:43 +0000 (17:59 -0400)]
Merge pull request #8562 from JMAConsulting/CRM-16189-4

CRM-16189, added function to retrieve values from settings

8 years agoMerge branch 'loading-components-in-disabled-extension-issue' of https://github.com...
Tim Otten [Fri, 24 Jun 2016 16:17:23 +0000 (09:17 -0700)]
Merge branch 'loading-components-in-disabled-extension-issue' of https://github.com/coldrunKacper/civicrm-core into coldrunKacper-loading-components-in-disabled-extension-issue

8 years ago--CRM-16189, fixed styling
Pradeep Nayak [Fri, 24 Jun 2016 14:39:09 +0000 (20:09 +0530)]
--CRM-16189,  fixed styling

8 years ago--CRM-16189, updated sql to include option value in where clause and changed stylings
Pradeep Nayak [Fri, 24 Jun 2016 12:10:40 +0000 (17:40 +0530)]
--CRM-16189, updated sql to include option value in where clause and changed stylings

Conflicts:

CRM/Financial/BAO/FinancialAccount.php

8 years agoCRM-16189-10 Added test for validateFinancialAccount
Edsel [Wed, 22 Jun 2016 10:23:50 +0000 (15:53 +0530)]
CRM-16189-10 Added test for validateFinancialAccount

Conflicts:

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

8 years agoCRM-16189, fixed indentation
Pradeep Nayak [Wed, 22 Jun 2016 09:57:30 +0000 (15:27 +0530)]
CRM-16189, fixed indentation

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

Conflicts:

CRM/Financial/BAO/FinancialAccount.php

8 years agoCRM-16189 Bug fixes
Edsel [Tue, 21 Jun 2016 12:58:53 +0000 (18:28 +0530)]
CRM-16189 Bug fixes

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

8 years agoCRM-16189, added function to validate financial account
Pradeep Nayak [Wed, 15 Jun 2016 14:43:36 +0000 (20:13 +0530)]
CRM-16189, added function to validate financial account

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

Conflicts:

CRM/Financial/BAO/FinancialAccount.php

8 years agoMerge pull request #8571 from JMAConsulting/CRM-16189-12
Yashodha Chaku [Fri, 24 Jun 2016 14:29:14 +0000 (19:59 +0530)]
Merge pull request #8571 from JMAConsulting/CRM-16189-12

CRM-16189, added function to validate relationship between financial …

8 years agoMerge pull request #8568 from JMAConsulting/CRM-16189-8
Yashodha Chaku [Fri, 24 Jun 2016 14:22:53 +0000 (19:52 +0530)]
Merge pull request #8568 from JMAConsulting/CRM-16189-8

CRM-16189, added function to get all financial type having Deferred I…

8 years agoMerge pull request #8561 from JMAConsulting/CRM-16189-3
Yashodha Chaku [Fri, 24 Jun 2016 13:39:32 +0000 (19:09 +0530)]
Merge pull request #8561 from JMAConsulting/CRM-16189-3

Crm 16189 3

8 years ago--CRM-16189, updated function document
Pradeep Nayak [Fri, 24 Jun 2016 12:47:44 +0000 (18:17 +0530)]
--CRM-16189, updated function document

8 years ago--CRM-16189, updated function document
Pradeep Nayak [Fri, 24 Jun 2016 12:46:12 +0000 (18:16 +0530)]
--CRM-16189, updated function document

8 years agoCRM-16189-12 Unit test for validateRelationship
Edsel [Wed, 22 Jun 2016 11:16:58 +0000 (16:46 +0530)]
CRM-16189-12 Unit test for validateRelationship

8 years agoCRM-16189, added function to validate relationship between financial account and...
Pradeep Nayak [Wed, 15 Jun 2016 14:47:53 +0000 (20:17 +0530)]
CRM-16189, added function to validate relationship between financial account and financial type

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

8 years ago--CRM-16189, added comment
Pradeep Nayak [Fri, 24 Jun 2016 11:40:47 +0000 (17:10 +0530)]
--CRM-16189, added comment

8 years agoMerge pull request #8620 from jitendrapurohit/CRM-18988
Monish Deb [Fri, 24 Jun 2016 10:26:53 +0000 (15:56 +0530)]
Merge pull request #8620 from jitendrapurohit/CRM-18988

CRM-18988 - multi custom data: after sorting, unable to edit

8 years agoMerge pull request #8621 from colemanw/CRM-19000
colemanw [Fri, 24 Jun 2016 02:08:16 +0000 (22:08 -0400)]
Merge pull request #8621 from colemanw/CRM-19000

CRM-19000 - Fix when hitting enter on quicksearch

8 years agoCRM-19000 - Fix when hitting enter on quicksearch
Coleman Watts [Fri, 24 Jun 2016 00:10:29 +0000 (20:10 -0400)]
CRM-19000 - Fix when hitting enter on quicksearch

8 years agoMerge pull request #8555 from fuzionnz/CRM-18830
Eileen McNaughton [Thu, 23 Jun 2016 22:11:46 +0000 (10:11 +1200)]
Merge pull request #8555 from fuzionnz/CRM-18830

CRM-18830. Restore Google API key for geocoding.

8 years ago--CRM-16189, fixed style
Pradeep Nayak [Thu, 23 Jun 2016 17:49:57 +0000 (23:19 +0530)]
--CRM-16189, fixed style