Eileen McNaughton [Sun, 16 Apr 2017 05:32:02 +0000 (17:32 +1200)]
Merge pull request #10169 from seamuslee001/new_indexes
CRM-20313,CRM-19357,CRM-20204,CRM-19383
Joe Murray [Tue, 21 Mar 2017 20:38:00 +0000 (16:38 -0400)]
CRM-20313,CRM-19357: Add index to civicrm_activity.status_id and unique index to civicrm_entity_financial_account table
Seamus Lee [Sun, 16 Apr 2017 04:10:07 +0000 (14:10 +1000)]
CRM-20204,CRM-19383 Add in Indexes to civicrm_activity.activity_date_time and civicrm_event_queue.hash
Eileen McNaughton [Sun, 16 Apr 2017 00:36:17 +0000 (12:36 +1200)]
Merge pull request #10166 from aydun/CRM-19464-upgrade
CRM-19464 sql upgrade
Eileen McNaughton [Sun, 16 Apr 2017 00:35:54 +0000 (12:35 +1200)]
Merge pull request #10163 from JohnFF/bugfix/fix_static_warning
Fixed static call of non static method.
Eileen McNaughton [Sat, 15 Apr 2017 23:59:23 +0000 (11:59 +1200)]
Merge pull request #10150 from eileenmcnaughton/friend
CRM-20328 remove call to duplicated code sequence.
Eileen McNaughton [Sat, 15 Apr 2017 21:46:03 +0000 (09:46 +1200)]
Merge pull request #9857 from aydun/CRM-19464
CRM-19464 Make 'Supplemental Address 3' usable
Aidan Saunders [Sat, 15 Apr 2017 11:42:59 +0000 (12:42 +0100)]
Localize description
Tim Otten [Fri, 14 Apr 2017 21:30:24 +0000 (14:30 -0700)]
Merge pull request #10160 from JohnFF/bugfix/silent_sql_file_error
Make sourceSQLFile throw an error when it can't find a file.
colemanw [Fri, 14 Apr 2017 21:04:08 +0000 (17:04 -0400)]
Merge pull request #10162 from yashodha/CRM-20429
CRM-20429 - Deleting an activity with target contacts > 50 results in…
Aidan Saunders [Fri, 14 Apr 2017 20:49:32 +0000 (21:49 +0100)]
CRM-19464 sql upgrade
Aidan Saunders [Fri, 17 Feb 2017 23:27:32 +0000 (23:27 +0000)]
CRM-19464 Enable use of 'Supplemental Address 3'
In some situations, the address format is too limited. The 'Supplemental Address 3'
already exists in the schema but was not exposed to the GUI.
This touches many files but the changes are fairly simple. Wherever 'Supplemental Address 2'
existed, there is now a 'Supplemental Address 3' as well.
John Kirk [Fri, 14 Apr 2017 06:27:29 +0000 (06:27 +0000)]
Fixed static call of non static method. Assume the method was meant to be static as there's nothing in there requiring it to be dynamic.
yashodha [Fri, 14 Apr 2017 06:17:59 +0000 (11:47 +0530)]
CRM-20429 - Deleting an activity with target contacts > 50 results in error
Eileen McNaughton [Fri, 14 Apr 2017 04:55:26 +0000 (16:55 +1200)]
Merge pull request #10148 from yashodha/CRM-20417
CRM-20417 - translate strings
John Kirk [Thu, 13 Apr 2017 22:11:11 +0000 (22:11 +0000)]
Make sourceSQLFile throw an error when it can't find a file - previously it just failed silently.
colemanw [Fri, 14 Apr 2017 01:23:19 +0000 (21:23 -0400)]
Merge pull request #10112 from JMAConsulting/CRM-20384
CRM-20384, Added Contribution ID column and Filter to Book Keeping report
Pradeep Nayak [Wed, 12 Apr 2017 20:38:59 +0000 (02:08 +0530)]
CRM-20384, added function to get Organization Name associated with Financial Account.
----------------------------------------
* CRM-20384: Bookkeeping report add contrib ID, filter by financial account owner (IIDA-85)
https://issues.civicrm.org/jira/browse/CRM-20384
Pradeep Nayak [Wed, 5 Apr 2017 11:12:30 +0000 (16:42 +0530)]
CRM-20384, Added Contribution ID column and Filter
Added option to display and Filter by Financial Account Owner
----------------------------------------
* CRM-20384: bookkeeping transaction report
https://issues.civicrm.org/jira/browse/CRM-20384
Eileen McNaughton [Thu, 13 Apr 2017 04:08:39 +0000 (16:08 +1200)]
Merge pull request #10144 from eileenmcnaughton/iida8
CRM-20413 fix to setting wrong payment_instrument_id, by passing resp…
Eileen McNaughton [Thu, 13 Apr 2017 03:08:47 +0000 (15:08 +1200)]
Merge pull request #10127 from WeMoveEU/CRM-20389
CRM-20389 ignore mailing_type when cloning
eileen [Tue, 11 Apr 2017 14:43:08 +0000 (02:43 +1200)]
CRM-20413 fix to setting wrong payment_instrument_id, by passing responsibility to the processor.
This also reflects work towards allowing payment_instrument specific fields on the payment form - ie. check, credit_card_type, pan_truncation.
This idea is to finish the code allowing pay-later to be the manual payment processor indexed with a 0 on all payment forms, and have the
form render with appropriate fields. Note that I got this working on multiple forms, this commit reflects the smallest piece I could
break off that is complete within itself, and resolves an issue
I tested that it was still possible to enter checks on the offline contribution as well as membership & additional payment forms, and the
check number still shows up.
I also tested front end contribution credit card & pay later & front end event forms
Edsel Roque Lopez [Wed, 12 Apr 2017 21:36:40 +0000 (03:06 +0530)]
CRM-20359 Extended the use of contribution tokens to include custom fields using API (#10082)
* CRM-20359 Extended the use of contribution tokens to include custom fields using API
----------------------------------------
* CRM-20359: Support contribution.custom_nn tokens for Thank You letters - print or email
https://issues.civicrm.org/jira/browse/CRM-20359
* extended testBuildContributionArray unit test
* Fix missing comma
Monish Deb [Wed, 12 Apr 2017 12:22:19 +0000 (17:52 +0530)]
Merge pull request #10092 from jitendrapurohit/CRM-20339
CRM-20339: Fix custom data edit on Relationship
eileen [Tue, 28 Mar 2017 21:40:15 +0000 (10:40 +1300)]
CRM-20328 remove call to duplicated code sequence.
On looking is actually getting an ID so I renamed it
Eileen McNaughton [Wed, 12 Apr 2017 10:10:22 +0000 (22:10 +1200)]
Merge pull request #10143 from eileenmcnaughton/iida7
Towards CRM-20392 (IIDA-108) extract submit function
yashodha [Wed, 12 Apr 2017 09:15:29 +0000 (14:45 +0530)]
CRM-20417 - translate strings
deb.monish [Wed, 12 Apr 2017 09:15:26 +0000 (14:45 +0530)]
minor fix
eileen [Tue, 11 Apr 2017 11:43:18 +0000 (23:43 +1200)]
Remove e-notice causing declaration.
Since this is a deprecated name which doesn't work I have just removed it
eileen [Tue, 11 Apr 2017 11:53:16 +0000 (23:53 +1200)]
Towards CRM-20392 form cleanup, shared setting of ->mode
Pradeep Nayak [Tue, 11 Apr 2017 11:14:02 +0000 (23:14 +1200)]
Towards CRM-20392 (IIDA-108) extract submit function
Towards CRM-20392 enotice fixes
Eileen McNaughton [Wed, 12 Apr 2017 08:48:28 +0000 (20:48 +1200)]
Merge pull request #10130 from JMAConsulting/codeCleanup
Used Api to get financial account for an entity defined in civicrm_en…
Monish Deb [Wed, 12 Apr 2017 08:43:13 +0000 (14:13 +0530)]
Merge pull request #10081 from jitendrapurohit/CRM-20361
CRM-20361: Populate tokens when Scheduled Reminders are set to Record Activity for Automated Email
Pradeep Nayak [Fri, 7 Apr 2017 21:25:26 +0000 (02:55 +0530)]
Used Api to get financial account for an entity defined in civicrm_entity_financial_account table
Eileen McNaughton [Wed, 12 Apr 2017 02:42:22 +0000 (14:42 +1200)]
Merge pull request #10147 from KarinG/CRM-20393-dmaster
CRM-20393 - fix for check if the user already submitted transaction
KarinG [Wed, 12 Apr 2017 01:06:32 +0000 (19:06 -0600)]
No need to truncate x_invoice_num.
Eileen McNaughton [Wed, 12 Apr 2017 00:13:09 +0000 (12:13 +1200)]
Merge pull request #10129 from JMAConsulting/CRM-20392
CRM-20392, Code cleanup
Eileen McNaughton [Tue, 11 Apr 2017 23:27:03 +0000 (11:27 +1200)]
Merge pull request #10135 from seamuslee001/CRM-20410
CRM-20410 Reformat CRM_SMS_BAO_Provider to use standard create function style rather than the split
Eileen McNaughton [Tue, 11 Apr 2017 22:36:35 +0000 (10:36 +1200)]
Merge pull request #10145 from eileenmcnaughton/test-fail
Fix test regression by correctly setting timestamp in test method
eileen [Tue, 11 Apr 2017 22:31:01 +0000 (10:31 +1200)]
Fix test regression by correctly setting timestamp in test method
Seamus Lee [Tue, 11 Apr 2017 21:36:00 +0000 (07:36 +1000)]
Try replacing static with DAO
Eileen McNaughton [Tue, 11 Apr 2017 20:41:58 +0000 (08:41 +1200)]
Merge pull request #10139 from JMAConsulting/CRM-20391
CRM-20391 Added pan trucation to search
Eileen McNaughton [Tue, 11 Apr 2017 20:33:06 +0000 (08:33 +1200)]
Merge pull request #10115 from jmcclelland/CRM-20388
CRM-20388 - ensure connection errors are properly reported to user.
Eileen McNaughton [Tue, 11 Apr 2017 20:10:16 +0000 (08:10 +1200)]
Merge pull request #9848 from JMAConsulting/CRM-8526
CRM-8526 [ready for core team review] Added support for contribution tokens in emails sent via search results (Find contribution results and Advanced search when results are listed as contributions)
colemanw [Tue, 11 Apr 2017 15:31:16 +0000 (11:31 -0400)]
Merge pull request #10142 from JMAConsulting/IIDA-58
CRM-20022 Minor fix to change group by label
Edsel [Thu, 16 Feb 2017 10:20:41 +0000 (15:50 +0530)]
CRM-8526 Added contribution tokens to list
----------------------------------------
* CRM-8526: Support [contribution.custom_nn] tokens in templates
https://issues.civicrm.org/jira/browse/CRM-8526
CRM-8526 Added support for contribution tokens in find contributions search results
Edsel [Tue, 11 Apr 2017 12:58:35 +0000 (18:28 +0530)]
CRM-20022 Minor fix to change group by label
----------------------------------------
* CRM-20022: Add Batch Title to Columns, Grouping tabs on Contribution Summary report
https://issues.civicrm.org/jira/browse/CRM-20022
Pradeep Nayak [Fri, 7 Apr 2017 20:16:47 +0000 (01:46 +0530)]
CRM-20392, Code cleanup
----------------------------------------
* CRM-20392: Credit card payment not recorded when contribution is partially paid
https://issues.civicrm.org/jira/browse/CRM-20392
Edsel [Tue, 11 Apr 2017 08:47:42 +0000 (14:17 +0530)]
CRM-20391 Added card number to search
----------------------------------------
* CRM-20391: Add card number field on search form
https://issues.civicrm.org/jira/browse/CRM-20391
Eileen McNaughton [Tue, 11 Apr 2017 10:37:35 +0000 (22:37 +1200)]
Merge pull request #10138 from totten/master-hook-fix
CRM-19813 - Only dispatch through EventDispatcher after booting
Seamus Lee [Tue, 11 Apr 2017 09:06:47 +0000 (19:06 +1000)]
Reformat hard code list as per suggestion from Tim
Monish Deb [Tue, 11 Apr 2017 09:03:04 +0000 (14:33 +0530)]
Merge pull request #10137 from eileenmcnaughton/iida2
Towards CRM-20392 fix receive_date to use date_picker
Seamus Lee [Tue, 11 Apr 2017 05:09:06 +0000 (15:09 +1000)]
Switch to API calls and hard code execption list
Seamus Lee [Tue, 11 Apr 2017 01:32:11 +0000 (11:32 +1000)]
Minor code cleanup
Minor fix
Seamus Lee [Tue, 11 Apr 2017 00:43:44 +0000 (10:43 +1000)]
CRM-20410 Reformat CRM_SMS_BAO_Provider to use standard create function style rather than the split
Fix posthook
Eileen McNaughton [Tue, 11 Apr 2017 08:53:00 +0000 (20:53 +1200)]
Merge pull request #10136 from eileenmcnaughton/iida
Towards CRM-20392 (IIDA-108), code cleanup, removed cruft code
Tim Otten [Tue, 11 Apr 2017 08:00:32 +0000 (01:00 -0700)]
CRM-19813 - Only dispatch through EventDispatcher after booting
After merging #9949, some screens (like the contact-result list or "View
Contact") reported warnings like:
```
Notice: Undefined index: in CRM_Core_BAO_Country::countryLimit() (line 90 of /home/foo/buildkit/build/dmaster/sites/all/modules/civicrm/CRM/Core/BAO/Country.php).
Notice: Undefined index: in CRM_Core_BAO_Country::provinceLimit() (line 62 of /home/foo/buildkit/build/dmaster/sites/all/modules/civicrm/CRM/Core/BAO/Country.php).
```
Bisecting the git history revealed that it stemmed from switching
`hook_civicrm_entityTypes` to go through EventDispatcher.
https://github.com/civicrm/civicrm-core/pull/9949/commits/
fb1d9ad2f5116245ba3488a26f8e0b065f328006#diff-8869a8f3c6318eb0580ce2aa04b713bfL1835
This hook is apparently similar to `hook_civicrm_container` in that both
fires pre-boot. If we attempt to dispatch it through the container in a
pre-boot environment, something initializes incorrectly.
This change proposes a general rule:
* If you fire a hook before the container or EventDispatcher is available...
* Then don't try to use the container or EventDispatcher.
Pradeep Nayak [Mon, 3 Apr 2017 22:16:45 +0000 (10:16 +1200)]
Towards CRM-20392 (IIDA-108), code cleanup, removed cruft code
eileen [Tue, 11 Apr 2017 06:24:15 +0000 (18:24 +1200)]
Towards CRM-20392 fix receive_date to use date_picker
This might not have been necessary in the end - https://github.com/civicrm/civicrm-packages/pull/178
seems like the fix for the breakage, but we should be making this change on
every form we touch in order to get rid of code complexity.
Eileen McNaughton [Tue, 11 Apr 2017 02:06:25 +0000 (14:06 +1200)]
Merge pull request #9949 from totten/master-hook-ev2
CRM-19813 - Unify Symfony Events and hooks
Eileen McNaughton [Tue, 11 Apr 2017 00:45:47 +0000 (12:45 +1200)]
Merge pull request #9796 from seamuslee001/CRM-19961
CRM-19961 Make civicrm_sms_provider able to be domain specific
Eileen McNaughton [Mon, 10 Apr 2017 23:58:24 +0000 (11:58 +1200)]
Merge pull request #10132 from seamuslee001/CRM-20402
CRM-20402 Improve handling of spam bounces that get classified as syntax bounces
Seamus Lee [Mon, 10 Apr 2017 22:08:17 +0000 (08:08 +1000)]
CRM-19961 Add in tests to prove logic and fix logic
remove changes to update function
Fix style
Seamus Lee [Sun, 9 Apr 2017 06:47:21 +0000 (16:47 +1000)]
Add in Upgrade script for CRM-20402
Greg Rundlett [Fri, 3 Feb 2017 13:56:33 +0000 (08:56 -0500)]
improve "spam" pattern match for bounces which otherwise get classified as syntax bounces
Seamus Lee [Fri, 3 Feb 2017 05:37:13 +0000 (16:37 +1100)]
Add in Domain id handling into SMS provider BAO
Add in domain id filtering to delete function
CRM-19961 Treat NULL domain_id values as ok when retriving SMS providers
Ensure domain id only gets set if its not already set
Treat NULL domain_id as valid and also allow for any domain to delete providers that have domain_id which is NULL
Add in API default for domain_id for sms provider
Use value from database if provided even if null otherwise fall back to current domain as default but use the value submitted first
Fix null test on update
Eileen McNaughton [Mon, 10 Apr 2017 20:08:58 +0000 (08:08 +1200)]
Merge pull request #10080 from agileware/CRM-20360
CRM-20360: Remove superfluous showing of payment options header on pa…
Eileen McNaughton [Mon, 10 Apr 2017 20:02:30 +0000 (08:02 +1200)]
Merge pull request #10114 from JMAConsulting/CRM-20385
CRM-20385 (IIDA-72), fixed deferred revenue account validation
colemanw [Mon, 10 Apr 2017 14:49:12 +0000 (10:49 -0400)]
Merge pull request #10128 from JMAConsulting/CRM-20400
CRM-20400, fixed payment receipt
colemanw [Sat, 8 Apr 2017 19:38:46 +0000 (15:38 -0400)]
Merge pull request #10131 from colemanw/CRM-20367
CRM-20367 - Allow addIndex $column to be an array
Coleman Watts [Sat, 8 Apr 2017 02:52:00 +0000 (22:52 -0400)]
CRM-20367 - Allow addIndex $column to be an array
colemanw [Fri, 7 Apr 2017 23:37:44 +0000 (19:37 -0400)]
Merge pull request #10123 from colemanw/CRM-16633
CRM-16633 - Allow user to change case subject
Pradeep Nayak [Fri, 7 Apr 2017 22:48:22 +0000 (04:18 +0530)]
CRM-20400, Updated completed Text, Added upgrade code
----------------------------------------
* CRM-20400: Update the Payment Receipt to use for Contribution pyament
https://issues.civicrm.org/jira/browse/CRM-20400
Pradeep Nayak [Fri, 7 Apr 2017 19:47:45 +0000 (01:17 +0530)]
CRM-20400, fixed payment receipt
----------------------------------------
* CRM-20400: Update the Payment Receipt to use for Contribution pyament
https://issues.civicrm.org/jira/browse/CRM-20400
Romain Thouvenin [Fri, 7 Apr 2017 15:30:25 +0000 (17:30 +0200)]
CRM-20389 ignore mailing_type when cloning
Pradeep Nayak [Tue, 21 Feb 2017 13:19:53 +0000 (18:49 +0530)]
CRM-20385 : IIDA-72 oversensitive deferred revenue account validation
Monish Deb [Fri, 7 Apr 2017 07:18:53 +0000 (12:48 +0530)]
Merge pull request #9773 from monishdeb/CRM-19663
CRM-19663: A scheduled reminder set to use an absolute date does not allow repeats
Coleman Watts [Thu, 6 Apr 2017 18:14:06 +0000 (14:14 -0400)]
CRM-16633 - Allow user to change case subject
Coleman Watts [Thu, 6 Apr 2017 18:12:55 +0000 (14:12 -0400)]
CRM-16633 - Return data with crmEditable formSuccess event
Coleman Watts [Thu, 6 Apr 2017 18:12:13 +0000 (14:12 -0400)]
Fix script loading race condition
Monish Deb [Thu, 6 Apr 2017 12:23:33 +0000 (17:53 +0530)]
Merge pull request #10113 from JMAConsulting/IIDA-116
IIDA-116 Refactored Deferred Revenue report to follow more standardized approach.
Edsel [Thu, 6 Apr 2017 10:30:03 +0000 (16:00 +0530)]
IIDA-116 Fixed batch labels
Edsel [Fri, 17 Mar 2017 11:55:26 +0000 (17:25 +0530)]
IIDA-116 Added extra columns and made existing columns selectable
Conflicts:
CRM/Report/Form/Contribute/DeferredRevenue.php
Conflicts:
CRM/Report/Form/Contribute/DeferredRevenue.php
IIDA-116 Indentation for better readability
IIDA-116 Refactored deferred revenue report
Conflicts:
CRM/Report/Form/Contribute/DeferredRevenue.php
Conflicts:
CRM/Report/Form/Contribute/DeferredRevenue.php
IIDA-119 Used API rather than query
Conflicts:
CRM/Financial/BAO/FinancialAccount.php
IIDA-116 Added Revenue Recognition date toggle filter
IIDA-116 Added hotlinks
IIDA-116 Fixed jenkins errors
Eileen McNaughton [Thu, 6 Apr 2017 10:25:21 +0000 (22:25 +1200)]
Merge pull request #10122 from seamuslee001/CRM-20308
CRM-20308 CRM-19657 Toward CRM-20308 & support CRM-19657 Extract using domain from and lo…
Seamus Lee [Thu, 6 Apr 2017 08:56:23 +0000 (18:56 +1000)]
Toward CRM-20308 & support CRM-19657 Extract using domain from and logged in user from email details into separate function for re-use
Monish Deb [Thu, 6 Apr 2017 07:17:29 +0000 (12:47 +0530)]
Merge pull request #10028 from jitendrapurohit/is_public_group_fix
CRM-20318: Add is_public setting on Custom groups
Eileen McNaughton [Thu, 6 Apr 2017 06:07:08 +0000 (18:07 +1200)]
Merge pull request #10120 from seamuslee001/CRM-19741
CRM-19741 Add back in fix and add in unit tests to lock in fix
Jitendra Purohit [Thu, 6 Apr 2017 04:45:26 +0000 (10:15 +0530)]
Fix additional issues
Seamus Lee [Thu, 6 Apr 2017 00:58:29 +0000 (10:58 +1000)]
CRM-19741 Add back in fix and add in unit tests to lock in fix
Eileen McNaughton [Thu, 6 Apr 2017 01:13:40 +0000 (13:13 +1200)]
Merge pull request #10084 from jitendrapurohit/CRM-19243
CRM-19243: Free membership results in two email receipts
Eileen McNaughton [Thu, 6 Apr 2017 00:24:53 +0000 (12:24 +1200)]
Merge pull request #10116 from colemanw/CRM-20390
CRM-20390 - Fix select2 data type mismatch
Eileen McNaughton [Thu, 6 Apr 2017 00:02:15 +0000 (12:02 +1200)]
Merge pull request #10119 from eileenmcnaughton/deprecated
Add deprecation comments, CRM-19987
Eileen McNaughton [Wed, 5 Apr 2017 23:44:45 +0000 (11:44 +1200)]
Merge pull request #10021 from jitendrapurohit/CRM-20246
CRM-20246: maxfilesize on import should respect 0 as meaning 'no limit'
Eileen McNaughton [Wed, 5 Apr 2017 23:39:39 +0000 (11:39 +1200)]
Merge pull request #10093 from jitendrapurohit/CRM-20343
CRM-20343: skip status calculation when form dates are not modified.
Eileen McNaughton [Wed, 5 Apr 2017 23:16:22 +0000 (11:16 +1200)]
Merge pull request #9276 from seamuslee001/CRM-19517
CRM-19517 allow price fields that use disabled financial types to sho…
eileen [Wed, 5 Apr 2017 23:05:48 +0000 (11:05 +1200)]
Add deprecation comments, CRM-19987
Eileen McNaughton [Wed, 5 Apr 2017 22:15:59 +0000 (10:15 +1200)]
Merge pull request #10095 from mattwire/membership_force_auto_renew
CRM-20375: Show message instead of checkbox when renew required. Hide checkbox w…
Tim Otten [Wed, 5 Apr 2017 21:59:49 +0000 (14:59 -0700)]
Merge pull request #10118 from civicrm/4.7.18-rc
4.7.18 rc
Eileen McNaughton [Wed, 5 Apr 2017 21:37:17 +0000 (09:37 +1200)]
Merge pull request #10096 from jmcclelland/CRM-20376
Crm 20376 - Fix field names on PDF/Print vesion of survey report
Eileen McNaughton [Wed, 5 Apr 2017 21:36:13 +0000 (09:36 +1200)]
Merge pull request #9916 from JMAConsulting/CRM-20207
CRM-20207 Added invocation for selectWhereClause hook in activity SQL
projects / civicrm-core.git / log