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

[IMP] l10n_be_hr_payroll: manage credit time during contract #31415

Closed

Conversation

Projects
None yet
6 participants
@jbm-odoo
Copy link
Contributor

jbm-odoo commented Feb 26, 2019

Description of the issue/feature this PR addresses:
In Belgium, we have the concept of time credit and parental leaves.
Globally the person keep full time rights and the initial contract
is always signed on a full time basis. But an avenant with the new
time schedule must be signed.

Desired behavior after PR is merged:
A new wizard on contract allows to manage credit time. We can specify
the start and stop date, the new calendar and the work time ratio.
The new wage will be compute.
After validation, the current contract will be duplicate once: for the time
credit contract. The current contract will have end date at
the beginning of the time credit period.

id=1924200

--
I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

@robodoo robodoo added the CI 🤖 label Feb 26, 2019

@C3POdoo C3POdoo added the RD label Feb 26, 2019

@jbm-odoo jbm-odoo force-pushed the odoo-dev:master-be-payroll-credit-time-jbm branch Feb 26, 2019

@robodoo robodoo removed the CI 🤖 label Feb 26, 2019

@jbm-odoo jbm-odoo force-pushed the odoo-dev:master-be-payroll-credit-time-jbm branch 2 times, most recently Feb 26, 2019

@robodoo robodoo added the CI 🤖 label Feb 26, 2019

@jbm-odoo jbm-odoo force-pushed the odoo-dev:master-be-payroll-credit-time-jbm branch Feb 26, 2019

@robodoo robodoo added CI 🤖 and removed CI 🤖 labels Feb 26, 2019

@jbm-odoo jbm-odoo force-pushed the odoo-dev:master-be-payroll-credit-time-jbm branch Mar 7, 2019

@robodoo robodoo added CI 🤖 and removed CI 🤖 labels Mar 7, 2019

@jbm-odoo jbm-odoo force-pushed the odoo-dev:master-be-payroll-credit-time-jbm branch to 2c622af Mar 12, 2019

@robodoo robodoo added CI 🤖 and removed CI 🤖 labels Mar 12, 2019

@jbm-odoo jbm-odoo force-pushed the odoo-dev:master-be-payroll-credit-time-jbm branch from 2c622af to 1cb1146 Mar 19, 2019

@robodoo robodoo removed the CI 🤖 label Mar 19, 2019

@jbm-odoo jbm-odoo force-pushed the odoo-dev:master-be-payroll-credit-time-jbm branch 2 times, most recently from 7cd34f3 to daa852b Mar 20, 2019

@robodoo robodoo added the CI 🤖 label Mar 20, 2019

@jbm-odoo jbm-odoo force-pushed the odoo-dev:master-be-payroll-credit-time-jbm branch from daa852b to 4e77449 Apr 3, 2019

@robodoo robodoo added CI 🤖 and removed CI 🤖 labels Apr 3, 2019

@jbm-odoo jbm-odoo force-pushed the odoo-dev:master-be-payroll-credit-time-jbm branch from 4e77449 to cec45e6 Apr 3, 2019

@robodoo robodoo added CI 🤖 and removed CI 🤖 labels Apr 3, 2019

@RomainLibert
Copy link
Contributor

RomainLibert left a comment

The old commits containing the changes that moved to enterprise should be squashed in order to have a clean branch.
There should probably be two commits in the branch one containing the changes done in hr_contract and the other containing the changes done in resource.

Show resolved Hide resolved addons/hr_contract/models/hr_contract.py Outdated
Show resolved Hide resolved addons/resource/models/resource.py
@@ -257,7 +257,7 @@
<group name="resource_details">
<group>
<field name="company_id" groups="base.group_multi_company"/>
<field name="hours_per_day"/>
<field name="hours_per_day" groups="base.group_no_one"/>

This comment has been minimized.

Copy link
@RomainLibert

RomainLibert Apr 16, 2019

Contributor

Why is this changed to debug mode only?

This comment has been minimized.

Copy link
@jbm-odoo

jbm-odoo Apr 17, 2019

