-
-
Notifications
You must be signed in to change notification settings - Fork 117
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
[14.0] [FIX] Fixes in hr_payslip defaults and typo errors, more #27
Conversation
Put them as demo data? |
@pedrobaeza They are already in demo data, i removed them from production data because like i said, i dont see the point of populating a production database. Most of my users get confused and it really don't help because every country has they own rules for payroll. I can add them as demo data if you want, but there is a lot of demo data already loaded in demo. |
It's OK for me then. Please check pre-commit. cc @AntoniRomera @apps2grow |
@pedrobaeza pre-commit ready. |
Okay so i added this to the demo data because the data is required for tests. |
Thank you @nimarosa for these improvements. I confirm that the demo data is installing correctly on demo, and not installed when not using demo. This change might require a migration script for existing instances, so it is good that the default branch is still 13.0. Feel free to add yourself as a maintainer. Just add a new commit to this PR. I am not really into testing, but in general I think it is good to write tests. |
@appstogrow mantainer key added |
@appstogrow Yes i don't write tests either. Maybe when we do more improvements we can write some. For now i think this is ready to merge if you want. |
@nimarosa In the OCA, one PR cannot have changes in more than one module. So in this PR you can only add yourself as a maintainer for the payroll module. |
Could you also try to squash the commits together into one commit? |
@appstogrow i've removed the mantainer key in payroll_account (will add later in another commit to this module). And also do the squash. Please tell me if it's okay because i don't often rebase branches so i might be wrong in the process. Hope everything it's okay to merge now. |
@nimarosa Yes I can see that the maintainer key is fixed. 👍 |
author nicolasrsande <nicolasrsande@gmail.com> 1643135061 -0300 committer nicolasrsande <nicolasrsande@gmail.com> 1643668459 -0300 fix typo in leave calculation default for worked days should not compute leaves, because leaves are calculated separately we should not add data because it interfers with custom localization payroll modules fix pre-commit add demo data so the test can be executed leaves should be computed in negative value to help creating salary rules Add mantainer key remove mantainer in payroll_account 14.0-minor-fixes fix typo in leave calculation we should not add data because it interfers with custom localization payroll modules fix pre-commit add demo data so the test can be executed leaves should be computed in negative value to help creating salary rules Add mantainer key remove mantainer in payroll_account 14.0-payroll-minor-fixes
8505084
to
c1729a1
Compare
@appstogrow I think it's ready now. I see only one commit. |
👍 |
When can we merge this? |
@pedrobaeza Would you like to merge this PR? |
/ocabot merge minor |
This PR looks fantastic, let's merge it! |
Congratulations, your PR was merged at b465b99. Thanks a lot for contributing to OCA. ❤️ |
Hello, here i have some minor fixes that we are dragging from previus versions:
TODO: Also maybe we need to express the leaves as a negative number, i will update this PR with that.
I will add more minor fixes to this PR and i hope it can be merged this time... Payroll development for odoo has been abandoned for a long time and i hope we can continue developing this module.
If you need maintainers i want to help. I'm actively developing payroll addons for my country and i have a lot of custom fixes and extra modules we could add to this repo.
Please let me know if you need me to adjust anything in the PR for this to be merged.