Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CRM-20385 (IIDA-72), fixed deferred revenue account validation #10114

Merged
merged 1 commit into from
Apr 10, 2017

Conversation

pradpnayak
Copy link
Contributor

@pradpnayak pradpnayak commented Apr 5, 2017

@@ -193,8 +193,7 @@ public static function add(&$params, $ids = array()) {
$params['prevContribution'] = self::getOriginalContribution($contributionID);
}

// CRM-16189
CRM_Financial_BAO_FinancialAccount::checkFinancialTypeHasDeferred($params, $contributionID);
CRM_Core_BAO_FinancialTrxn::generateRevenueRecognitionDate($params, $contributionID);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pradpnayak I encountered a fatal error while doing backoffice contribution.

PHP Fatal error:  Call to undefined method CRM_Core_BAO_FinancialTrxn::generateRevenueRecognitionDate() in /Users/monish/src/civicrm/CRM/Contribute/BAO/Contribution.php on line 196

didn't find any definition of it in core or is there any other dependent PR for this?

@monishdeb
Copy link
Member

@pradpnayak I have made some additional fixes 0adcec2

Apart from that there is only issue I have reported on the PR, please have a look

@pradpnayak pradpnayak changed the title IIDA-72, fixed deferred revenue account validation CRM-20385 (IIDA-72), fixed deferred revenue account validation Apr 7, 2017
@pradpnayak
Copy link
Contributor Author

@monishdeb i have fixed the Fatal error and also modified your changes to remove extra condition.
I have also squashed the commit.

@monishdeb
Copy link
Member

Thanks @pradpnayak, will test the final patch.

@monishdeb
Copy link
Member

@pradpnayak the changes look good, however found a test failure due to change in validation message. Fixed it here https://github.com/civicrm/civicrm-core/pull/10114/files#diff-90c98c96619663881a4653ce51481efbR334

@eileenmcnaughton I have tested the PR and commented my feedback here https://issues.civicrm.org/jira/browse/CRM-20385?focusedCommentId=102208&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-102208 , can you merge it if the final change looks good to ya ?

@colemanw
Copy link
Member

@eileenmcnaughton can you review this please?

@eileenmcnaughton
Copy link
Contributor

Yeah this looks like a code simplicification & the review notes from Monish & issue description from pradeep seem clear - merging

@eileenmcnaughton eileenmcnaughton merged commit 276bd3b into civicrm:master Apr 10, 2017
@monishdeb monishdeb deleted the CRM-20385 branch April 11, 2017 03:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants