CRM-21587, Notice error for Grant date fields #11497
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
pradpnayak
commented
Jan 9, 2018
•
pradpnayak
commented
- CRM-21587: Notice error for grant date fields
|
Jenkins re test this please |
|
Code looks good - can you squash to one commit. Per #11445 this appears to have been reviewed & just needs to have a quick UI test on import / export. I think this is pretty low risk & am happy to accept that test being done by another dev @ JMA & to merge once that is confirmed |
---------------------------------------- * CRM-21587: Notice error for grant date fields https://issues.civicrm.org/jira/browse/CRM-21587
---------------------------------------- * CRM-21587: Notice error for grant date fields https://issues.civicrm.org/jira/browse/CRM-21587
---------------------------------------- * CRM-21587: Notice error for grant date fields https://issues.civicrm.org/jira/browse/CRM-21587
---------------------------------------- * CRM-21587: Notice error for grant date fields https://issues.civicrm.org/jira/browse/CRM-21587
|
Jenkins re test this please |
|
I just did a quick export test - no noticeable change so am merging. (using squash which doesn't give as good a history as if the submitter squashes but letting that slip ) |
magnolia61
pushed a commit
to magnolia61/civicrm-core
that referenced
this pull request
Jan 22, 2018
* CRM-21587, fixed code to add formattype for date field ---------------------------------------- * CRM-21587: Notice error for grant date fields https://issues.civicrm.org/jira/browse/CRM-21587 * CRM-21587, removed cruft code ---------------------------------------- * CRM-21587: Notice error for grant date fields https://issues.civicrm.org/jira/browse/CRM-21587 * CRM-21587, generated DAO file ---------------------------------------- * CRM-21587: Notice error for grant date fields https://issues.civicrm.org/jira/browse/CRM-21587 * CRM-21587, removed cruft code ---------------------------------------- * CRM-21587: Notice error for grant date fields https://issues.civicrm.org/jira/browse/CRM-21587 * Standalone code contributor from now.
magnolia61
pushed a commit
to magnolia61/civicrm-core
that referenced
this pull request
Jan 26, 2018
* CRM-21587, fixed code to add formattype for date field ---------------------------------------- * CRM-21587: Notice error for grant date fields https://issues.civicrm.org/jira/browse/CRM-21587 * CRM-21587, removed cruft code ---------------------------------------- * CRM-21587: Notice error for grant date fields https://issues.civicrm.org/jira/browse/CRM-21587 * CRM-21587, generated DAO file ---------------------------------------- * CRM-21587: Notice error for grant date fields https://issues.civicrm.org/jira/browse/CRM-21587 * CRM-21587, removed cruft code ---------------------------------------- * CRM-21587: Notice error for grant date fields https://issues.civicrm.org/jira/browse/CRM-21587 * Standalone code contributor from now.
magnolia61
pushed a commit
to magnolia61/civicrm-core
that referenced
this pull request
Jan 26, 2018
…tus-of-linked-cases CRM-21498: Implement Option to Change Status of Linked Cases CRM-21609 - Correctly handle PayPalPro recurring payments whose amount doesn't match the initial contribution CRM-21627: makeMultilingual: update dbLocale to avoid fatal if lcMessages was not set. CRM-21627: makeMultilingual: update dbLocale to avoid fatal if lcMessages was not set (adds unit-test fix by Monish Deb) CRM-21644, Fixed set default for Preferred Communication Method ---------------------------------------- * CRM-21644: Preferred Communication Method is not set to default for contact https://issues.civicrm.org/jira/browse/CRM-21644 CRM-21591 Add Test of formatUnitSize Function CRM-21591 Fix PHP Notice A non well formed numeric value encountered on Misc settings page PHP Notice: A non well formed numeric value encountered CRM-21647 - Fatal error on deleting any contribution record CRM-21635 - Expose contact custom data on contribution summary report CRM-21629 System Check: Set User Agent to security filters accept check CRM-21621 - Provide ability to delete first website field CRM-21652: Fix numerous problems with anonymous users registering themselves CRM-21528 fix add2Group CRM-21225 Allow for display profile alternate - schema changes only Rename column to be frontend_title Deduplicate from email address code and add a setting to disable sending from contact email addresses Fix for 'from email' showing twice on Thankyou-receipts form Update help paths Only include email address on contribution pdf task. Make sure we pass through from_email_address when non-default selected Further fix for email address missing on contribution thank-you letters CRM-19107 Fixed PayPal Express redirection issue. corrected syntax Standalone code contributor from now. CRM-17352 - Use Backbone.noConflict CRM-17352 - Use CiviCRM to load scripts for consistency CRM-17352 fix display of modal on drupal8 (civicrm#5) Remove restriction on 'Update Subscription' when a recurring contribution has a linked membership CRM-21533 : Outbound setting reverts in non-production sites on executing sched job Fix for CRM-21485 - Tax not added when renewing membership in backend Added code as suggested by @jitendrapurohit Removed changes of First commit Blank line removed CRM-18048 - long custom group names cause report failure Ensure custom group names are never a length that can cause this problem. Also, update test infrastructure to prevent this problem from being masked. CRM-21521: fix nested multipart handling When for example a multipart-report email body's first part is multipart-related, extract the text correctly instead of crashing. This logic should handle all kinds of weird multipart nesting, up to MIME_MAX_RECURSION levels deep. CRM-21159 Address fields cause DB errors when adding contacts to group from Search Builder Code refactor CRM-21652: Without using 'finally' clause CRM-15049: Fixed include/exclude search for parent groups (civicrm#10546) * CRM-15049: Fixed include/exclude search for parent groups * Fixed the style errors * CRM-15049: update comment CRM-21587, Notice error for Grant date fields (civicrm#11497) * CRM-21587, fixed code to add formattype for date field ---------------------------------------- * CRM-21587: Notice error for grant date fields https://issues.civicrm.org/jira/browse/CRM-21587 * CRM-21587, removed cruft code ---------------------------------------- * CRM-21587: Notice error for grant date fields https://issues.civicrm.org/jira/browse/CRM-21587 * CRM-21587, generated DAO file ---------------------------------------- * CRM-21587: Notice error for grant date fields https://issues.civicrm.org/jira/browse/CRM-21587 * CRM-21587, removed cruft code ---------------------------------------- * CRM-21587: Notice error for grant date fields https://issues.civicrm.org/jira/browse/CRM-21587 * Standalone code contributor from now. call hooks even if joomla isn't bootstraped CRM-21225 Changes to UI to implement the frontend_title field to allow for overriding of the Profile title fix CRM-21444: use contact_type name instead of label CRM-21663: Fix Campaign Search and result structure CRM-21613: Search issues on 'Manage Tag' page additional fixes Modified--getting currencies from civicrm_currency table instead being hard-coded. CRM-21664 CRM-21634 Stdise search fields as they relate to contacts CRM-21323 : Fix backend credit card payment processor selection CRM-21155 - Hook batchItems does not change the csv export Change to use results of hook when exporting. Fix CRM-21155 by removing batchItems entirely Consistent wording of Email - Send Now task CRM-21670 - Search of active relationships does not appear on Relationship Report https://issues.civicrm.org/jira/browse/CRM-21670 CRM-21651 - Activity_Email/SMS_Add - Fix loading failed when no contact is found Add test for DB error on search add to group CRM-21159 I've also removed an unused parameter & a couple of require_once calls CRM-21667: Fixed timezone handoff from Drupal6. CRM-21672 fix intra-rc regression, fatal when deleting participants Change-Id: Iccbd17d53f07a93c74ce46e9539d1768019a2532 CRM-21656: Backend Membership with Priceset applies taxes twice to line_item CRM-17647 improve testing on the thousand separator. As part of fixing thousand separator issues we can use the deprecated flag to identify when the BAO_Contribution::create is called without skip_clean_money as we want to move all cleaning to close to submit. First, however, we need to stop calling that function directly in the test suite (or only call with skip_clean_money if we are specifically testing it). Am checking how jenkins likes this format (which was no good on 5.3) & will change others if cheerful Fix mock test data for PaymentProcessor object. This only affects unit tests. When dummy data is generated for a PaymentProcessor it will be more usable CRM-17647 test fixes towards ensuring we never rely on the BAO to clean money. We need to deprecate out BAO cleaning of money. Test fixes ensure we use the (safe) api rather than BAO::create - no functional change Minor api tidy up. It is recommended practice to pass the entity to the api. This minor fix up supports that CRM-21260: CiviMail compose UI very slow to initialize, CRM-21316: Simplify getRecipients fn test failure fix avoid recipient rebuild on preview,sendTest and simple save CRM-14834 - fix activity export when relationship in export fields CRM-21423 test that emails are exported for multiple types I was thinking this might fail but it is passing so let's lock it in caller Add recurring contribution link to membership and contribution detail CRM-17647 fix for currency on batch entry CRM-17647 test fixes to avoid calling Contribution::create without skipCleanMoney Fix template variable for contribution_recur_id CRM-20707 include start/end dates when updating membership CRM-21684 contact subtype fields prevent inclusion in profile/receipt email Add API parameter for fix_address Defaults to true, but lets you skip address fixes if desired. EXT-56 - dm_install_cvext - Add helper for including extensions EXT-56 - Add com.iatspayments.civicrm to tarballs Add abstract core Task class Convert Event to use core Task class Fix docblock type definitions CRM-21683 Standardise filter in mailing summary report CRM-21623 - Smart Group Relative Date not saving for some fields in Advance Search CRM-21540 - Add support for auto-complete fields in the batch entry forms Disable sending email receipt from logged in contact ID / activity source contact Use fontawesome check for membership auto-renew status and add exclamation for auto-renew but error (eg. subscription cancelled). Fix typo (very recent) CRM-21660 Remove use of deprecated function on mapping_type CRM-21071 - Simplify event location form to not use ajax This form does not do anything dynamic so ajax was unnecessarily complex. CRM-21071 fix form to hold id before callling (nasty) block:create CRM-17647 fix for submitting payment with thousand separator CRM-17647 membership form fix for thousand processing error. CRM-21698 move formatting to processor class. This moves the fix for CRM-16460 to the processor class, providing a helper function. The fix put number formatting deep into the BAO - when they don't work right (depending on presence of money_format function I think) negative amounts become 0 Test fixes, towards CRM-17647 Test fixes towards never calling Contribution::Create without skipCleanMoney CRM-21701 - ensure street addresses are parsed Even if USPS street parsing is disabled. CRM-21334: Replace direct SQL query with BAO save call (to trigger hooks) Api4 - Update entity directory CRM-21687 fix issue with MariaDB 10.2 logging query writing due to current_timestamp and timestamp getting () added on the end in Maria10.2 CRM-16421 - composer.json - Include civicrm-setup library ---------------------------------------- * CRM-16421: Work to get CiviCRM for WordPress in WordPress' official Repository https://issues.civicrm.org/jira/browse/CRM-16421 CRM-16421 - gitignore - Ignore the flag-file for civicrm-setup ---------------------------------------- * CRM-16421: Work to get CiviCRM for WordPress in WordPress' official Repository https://issues.civicrm.org/jira/browse/CRM-16421 CRM-16421 - distmaker - Generate civicrm-*-wporg.zip Minor api clean up. Increase places where entity passed to 'basic_create' CRM-21256 Improve performance of payment processor load CRM-21524 - CRM\Export - Fix merge contacts when deceased
magnolia61
pushed a commit
to magnolia61/civicrm-core
that referenced
this pull request
Jan 26, 2018
…t doesn't match the initial contribution CRM-21627: makeMultilingual: update dbLocale to avoid fatal if lcMessages was not set. CRM-21627: makeMultilingual: update dbLocale to avoid fatal if lcMessages was not set (adds unit-test fix by Monish Deb) CRM-21644, Fixed set default for Preferred Communication Method ---------------------------------------- * CRM-21644: Preferred Communication Method is not set to default for contact https://issues.civicrm.org/jira/browse/CRM-21644 CRM-21591 Add Test of formatUnitSize Function CRM-21591 Fix PHP Notice A non well formed numeric value encountered on Misc settings page PHP Notice: A non well formed numeric value encountered CRM-21647 - Fatal error on deleting any contribution record CRM-21635 - Expose contact custom data on contribution summary report CRM-21629 System Check: Set User Agent to security filters accept check CRM-21621 - Provide ability to delete first website field CRM-21652: Fix numerous problems with anonymous users registering themselves CRM-21528 fix add2Group CRM-21225 Allow for display profile alternate - schema changes only Rename column to be frontend_title Deduplicate from email address code and add a setting to disable sending from contact email addresses Fix for 'from email' showing twice on Thankyou-receipts form Update help paths Only include email address on contribution pdf task. Make sure we pass through from_email_address when non-default selected Further fix for email address missing on contribution thank-you letters CRM-19107 Fixed PayPal Express redirection issue. corrected syntax Standalone code contributor from now. CRM-17352 - Use Backbone.noConflict CRM-17352 - Use CiviCRM to load scripts for consistency CRM-17352 fix display of modal on drupal8 (civicrm#5) Remove restriction on 'Update Subscription' when a recurring contribution has a linked membership CRM-21533 : Outbound setting reverts in non-production sites on executing sched job Fix for CRM-21485 - Tax not added when renewing membership in backend Added code as suggested by @jitendrapurohit Removed changes of First commit Blank line removed CRM-18048 - long custom group names cause report failure Ensure custom group names are never a length that can cause this problem. Also, update test infrastructure to prevent this problem from being masked. CRM-21521: fix nested multipart handling When for example a multipart-report email body's first part is multipart-related, extract the text correctly instead of crashing. This logic should handle all kinds of weird multipart nesting, up to MIME_MAX_RECURSION levels deep. CRM-21159 Address fields cause DB errors when adding contacts to group from Search Builder Code refactor CRM-21652: Without using 'finally' clause CRM-15049: Fixed include/exclude search for parent groups (civicrm#10546) * CRM-15049: Fixed include/exclude search for parent groups * Fixed the style errors * CRM-15049: update comment CRM-21587, Notice error for Grant date fields (civicrm#11497) * CRM-21587, fixed code to add formattype for date field ---------------------------------------- * CRM-21587: Notice error for grant date fields https://issues.civicrm.org/jira/browse/CRM-21587 * CRM-21587, removed cruft code ---------------------------------------- * CRM-21587: Notice error for grant date fields https://issues.civicrm.org/jira/browse/CRM-21587 * CRM-21587, generated DAO file ---------------------------------------- * CRM-21587: Notice error for grant date fields https://issues.civicrm.org/jira/browse/CRM-21587 * CRM-21587, removed cruft code ---------------------------------------- * CRM-21587: Notice error for grant date fields https://issues.civicrm.org/jira/browse/CRM-21587 * Standalone code contributor from now. call hooks even if joomla isn't bootstraped CRM-21225 Changes to UI to implement the frontend_title field to allow for overriding of the Profile title fix CRM-21444: use contact_type name instead of label CRM-21663: Fix Campaign Search and result structure CRM-21613: Search issues on 'Manage Tag' page additional fixes Modified--getting currencies from civicrm_currency table instead being hard-coded. CRM-21664 CRM-21634 Stdise search fields as they relate to contacts CRM-21323 : Fix backend credit card payment processor selection CRM-21155 - Hook batchItems does not change the csv export Change to use results of hook when exporting. Fix CRM-21155 by removing batchItems entirely Consistent wording of Email - Send Now task CRM-21670 - Search of active relationships does not appear on Relationship Report https://issues.civicrm.org/jira/browse/CRM-21670 CRM-21651 - Activity_Email/SMS_Add - Fix loading failed when no contact is found Add test for DB error on search add to group CRM-21159 I've also removed an unused parameter & a couple of require_once calls CRM-21667: Fixed timezone handoff from Drupal6. CRM-21672 fix intra-rc regression, fatal when deleting participants Change-Id: Iccbd17d53f07a93c74ce46e9539d1768019a2532 CRM-21656: Backend Membership with Priceset applies taxes twice to line_item CRM-17647 improve testing on the thousand separator. As part of fixing thousand separator issues we can use the deprecated flag to identify when the BAO_Contribution::create is called without skip_clean_money as we want to move all cleaning to close to submit. First, however, we need to stop calling that function directly in the test suite (or only call with skip_clean_money if we are specifically testing it). Am checking how jenkins likes this format (which was no good on 5.3) & will change others if cheerful Fix mock test data for PaymentProcessor object. This only affects unit tests. When dummy data is generated for a PaymentProcessor it will be more usable CRM-17647 test fixes towards ensuring we never rely on the BAO to clean money. We need to deprecate out BAO cleaning of money. Test fixes ensure we use the (safe) api rather than BAO::create - no functional change Minor api tidy up. It is recommended practice to pass the entity to the api. This minor fix up supports that CRM-21260: CiviMail compose UI very slow to initialize, CRM-21316: Simplify getRecipients fn test failure fix avoid recipient rebuild on preview,sendTest and simple save CRM-14834 - fix activity export when relationship in export fields CRM-21423 test that emails are exported for multiple types I was thinking this might fail but it is passing so let's lock it in caller Add recurring contribution link to membership and contribution detail additional fixes CRM-17647 fix for currency on batch entry CRM-17647 test fixes to avoid calling Contribution::create without skipCleanMoney Fix template variable for contribution_recur_id CRM-20707 include start/end dates when updating membership CRM-21684 contact subtype fields prevent inclusion in profile/receipt email Add API parameter for fix_address Defaults to true, but lets you skip address fixes if desired. EXT-56 - dm_install_cvext - Add helper for including extensions EXT-56 - Add com.iatspayments.civicrm to tarballs Add abstract core Task class Convert Event to use core Task class Fix docblock type definitions CRM-21683 Standardise filter in mailing summary report CRM-21623 - Smart Group Relative Date not saving for some fields in Advance Search CRM-21540 - Add support for auto-complete fields in the batch entry forms Disable sending email receipt from logged in contact ID / activity source contact Use fontawesome check for membership auto-renew status and add exclamation for auto-renew but error (eg. subscription cancelled). Fix typo (very recent) CRM-21660 Remove use of deprecated function on mapping_type CRM-21071 - Simplify event location form to not use ajax This form does not do anything dynamic so ajax was unnecessarily complex. CRM-21071 fix form to hold id before callling (nasty) block:create CRM-17647 fix for submitting payment with thousand separator CRM-17647 membership form fix for thousand processing error. CRM-21698 move formatting to processor class. This moves the fix for CRM-16460 to the processor class, providing a helper function. The fix put number formatting deep into the BAO - when they don't work right (depending on presence of money_format function I think) negative amounts become 0 Test fixes, towards CRM-17647 Test fixes towards never calling Contribution::Create without skipCleanMoney CRM-21701 - ensure street addresses are parsed Even if USPS street parsing is disabled. CRM-21334: Replace direct SQL query with BAO save call (to trigger hooks) Api4 - Update entity directory CRM-21687 fix issue with MariaDB 10.2 logging query writing due to current_timestamp and timestamp getting () added on the end in Maria10.2 CRM-16421 - composer.json - Include civicrm-setup library ---------------------------------------- * CRM-16421: Work to get CiviCRM for WordPress in WordPress' official Repository https://issues.civicrm.org/jira/browse/CRM-16421 CRM-16421 - gitignore - Ignore the flag-file for civicrm-setup ---------------------------------------- * CRM-16421: Work to get CiviCRM for WordPress in WordPress' official Repository https://issues.civicrm.org/jira/browse/CRM-16421 CRM-16421 - distmaker - Generate civicrm-*-wporg.zip Minor api clean up. Increase places where entity passed to 'basic_create' CRM-21256 Improve performance of payment processor load CRM-21524 - CRM\Export - Fix merge contacts when deceased
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.