eileen [Thu, 16 Jun 2016 05:43:50 +0000 (17:43 +1200)]
Minor code tidy-ups. Remove unused var, add comments
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
eileen [Wed, 15 Jun 2016 02:31:29 +0000 (14:31 +1200)]
CRM-18958 add limit to dedupe screen
eileen [Thu, 26 May 2016 09:00:58 +0000 (21:00 +1200)]
CRM-18674 fix date merging for view_only custom fields
eileen [Thu, 26 May 2016 10:43:23 +0000 (22:43 +1200)]
CRM-18685, CRM-18674 tests
Change-Id: I672399d3c82a885d04eb663e3f3287bb3b4cdfa6
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
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 ...
eileen [Thu, 26 May 2016 02:46:27 +0000 (14:46 +1200)]
Cleanup a couple of unused vars
eileen [Thu, 26 May 2016 01:43:38 +0000 (13:43 +1200)]
CRM-18681 respect api permissions flag on batch merge job
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
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
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
Pradeep Nayak [Fri, 24 Jun 2016 14:39:09 +0000 (20:09 +0530)]
--CRM-16189, fixed styling
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
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
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
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
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
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 …
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…
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
Pradeep Nayak [Fri, 24 Jun 2016 12:47:44 +0000 (18:17 +0530)]
--CRM-16189, updated function document
Pradeep Nayak [Fri, 24 Jun 2016 12:46:12 +0000 (18:16 +0530)]
--CRM-16189, updated function document
Edsel [Wed, 22 Jun 2016 11:16:58 +0000 (16:46 +0530)]
CRM-16189-12 Unit test for validateRelationship
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
Pradeep Nayak [Fri, 24 Jun 2016 11:40:47 +0000 (17:10 +0530)]
--CRM-16189, added comment
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
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
Coleman Watts [Fri, 24 Jun 2016 00:10:29 +0000 (20:10 -0400)]
CRM-19000 - Fix when hitting enter on quicksearch
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.
Pradeep Nayak [Thu, 23 Jun 2016 17:49:57 +0000 (23:19 +0530)]
--CRM-16189, fixed style
Pradeep Nayak [Thu, 23 Jun 2016 17:46:15 +0000 (23:16 +0530)]
--CRM-16189, added tst tag for description
Pradeep Nayak [Wed, 22 Jun 2016 09:42:48 +0000 (15:12 +0530)]
CRM-16189, added full stop and used callAPISuccess() to create entries in db
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Conflicts:
CRM/Financial/BAO/FinancialAccount.php
Pradeep Nayak [Tue, 21 Jun 2016 20:50:44 +0000 (02:20 +0530)]
--CRM-16189, fixed sql by removing civicrm_option_value join, instead used option value in where clause
Edsel [Mon, 20 Jun 2016 11:37:24 +0000 (17:07 +0530)]
CRM-16189 Added unit test for deferred financial types
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Conflicts:
tests/phpunit/CRM/Financial/BAO/FinancialAccountTest.php
Pradeep Nayak [Wed, 15 Jun 2016 10:56:34 +0000 (16:26 +0530)]
CRM-16189, added function to get all financial type having Deferred Income account is relationship
----------------------------------------
* CRM-16189:
https://issues.civicrm.org/jira/browse/CRM-16189
Conflicts:
CRM/Financial/BAO/FinancialAccount.php
Pradeep Nayak [Wed, 15 Jun 2016 10:13:27 +0000 (15:43 +0530)]
CRM-16189, added 2 default Financial Account on install and upgrade
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Pradeep Nayak [Wed, 15 Jun 2016 10:04:41 +0000 (15:34 +0530)]
CRM-16189, added Deferred Revenue Account is account relationship on install and upgrade
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
jitendrapurohit [Thu, 23 Jun 2016 13:23:23 +0000 (18:53 +0530)]
CRM-18988 - multi custom data: after sorting, unable to edit
Yashodha Chaku [Thu, 23 Jun 2016 11:10:12 +0000 (16:40 +0530)]
Merge pull request #8619 from yashodha/CRM-18984
CRM-18984 : Can't delete an import/export mapping
yashodha [Thu, 23 Jun 2016 10:18:11 +0000 (15:48 +0530)]
CRM-18984 : Can't delete an import/export mapping
----------------------------------------
* CRM-18984: Can't delete an import/export mapping
https://issues.civicrm.org/jira/browse/CRM-18984
Eileen McNaughton [Thu, 23 Jun 2016 10:00:24 +0000 (22:00 +1200)]
Merge pull request #8376 from mollux/CRM-18563_apifailure_errormessage
CRM-18563 Pass expected error message to assertAPIFailure
Eileen McNaughton [Thu, 23 Jun 2016 03:31:16 +0000 (15:31 +1200)]
Merge pull request #8177 from herbdool/backdrop-install
Install CiviCRM in Backdrop is mostly working
Eileen McNaughton [Thu, 23 Jun 2016 00:44:05 +0000 (12:44 +1200)]
Merge pull request #8612 from nishant-bhorodia/CRM-18688-cancel-ipn-signal-cancels-active-membership
CRM-18688: Whitelist Pending Status
colemanw [Thu, 23 Jun 2016 00:34:10 +0000 (18:34 -0600)]
Merge pull request #8564 from JMAConsulting/CRM-16189-6
CRM-16189, added code to get financial account on the basis of accoun…
colemanw [Thu, 23 Jun 2016 00:30:32 +0000 (18:30 -0600)]
Merge pull request #8560 from JMAConsulting/CRM-16189-2
CRM-16189, added revenue_recognition_date field for on install and up…
Tim Otten [Wed, 22 Jun 2016 23:31:24 +0000 (16:31 -0700)]
Merge pull request #8616 from totten/coldrunKacper-ignore-components-in-disabled-extensions
Ignore Components in disabled Extensions - Implementing changes from pull request
Tim Otten [Wed, 22 Jun 2016 21:24:16 +0000 (14:24 -0700)]
CRM_Core_OptionValue - Style
Pradeep Nayak [Wed, 22 Jun 2016 21:20:42 +0000 (02:50 +0530)]
CRM-16189, moved the function from PseudoConstant to BAO
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Eileen McNaughton [Wed, 22 Jun 2016 20:44:52 +0000 (08:44 +1200)]
Merge pull request #8508 from eileenmcnaughton/revert_dates
CRM-18761 fix for dodgey date revert
Pradeep Nayak [Wed, 15 Jun 2016 12:56:02 +0000 (18:26 +0530)]
CRM-16189, fixed api example to pass API test
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Pradeep Nayak [Wed, 15 Jun 2016 09:55:54 +0000 (15:25 +0530)]
CRM-16189, added revenue_recognition_date field for on install and upgrade
----------------------------------------
* 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
Yashodha Chaku [Wed, 22 Jun 2016 15:11:14 +0000 (20:41 +0530)]
Merge pull request #8559 from JMAConsulting/CRM-16189-1
CRM-16189, added opening_balance and current_period_opening_balance d…
Monish Deb [Wed, 22 Jun 2016 13:17:20 +0000 (18:47 +0530)]
Merge pull request #8179 from monishdeb/CRM-18147
CRM-18147 - Advanced filtering on email or email_id does not work for the Contact API
Monish Deb [Wed, 22 Jun 2016 13:13:21 +0000 (18:43 +0530)]
Merge pull request #8614 from jitendrapurohit/webtest-fixes
webtest fixes
jitendrapurohit [Wed, 22 Jun 2016 13:13:32 +0000 (18:43 +0530)]
webtest fixes
Monish Deb [Wed, 22 Jun 2016 13:04:48 +0000 (18:34 +0530)]
Merge pull request #8613 from monishdeb/CRM-18989
CRM-18989: Dollar Sign showing twice in Activity custom field (money)
jitendrapurohit [Wed, 22 Jun 2016 12:36:09 +0000 (18:06 +0530)]
fix jenkin test failures
Edsel [Wed, 22 Jun 2016 12:25:37 +0000 (17:55 +0530)]
CRM-16189 Unit test for checkContributeSettings
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Monish Deb [Wed, 22 Jun 2016 11:57:19 +0000 (17:27 +0530)]
Merge pull request #8611 from jitendrapurohit/CRM-18827
CRM-18827 - Missed Required Field Returns Default Value of Membership…
deb.monish [Wed, 22 Jun 2016 11:40:34 +0000 (17:10 +0530)]
CRM-18989: Dollar Sign showing twice in Activity custom field (money)
root [Wed, 22 Jun 2016 09:58:40 +0000 (15:28 +0530)]
CRM-18688: Whitelist Pending Status
deb.monish [Tue, 19 Apr 2016 20:45:10 +0000 (02:15 +0530)]
CRM-18147 - Advanced filtering on email or email_id does not work for the Contact API
Eileen McNaughton [Wed, 22 Jun 2016 07:45:56 +0000 (19:45 +1200)]
Merge pull request #8563 from JMAConsulting/CRM-16189-5
Crm 16189 5
jitendrapurohit [Wed, 22 Jun 2016 06:15:43 +0000 (11:45 +0530)]
CRM-18827 - Missed Required Field Returns Default Value of Membership after Overriding
Edsel [Wed, 22 Jun 2016 06:14:16 +0000 (11:44 +0530)]
CRM-16189 Fixed jenkins errors
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Eileen McNaughton [Tue, 21 Jun 2016 22:03:02 +0000 (10:03 +1200)]
Merge pull request #7047 from johanv/CRM-17430-dont_change_domain_version_1st_attempt
Changing something to the domain should leave the domain_version untouched
Eileen McNaughton [Tue, 21 Jun 2016 20:51:34 +0000 (08:51 +1200)]
Merge pull request #8380 from mollux/CRM-18563_or_permission_api_exception
CRM-18563 API or permissions
Pradeep Nayak [Tue, 21 Jun 2016 20:18:46 +0000 (01:48 +0530)]
CRM-16189, removed un-used code
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Pradeep Nayak [Wed, 15 Jun 2016 09:49:42 +0000 (15:19 +0530)]
CRM-16189, added opening_balance and current_period_opening_balance db fields code for on install and upgrade
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Monish Deb [Tue, 21 Jun 2016 11:17:02 +0000 (16:47 +0530)]
Merge pull request #8606 from jitendrapurohit/CRM-18975
CRM-18975 - Activity date filter ignored when viewing activity reports
jitendrapurohit [Tue, 21 Jun 2016 10:46:05 +0000 (16:16 +0530)]
CRM-18975 - Activity date filter ignored when viewing activity reports
Eileen McNaughton [Tue, 21 Jun 2016 08:59:22 +0000 (20:59 +1200)]
Merge pull request #8509 from josephlacey/CRM-18665
CRM-18665 Fixing bug where event subtype doesn't reload when validati…
Yashodha Chaku [Tue, 21 Jun 2016 08:40:37 +0000 (14:10 +0530)]
Merge pull request #8604 from yashodha/CRM-18982
CRM-18982: Pledge report: cannot add results to a group
Eileen McNaughton [Tue, 21 Jun 2016 07:03:37 +0000 (19:03 +1200)]
Merge pull request #8494 from kcristiano/CRM-18221
CRM-18221 filter relativize with realpath function to properly configure [civicrm.root] and [civicrm.files] on hosts with symlinked file systems
yashodha [Tue, 21 Jun 2016 06:48:49 +0000 (12:18 +0530)]
CRM-18982: Pledge report: cannot add results to a group
----------------------------------------
* CRM-18982:
https://issues.civicrm.org/jira/browse/CRM-18982
Monish Deb [Mon, 20 Jun 2016 11:14:23 +0000 (16:44 +0530)]
Merge pull request #8596 from jitendrapurohit/CRM-18656
CRM-18656 - Advanced search fails to show tagset criteria when editing saved search
jitendrapurohit [Mon, 20 Jun 2016 10:09:12 +0000 (15:39 +0530)]
CRM-18656 - minor optimisation
kenwest [Sun, 29 May 2016 06:50:27 +0000 (16:50 +1000)]
Changed comment to comply with style checker
kenwest [Mon, 23 May 2016 12:43:03 +0000 (22:43 +1000)]
CRM-18656 Advanced search fails to show tagset criteria when editing saved search
Monish Deb [Mon, 20 Jun 2016 08:49:34 +0000 (14:19 +0530)]
Merge pull request #8471 from johanv/CRM-18697-export_batches
Make it possible to create new batch ExportFormats in an extension
Yashodha Chaku [Mon, 20 Jun 2016 08:33:02 +0000 (14:03 +0530)]
Merge pull request #8595 from civicrm/eileenmcnaughton-patch-1
Remove unnecessary deprected require_once
Monish Deb [Mon, 20 Jun 2016 05:10:55 +0000 (10:40 +0530)]
Merge pull request #8593 from yashodha/CRM-18960
CRM-18960: Change title in Getting Started widget
Eileen McNaughton [Mon, 20 Jun 2016 05:03:06 +0000 (17:03 +1200)]
Remove unnecessary deprected require_once
Edsel [Sun, 19 Jun 2016 10:38:48 +0000 (16:08 +0530)]
CRM-16189 Added unit test for financial account relationships
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Edsel [Sun, 19 Jun 2016 06:52:14 +0000 (12:22 +0530)]
CRM-16189 Added unit test for option group extra param
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Eileen McNaughton [Fri, 17 Jun 2016 23:39:16 +0000 (11:39 +1200)]
Merge pull request #8100 from cividesk/CRM-18362-4.7
CRM-18362 get current local for navigation menu
Monish Deb [Fri, 17 Jun 2016 19:45:13 +0000 (01:15 +0530)]
Merge pull request #8590 from adixon/CRM-18973
CRM-18973
Yashodha Chaku [Fri, 17 Jun 2016 14:14:53 +0000 (19:44 +0530)]
Merge pull request #8551 from scardinius/crm-18815
CRM-18815: getTrackerURL() returns invalid url_id for CiviMail A/B Test
Monish Deb [Fri, 17 Jun 2016 10:17:13 +0000 (15:47 +0530)]
Merge pull request #8575 from monishdeb/CRM-18071
CRM-18071: free membership doesn't depend on is_monetary
adixon [Thu, 16 Jun 2016 19:23:49 +0000 (15:23 -0400)]
CRM-18973
deb.monish [Wed, 15 Jun 2016 18:45:27 +0000 (00:15 +0530)]
CRM-18071: free membership doesn't depend on is_monetary
yashodha [Thu, 16 Jun 2016 10:21:23 +0000 (15:51 +0530)]
CRM-18960: Change title in Getting Started widget
----------------------------------------
* CRM-18960: Change title in Getting Started widget
https://issues.civicrm.org/jira/browse/CRM-18960
yashodha [Thu, 16 Jun 2016 08:25:38 +0000 (13:55 +0530)]
CRM-18960: Change title in Getting Started widget
----------------------------------------
* CRM-18960: Change title in Getting Started widget
https://issues.civicrm.org/jira/browse/CRM-18960
Yashodha Chaku [Thu, 16 Jun 2016 06:43:36 +0000 (12:13 +0530)]
Merge pull request #8557 from yashodha/fix-CRM-18472
CRM-18472: notice fixes
Yashodha Chaku [Thu, 16 Jun 2016 06:14:19 +0000 (11:44 +0530)]
Merge pull request #8567 from yashodha/CRM-18954
CRM-18954: Error on adding a field to a profile used by a contributio…
Pradeep Nayak [Wed, 15 Jun 2016 10:49:00 +0000 (16:19 +0530)]
CRM-16189, added code to get financial account on the basis of account relationship
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
yashodha [Wed, 15 Jun 2016 10:31:39 +0000 (16:01 +0530)]
CRM-18954: Error on adding a field to a profile used by a contribution page
----------------------------------------
* CRM-18954: Error on adding a field to a profile used by a contribution page
https://issues.civicrm.org/jira/browse/CRM-18954
Pradeep Nayak [Wed, 15 Jun 2016 10:29:02 +0000 (15:59 +0530)]
CRM-16189, modified code to allow sort option values with different column field
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Pradeep Nayak [Wed, 15 Jun 2016 10:26:32 +0000 (15:56 +0530)]
CRM-16189, modified function to sort option values with other column fields
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
projects / civicrm-core.git / log