Author Contributor

It's Aline specification

This comment has been minimized.

Copy link
@Yenthe666

Yenthe666 Apr 17, 2019

Contributor

Are we sure to do that? 🤔

@jbm-odoo jbm-odoo force-pushed the odoo-dev:master-be-payroll-credit-time-jbm branch from cec45e6 to a3c5653 Apr 17, 2019

@robodoo robodoo removed the CI 🤖 label Apr 17, 2019

@robodoo robodoo added the CI 🤖 label Apr 17, 2019

@jbm-odoo jbm-odoo force-pushed the odoo-dev:master-be-payroll-credit-time-jbm branch from a3c5653 to f212aa3 Apr 17, 2019

@robodoo robodoo added CI 🤖 and removed CI 🤖 labels Apr 17, 2019

[IMP] l10n_be_hr_payroll: manage credit time during contract
In Belgium, we have the concept of time credit and parental leaves.
Globally the person keep full time rights and the initial contract
is always signed on a full time basis. But an avenant with the new
time schedule must be signed.

A new wizard on contract allows to manage credit time. We can
specify the start and stop date, the new calendar and the work
time ratio. The new wage will be computed.

After validation, the current contract will be duplicate two times,
one modified for the time credit contract and the second for after
the time credit period. The current contract will have end date at
the beginnig of the time credit period.

TaskID: 1924200

@tivisse tivisse force-pushed the odoo-dev:master-be-payroll-credit-time-jbm branch from f212aa3 to 5630b13 Apr 17, 2019

[IMP] hr_contract: Improve display of contract related buttons
There is a button on the employee form that show the number of
contracts. This button is only accessible for hr manager,
but not for contract manager.

It's make more sense that this button is accessible for contract
manager. The contract manager can already see all contract from
the menu. Hr manager inherit rights of contract manager.

With this commit, the button is accessible with contract manager
rights and hr manager.

@robodoo robodoo removed the CI 🤖 label Apr 17, 2019

@tivisse tivisse force-pushed the odoo-dev:master-be-payroll-credit-time-jbm branch from 5630b13 to 94820a4 Apr 17, 2019

@tivisse

This comment has been minimized.

Copy link
Contributor

tivisse commented Apr 17, 2019

@robodoo rebase-ff r+

@robodoo robodoo added the r+ 👌 label Apr 17, 2019

@robodoo

This comment has been minimized.

Copy link
Contributor

robodoo commented Apr 17, 2019

Merge method set to rebase and fast-forward

@robodoo robodoo added the CI 🤖 label Apr 17, 2019

@robodoo

This comment has been minimized.

Copy link
Contributor

robodoo commented Apr 17, 2019

Linked pull request(s) odoo/enterprise#3814 not ready. Linked PRs are not staged until all of them are ready.

robodoo pushed a commit that referenced this pull request Apr 17, 2019

[IMP] hr_contract: Improve display of contract related buttons
There is a button on the employee form that show the number of
contracts. This button is only accessible for hr manager,
but not for contract manager.

It's make more sense that this button is accessible for contract
manager. The contract manager can already see all contract from
the menu. Hr manager inherit rights of contract manager.

With this commit, the button is accessible with contract manager
rights and hr manager.

closes #31415

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
@robodoo

This comment has been minimized.

Copy link
Contributor

robodoo commented Apr 17, 2019

Merged, thanks!

@robodoo robodoo closed this Apr 17, 2019

@RomainLibert RomainLibert deleted the odoo-dev:master-be-payroll-credit-time-jbm branch Apr 18, 2019

Arcasias added a commit to odoo-dev/odoo that referenced this pull request Apr 19, 2019

[IMP] hr_contract: Improve display of contract related buttons
There is a button on the employee form that show the number of
contracts. This button is only accessible for hr manager,
but not for contract manager.

It's make more sense that this button is accessible for contract
manager. The contract manager can already see all contract from
the menu. Hr manager inherit rights of contract manager.

With this commit, the button is accessible with contract manager
rights and hr manager.

closes odoo#31415

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.