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

dev/financial#6 Do not include template contributions in reports #20450

Merged
merged 1 commit into from
Jun 30, 2021

Conversation

jaapjansma
Copy link
Contributor

Overview

This PR is part of the work done for https://lab.civicrm.org/dev/financial/-/issues/6
and this part is to exclude template contributions from reports.

Template contributions are part of the recurring contribution and are used to generate followup contributions.

Other PR's will follow soon which will include to creation of the template contribution.

Before

If a contribution with is_template = 1 existed in the database those will popup in various reports.

After

If a contribution with is_template = 1 existed in the database those will not popup in various reports anymore.

Technical Details

I also changed a unit test so that it includes a template contribution and checks whether the template contribution is not counted.

Comments

See https://lab.civicrm.org/dev/financial/-/issues/6
And https://lab.civicrm.org/dev/core/-/issues/2624

@civibot
Copy link

civibot bot commented May 31, 2021

(Standard links)

@civibot civibot bot added the master label May 31, 2021
@mattwire
Copy link
Contributor

@jaapjansma Test failures relate:

Test Result (2 failures / -12)
api_v3_ReportTemplateTest.testLybuntReportWithFYData
api_v3_ReportTemplateTest.testContributionSummaryDateFields

@jaapjansma jaapjansma force-pushed the dev_financials_6_reports branch from 4990584 to 9f108b4 Compare June 30, 2021 11:30
@jaapjansma
Copy link
Contributor Author

@mattwire I have fixed the related test failures and squashed the commits.

@mattwire mattwire merged commit e7c8542 into civicrm:master Jun 30, 2021
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.

2 participants