[16.0][MIG] payroll #85
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hey @mtelahun, thank you for your Pull Request. It looks like some users haven't signed our Contributor License Agreement, yet.
Appreciation of efforts, |
|
/ocabot migration payroll |
mtelahun
force-pushed
the
16.0-mig-payroll
branch
from
5671ed2
to
940e447
Compare
|
@nimarosa @apps2grow Please review. It's ready now, including recent changes to 14.0 |
this commit renames the module from hr_payroll to payroll. This is to avoid conflicting with the hr_payroll module included in Odoo Enterprise
Also removes links to localisations which have not yet been migrated. These can be re-added when the localisations are ported.
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
accept suggestion use repr() on the string change indentation of error
Currently translated at 93.6% (266 of 284 strings) Translation: payroll-14.0/payroll-14.0-payroll Translate-URL: https://translation.odoo-community.org/projects/payroll-14-0/payroll-14-0-payroll/ca/
Currently translated at 100.0% (284 of 284 strings) Translation: payroll-14.0/payroll-14.0-payroll Translate-URL: https://translation.odoo-community.org/projects/payroll-14-0/payroll-14-0-payroll/ca/
Currently translated at 86.9% (247 of 284 strings) Translation: payroll-14.0/payroll-14.0-payroll Translate-URL: https://translation.odoo-community.org/projects/payroll-14-0/payroll-14-0-payroll/es_AR/
Currently translated at 100.0% (284 of 284 strings) Translation: payroll-14.0/payroll-14.0-payroll Translate-URL: https://translation.odoo-community.org/projects/payroll-14-0/payroll-14-0-payroll/es_AR/
Currently translated at 100.0% (284 of 284 strings) Translation: payroll-14.0/payroll-14.0-payroll Translate-URL: https://translation.odoo-community.org/projects/payroll-14-0/payroll-14-0-payroll/es_AR/
Currently translated at 100.0% (284 of 284 strings) Translation: payroll-14.0/payroll-14.0-payroll Translate-URL: https://translation.odoo-community.org/projects/payroll-14-0/payroll-14-0-payroll/es_AR/
Currently translated at 78.1% (222 of 284 strings) Translation: payroll-14.0/payroll-14.0-payroll Translate-URL: https://translation.odoo-community.org/projects/payroll-14-0/payroll-14-0-payroll/it/
[14.0] [IMP] payroll: change manifest category [14.0] [IMP] payroll: add migration for new payslip and payslips objects [14.0] [IMP] payroll: add migration for new payslip and payslips objects [14.0] [IMP] payroll: add migration for new payslip and payslips objects
[FIX] payroll: fix views
Currently translated at 100.0% (359 of 359 strings) Translation: payroll-14.0/payroll-14.0-payroll Translate-URL: https://translation.odoo-community.org/projects/payroll-14-0/payroll-14-0-payroll/es_AR/
mtelahun
force-pushed
the
16.0-mig-payroll
branch
from
2ae84e0
to
8e3cdb5
Compare
|
@nimarosa @apps2grow Please review and merge.
|
|
@mtelahun the changes you did in views are you sure they are not related to a browser thing? Can you show a screenshot of how you se the view and we compare? But I think on my end I can't replicate. |
|
@nimarosa I tested it in both Firefox and Chrome and it works as
expected. It was nothing major, just add colspan="2" in a couple of
places, change colspan="4" --> colspan="2" in a couple of places and
remove top-level <group> in help tab so that the text used up the whole
horizontal space, instead of just one column.
…On 11/11/2022 15:18, Nicolas Rodriguez Sande wrote:
@mtelahun <https://github.com/mtelahun> the changes you did in views
are you sure they are not related to a browser thing? Can you show a
screenshot of how you se the view and we compare? But I think on my
end I can't replicate.
—
Reply to this email directly, view it on GitHub
<#85 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AB4YOHBUBD5RWNQ6M3F6NR3WHY2QJANCNFSM6AAAAAARFEPM7U>.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
mtelahun
force-pushed
the
16.0-mig-payroll
branch
from
8e3cdb5
to
db9aab9
Compare
|
Here's the diff to 14.0 for reference: |
|
Tested it on runboat. Changes looks good. /ocabot merge nobump |
|
This PR looks fantastic, let's merge it! |
|
@nimarosa The merge process could not be finalized, because command |
|
Congratulations, your PR was merged at 3e8cf00. 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #76
cc: #78