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

[MIG] project_hr: Migration to 13.0 #646

Merged
merged 26 commits into from Apr 21, 2020
Merged

[MIG] project_hr: Migration to 13.0 #646

merged 26 commits into from Apr 21, 2020

Conversation

ghost
Copy link

@ghost ghost commented Feb 26, 2020

No description provided.

@OCA-git-bot
Copy link
Contributor

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

@ghost ghost mentioned this pull request Feb 26, 2020
Closed
35 tasks
@simahawk simahawk changed the title 13.0 mig project hr [MIG] project_hr: Migration to 13.0 Feb 28, 2020
@simahawk simahawk added this to the 13.0 milestone Feb 28, 2020
@lfreeke lfreeke mentioned this pull request Feb 28, 2020
Closed
Saran440
Saran440 reviewed Mar 3, 2020
View reviewed changes
Copy link
Member

@Saran440 Saran440 left a comment

Choose a reason for hiding this comment

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

Code Review

project_hr/__manifest__.py Outdated Show resolved Hide resolved
@ghost
Copy link
Author

ghost commented Mar 5, 2020

@Saran440 done :)

Saran440
Saran440 approved these changes Mar 5, 2020
View reviewed changes
Copy link
Member

@Saran440 Saran440 left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@dreispt
Copy link
Sponsor Member

dreispt commented Apr 4, 2020

/ocabot merge

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 13.0-ocabot-merge-pr-646-by-dreispt-bump-no, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Apr 4, 2020
@OCA-git-bot
Merge PR #646 into 13.0
5e3e263 
Signed-off-by dreispt
@OCA-git-bot
Copy link
Contributor

@dreispt your merge command was aborted due to failed check(s), which you can inspect on this commit of 13.0-ocabot-merge-pr-646-by-dreispt-bump-no.

After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red.

@OCA-git-bot
Copy link
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

@simahawk
Copy link
Contributor

@Alfadil pre-commit test failed. Can you fix it?

@ghost
Copy link
Author

ghost commented Apr 10, 2020

@Alfadil pre-commit test failed. Can you fix it?

done

@simahawk
Copy link
Contributor

@Alfadil sorry, I missed your update. It's not a blocker but next time, please rebase on 13.0 instead of merging it into your branch. One last thing: can you squash your commits?
NOTE: if you don't rebase do not squash the merge commit.
Thanks!

pedrobaeza
pedrobaeza requested changes Apr 20, 2020
View reviewed changes
Copy link
Member

@pedrobaeza pedrobaeza left a comment

Choose a reason for hiding this comment

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

WARNING: Merge commits screw up the commit history for later v14 migration, so it's a must to rebase and fix conflicts without merge commit.

pedrobaeza and others added 5 commits April 20, 2020 19:29
@pedrobaeza
[ADD] project_hr: Link HR with project
e600ac2 
Project HR
==========

This is a technical module for adding some HR information to projects and
provide technical fields with HR information:

- Employee categories at project and task level.
- Employee linked to the user assigned to a task.
- Employee categories at user level.

These fields can be used later for extra features like task scheduling or
security restrictions.

It also provides some facilities on project management:

* Limit selection of assigned users according selected employee category at
  task level.
* Limit selection of employee categories at task level depending on the
  selected categories at project level. All are shown if no categories at
  project level.

Configuration
=============

For setting employee categories at project level:

1. Go to *Project > Dashboard*.
2. Click on the 3 vertical dots for unfolding options and select "Settings".
3. Put the wanted employee categories on the field "Employee Categories".

For setting employee categories:

1. Go to *Project > Search > Tasks*.
2. Select or create a new task.
3. Put the wanted employee categories on the field "Employee categories".
4. If there's already some employee categories selected at project level, those
   will be the only selectable ones in the task.

Usage
=====

1. Go to *Project > Search > Tasks*.
2. If there's an employee category selected in the task, you will only be able
   to select those users whose employee belongs to that category.

Known issues / Roadmap
======================

* Limit project and task visibility according employee categories through
  overriding security methods (as through record rules is not possible without
  modifying existing ones).
@oca-travis
[UPD] Update project_hr.pot
fd698c3
@marylla
Added translation using Weblate (German)
c7545fa
@sysadminmatmoz
Added translation using Weblate (Slovenian)
814002a
@OCA-git-bot
[UPD] README.rst
87cada7
alexey-pelykh and others added 16 commits April 20, 2020 19:29
@alexey-pelykh
[FIX] project_hr: domain on field breaks other modules
9447622
@oca-travis
[UPD] Update project_hr.pot
9bb7d18
@OCA-git-bot
[UPD] README.rst
a804c09
@OCA-git-bot
project_hr 12.0.1.0.1
2623c6f
@oca-transbot
Update translation files
e2f8214 
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: project-12.0/project-12.0-project_hr
Translate-URL: https://translation.odoo-community.org/projects/project-12-0/project-12-0-project_hr/
@oca-travis
[UPD] Update project_hr.pot
6b17bd1
@oca-transbot
Update translation files
9b712d5 
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: project-12.0/project-12.0-project_hr
Translate-URL: https://translation.odoo-community.org/projects/project-12-0/project-12-0-project_hr/
@marylla
Translated using Weblate (German)
d7790b1 
Currently translated at 100.0% (16 of 16 strings)

Translation: project-12.0/project-12.0-project_hr
Translate-URL: https://translation.odoo-community.org/projects/project-12-0/project-12-0-project_hr/de/
@sysadminmatmoz
Translated using Weblate (Slovenian)
1406d71 
Currently translated at 100.0% (16 of 16 strings)

Translation: project-12.0/project-12.0-project_hr
Translate-URL: https://translation.odoo-community.org/projects/project-12-0/project-12-0-project_hr/sl/
@oca-travis
[UPD] Update project_hr.pot
54954fd
@oca-transbot
Update translation files
72ed580 
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: project-12.0/project-12.0-project_hr
Translate-URL: https://translation.odoo-community.org/projects/project-12-0/project-12-0-project_hr/
@badbole
Added translation using Weblate (Croatian)
599004f
@badbole
Translated using Weblate (Croatian)
531d125 
Currently translated at 31.2% (5 of 16 strings)

Translation: project-12.0/project-12.0-project_hr
Translate-URL: https://translation.odoo-community.org/projects/project-12-0/project-12-0-project_hr/hr/
[IMP] project_hr: black, isort
9227dba
[MIG] project_hr: Migration to 13.0
a6665f9 
[ADD] project_hr runbot

Update project_hr/__manifest__.py

Co-Authored-By: Saran @ Ecosoft <saranl@ecosoft.co.th>

[FIX] pre-commit errors
[ADD] increase test coverage
038c68d
@ghost
Copy link
Author

ghost commented Apr 20, 2020

squash

thanks for your comments I did rebase with 13.0 and squash my commits

@ghost
Copy link
Author

ghost commented Apr 20, 2020 •
edited by ghost

WARNING: Merge commits screw up the commit history for later v14 migration, so it's a must to rebase and fix conflicts without merge commit.

thanks for your comment.
@pedrobaeza done :)

@ghost ghost requested a review from pedrobaeza April 20, 2020 17:53
@pedrobaeza
Copy link
Member

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 13.0-ocabot-merge-pr-646-by-pedrobaeza-bump-nobump, awaiting test results.

@OCA-git-bot
Copy link
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

@OCA-git-bot OCA-git-bot merged commit ff1cb01 into OCA:13.0 Apr 21, 2020
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 0d54985. 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
approved merged 🎉 needs review ready to merge
Projects
None yet
Milestone
13.0
Development

Successfully merging this pull request may close these issues.

None yet