Jamie McClelland [Mon, 27 Jun 2016 17:53:17 +0000 (13:53 -0400)]
CRM-18713 - simple fix, ensure mobile # is not overwritten by primary.
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
yashodha [Sun, 26 Jun 2016 13:37:03 +0000 (19:07 +0530)]
Set version to 4.7.10
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
Yashodha Chaku [Sun, 26 Jun 2016 11:37:52 +0000 (17:07 +0530)]
Merge pull request #8456 from eileenmcnaughton/merge_perms
Dedupe fixes (many)
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
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
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...
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)
eileen [Tue, 21 Jun 2016 02:58:49 +0000 (14:58 +1200)]
CRM-18547 keep group context when marking dupes
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.
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'
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
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)
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
Seamus Lee [Tue, 21 Jun 2016 06:53:10 +0000 (16:53 +1000)]
Fix upgrate script with date issue following testing
Seamus Lee [Sat, 18 Jun 2016 23:09:51 +0000 (09:09 +1000)]
Make some minor changes to simplify db work
Seamus Lee [Mon, 6 Jun 2016 13:18:57 +0000 (23:18 +1000)]
add missing Columns
Seamus Lee [Mon, 6 Jun 2016 13:07:44 +0000 (23:07 +1000)]
Attempt to fix upgrade and keep activity tab filter settings
Seamus Lee [Mon, 2 May 2016 00:18:38 +0000 (00:18 +0000)]
Delete activity Tab filter settings before upgrade
eileen [Thu, 23 Jun 2016 03:03:52 +0000 (15:03 +1200)]
CRM-17310 follow up fix - report criteria not showing at urls like civicrm/report/contact/summary?reset=1
eileen [Thu, 23 Jun 2016 02:23:50 +0000 (14:23 +1200)]
CRM-18996 - Root nav menu shows unexpected 'My Reports'
eileen [Wed, 22 Jun 2016 22:50:58 +0000 (10:50 +1200)]
CRM-17154 fix search actions to support refreshing fields in confirm (like save a copy)
Always refresh 'task' to '' as it is not a true field, enotice fix
minor simplification
Remove obsoleted code
Show navigation menu on save-as screen
eileen [Wed, 22 Jun 2016 08:18:06 +0000 (20:18 +1200)]
CRM-17154 remove code no longer used
eileen [Wed, 22 Jun 2016 07:59:42 +0000 (19:59 +1200)]
CRM-17154 do not retain action in params
eileen [Wed, 22 Jun 2016 07:59:16 +0000 (19:59 +1200)]
CRM-17154 refactor task actions to accept per-option confirm message & data and add Delete-confirm modal
eileen [Wed, 22 Jun 2016 02:34:17 +0000 (14:34 +1200)]
CRM-17154 share addTaskMenu with search forms for consistency. Pick up one extra css class in the process
eileen [Wed, 22 Jun 2016 01:42:15 +0000 (13:42 +1200)]
CRM-17154 remove duplicated action buttons
eileen [Wed, 22 Jun 2016 01:33:11 +0000 (13:33 +1200)]
CRM-17154 fix delete function.
eileen [Fri, 18 Sep 2015 03:36:40 +0000 (15:36 +1200)]
CRM-17154 report actions improvement
Also add delete to action buttons
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
projects / civicrm-core.git / log