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.

Sign up for GitHub

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

Jump to bottom

[17.0][FW] payroll: ported 111, 117, 119, 151 #180

Merged
merged 14 commits into from
Jan 6, 2025
Merged

[17.0][FW] payroll: ported 111, 117, 119, 151 #180

merged 14 commits into from
Jan 6, 2025

Conversation

dreispt
Copy link
Member

@dreispt dreispt commented Jan 5, 2025 •
edited
Loading

Supersedes #159

nimarosa and others added 14 commits January 5, 2025 21:31
@nimarosa @dreispt
[14.0] [IMP] payroll: Add sum_category payslips browsable method
f326393
@nimarosa @dreispt
[14.0] [IMP] payroll: Add datetime to tools object
626f142
@nimarosa @dreispt
[14.0] [IMP] payroll: Add "category_max" and "rule_max" method
1f6c083
@nimarosa @dreispt
[14.0] [IMP] payroll: Add "category_max" and "rule_max" method
b53ae4e
@nimarosa @dreispt
[14.0] [IMP] payroll: Add "min_category" and "min_rule" method
a95de79
@nimarosa @dreispt
[14.0] [IMP] payroll: Add "average_category" and "average_rule"
2ee8bd7
@nimarosa @dreispt
[14.0] [IMP] payroll: Rename sum() to sum_rule() and add deprecation …
94c6ed7 
…warning
@nimarosa @dreispt
[14.0] [IMP] payroll: Add min/max/average monthly methods
cee7695
@nimarosa @dreispt
[14.0] [IMP] payroll: Add group to controls buttons
32487a7
@norlinhenrik @dreispt
[IMP] payroll: salary rule code: payslip.line_sum_where()
cb3982b
@norlinhenrik @dreispt
[IMP] payroll: localdict rule.code or rule.id; test line_sum_where()
a2c0ad4
@ivancandelas @dreispt
[FIX] payroll: show code field on hr.leave.type view
3c0092a
@kasado @dreispt
[FIX] Payslip item name in user interface language.
554225b
@dreispt
[FIX] payroll: lint fixes
9abe7e1
@OCA-git-bot
Copy link
Contributor

Hi @appstogrow, @nimarosa,
some modules you are maintaining are being modified, check this out!

@nimarosa nimarosa mentioned this pull request Jan 6, 2025
Closed
@nimarosa
Copy link
Contributor

nimarosa commented Jan 6, 2025

Merging.

@dreispt can you port this to 18 too? So we work in an updated module.

I think there are other PRs in 14 that need to be ported too.

Thanks .

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 17.0-ocabot-merge-pr-180-by-nimarosa-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit cbca692 into OCA:17.0 Jan 6, 2025
5 of 7 checks passed
@OCA-git-bot
Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merged 🎉
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@dreispt @OCA-git-bot @nimarosa @norlinhenrik @ivancandelas @kasado