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

[ADD] budget by account #259

Merged

Conversation

sbidoul
Copy link
Member

@sbidoul sbidoul commented Feb 16, 2020

This introduces a new data source: MIS Budget by Account, next to the existing MIS Budget by KPI.

This essentially includes OCA/mis-builder-contrib#3 in mis_builder_budget with the subtle but important difference that budget items now cover a period instead of a single date. A pro-rata temporis adjustement is made on the budget items to correspond to the reporting periods.

Common parts between MIS Budgets by KPI and Account are moved to abstract base classes.

This PR includes refactorings from [ ] #258. The last 3 commits are relevant here:

  • add the mis.budget.by.account and mis.budget.by.account.item models, and instroduce the abstract base classes
  • add the prorata.read_group.mixin model that does the pro-rata-temporis adjustments in read_group and emulate a searchable date field based on date_from and date_to.
  • add the new MIS data source

I leave as a future improvement the capability to mix budgets by KPI and by account.

@sbidoul sbidoul force-pushed the 10.0-mis-budget-by-account-sbi branch from 0348d06 to 3dc7cb5 Compare February 21, 2020 15:45
@sbidoul sbidoul mentioned this pull request Feb 21, 2020
5 tasks
Copy link
Member

@fclementic2c fclementic2c left a comment

Choose a reason for hiding this comment

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

functional test ok

@sbidoul
Copy link
Member Author

sbidoul commented Mar 9, 2020

Merging into the 3.6 staging branch. People interested to test further can do so in #254

/ocabot merge

Thanks for testing, @fclementic2c

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 10.0-3.6-staging-ocabot-merge-pr-259-by-sbidoul-bump-no, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Mar 9, 2020
Signed-off-by sbidoul
@OCA-git-bot
Copy link
Contributor

It looks like something changed on 10.0-3.6-staging in the meantime.
Let me try again (no action is required from you).
Prepared branch 10.0-3.6-staging-ocabot-merge-pr-259-by-sbidoul-bump-no, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 80e0a18 into OCA:10.0-3.6-staging Mar 9, 2020
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at cb60ce5. Thanks a lot for contributing to OCA. ❤️

sbidoul added a commit that referenced this pull request Mar 9, 2020
@sbidoul sbidoul deleted the 10.0-mis-budget-by-account-sbi branch March 12, 2020 14:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants