Commit Graph
24 Commits
Author SHA1 Message Date
Dossogne Bertrand 2415338d46 [IMP] hr_contract: remove unused code
In the hr_contract_history list view, some owl code was set to
allow employee creation from that view. Since the create button
has been removed, that code was unused.

closes odoo/odoo#106264

Signed-off-by: Kevin Baptiste <kba@odoo.com>
2022-11-22 18:12:31 +01:00
Yannick TivisseandXavier BOL 6d4ff45174 [FIX] hr_contract: Fix transitive relationship on contract res.groups
closes odoo/odoo#106256

X-original-commit: d9a475518914b31f0b2088444a4d23f00d2826a6
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Co-authored-by: Xavier BOL (xbo) <xbo@odoo.com>
2022-11-22 17:09:22 +01:00
alt-odoo 0053a9e565 [FIX] hr_contract: handle employees with multiple contracts
In case an employee has multiple contracts in several companies, we need
to only keep the contract of the current company of the employee, as
there can be only one in the main view hr_contract_history.

Before this patch, contract_information CTE returns the same ID for both
contracts:
employee_id | company_id | id | is_under_contract
-------------+------------+--------+-------------------
681 | 1 | 146842 | 0
681 | 14 | 146842 | 0

After the patch, it returns:
employee_id | company_id | id | is_under_contract
-------------+------------+--------+-------------------
681 | 1 | 4009 | 0
681 | 14 | 146842 | 0

We need to fix the WINDOW clause to make sure the id of the contract
that is selected is the one in the same company as the employee/contract
being selected in the contract_information CTE.

This way when an employee has multiple contracts, there will still be
1 line for each contract, but each with a different contract ID.

closes odoo/odoo#102821

X-original-commit: 88fa430be8a0c164e100b5f3c2f16ae906cc9a54
Signed-off-by: Kevin Baptiste <kba@odoo.com>
Signed-off-by: Alex Thuyls (alt) <alt@odoo.com>
2022-10-10 11:57:16 +02:00
Philippe Wauthy 78daac46e2 [IMP] hr_contract: add DISTINCT to hr_contract_history query
Following https://github.com/odoo/enterprise/pull/31202, it happens that the query for the contract history returns several times the same id if the employee has several contracts.

This commit fixes it by adding a DISTINCT to the SQL query so that ID returned are unique.

task-2974531

closes odoo/odoo#100027

Related: odoo/enterprise#31202
Signed-off-by: Kevin Baptiste <kba@odoo.com>
2022-09-19 15:09:52 +02:00
Rob Coekaerts fc5e9918a8 [IMP] hr_contract: include cancelled contracts in contract history
In order to avoid empty contract histories when there are existing but
cancelled contracts, cancelled contracts are now also included in the
contract history.

task-2939158

closes odoo/odoo#99767

Signed-off-by: Kevin Baptiste <kba@odoo.com>
2022-09-14 18:16:15 +02:00
Raphael Collet b38a5f78b6 [FIX] *: avoid non-searchable field dependencies
closes odoo/odoo#98562

Related: odoo/enterprise#30639
Signed-off-by: Raphael Collet <rco@odoo.com>
2022-08-29 22:43:11 +02:00
Stefan-Calin Crainiciuc (stcc) df9c2967f0 [FIX] hr_contract: remove create button for contract history
Steps to reproduce:
- install hr and hr_contract apps
- go to Employees app > Employees > Contracts
- switch to Kanban view

There you can see a 'Create' button. If you click it, it creates a
contract history form view for the default employee, which is 'False'.

This view is not needed, since it doesn't make sense to create a contract
history by itself, as opposed to creating a contract history when a new
employee is added to the database.

This commit removes the contract history 'Create' button.

opw-2929424

closes odoo/odoo#97780

X-original-commit: 337400b00bcaced2f27417e7a925582b80b6a514
Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com>
Signed-off-by: stcc-odoo <stcc@odoo.com>
2022-08-19 14:28:16 +02:00
stefanorigano (SRI) 56064ff1e4 [REM] *: drop oe_clear class in favor of clearfix bootstrap default
Part of the overall v16 SCSS optimization/restyle, task-2704984.

task-2918463

Part-of: odoo/odoo#97051
2022-08-04 13:54:14 +02:00
Romeo Fragomeli 1fcd098af5 [REF] *: BS5: migration
Automated change made by a lot of RegEx to change all think that is
possible to automate.

https://getbootstrap.com/docs/5.1/migration

Task ID: 2766483

Part-of: odoo/odoo#95450
2022-07-07 13:30:24 +02:00
Dossogne Bertrand c5679f0e22 [IMP] hr_contract*: improve general usability
*:
hr_contract
hr_work_entry
hr_work_entry_contract

This commit changes several views and methods to improve general usability of the payroll application

TaskID #2783013

closes odoo/odoo#89311

Related: odoo/enterprise#26466
Related: odoo/upgrade#3534
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
2022-06-29 12:19:03 +02:00
Dossogne Bertrand f10b59c964 [IMP] hr_payroll: improve user experience
The commit brings various features to the payroll app :
- visual improvements
- choice to recreate the original after a work schedule change
- after a new contract is sign, its differences with the last one is displayed in the chatter

TaskID : 2762038 [Payroll] Misc improvements

closes odoo/odoo#85581

Related: odoo/enterprise#24873
Signed-off-by: Kevin Baptiste <kba@odoo.com>
2022-04-26 09:57:43 +02:00
Yannick Tivisse 3d6af5180e [FIX] hr_contract: Display trainees in contract history
X-original-commit: a06c40da777f3b78b62387f8bf2353cf2ca4fd5c
Part-of: odoo/odoo#81927
2022-01-03 18:11:18 +00:00
Xavier Morel 499b1621ba [FIX] *: non-accessible buttons
closes odoo/odoo#76581

Related: odoo/enterprise#20897
Signed-off-by: Xavier Morel (xmo) <xmo@odoo.com>
2021-09-15 15:22:58 +00:00
Hardik Prajapati f8137cf900 [IMP] hr_contract: prevent dialog opening on contract history
clicking on the row of contract history opens the formViewDialog

so this commit fixes the issue by adding the readonly attributes
on the field so that clicking on the row of the contract history
doesn't open the formViewDialog

TaskID-2578874

closes odoo/odoo#73832

Signed-off-by: Kevin Baptiste <kba@odoo.com>
2021-07-19 07:23:41 +00:00
Yannick Tivisse 80087aca25 [IMP] hr_contract: Remove menuitem
Com PR: https://github.com/odoo/odoo/pull/73060

closes odoo/odoo#73060

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
2021-07-01 11:46:05 +00:00
Yannick Tivisse e91e6307e6 [IMP] hr_contract: Improve general UX (back2basics)
- hr_contract: Add kanban view on contract history action
- hr_contract: Display the avg wage, not the sum on aggregates
- hr_contract: Improve contract history list view
- hr_contract: Improve contract history tree view
- hr_contract: Improve contract history search view
- hr_contract: Display wage on contract kanban view
- hr_contract: Improve contract tree view
- hr_contract: Improve contract search view
- hr_contract: Make hr_responsible required
It is useful in multiple HR flows.
- hr_contract: Improve contract history form view
- hr_contract: Improve contract form view
- hr_work_entry: Improve work entry computed name
- hr_work_entry: Improve work entries tree view
- hr_work_entry: Improve work entry type form view

closes odoo/odoo#72402

Taskid: 2558171
Related: odoo/enterprise#19124
Related: odoo/upgrade#2583
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
2021-06-28 14:39:44 +00:00
William Braeckman a5bcd6b1b9 [IMP] hr,hr_contract: hide fields according to country
Hide fields related to belgian localisation when not using a belgian
company.

Task Id: 2496597

closes odoo/odoo#69691

Related: odoo/enterprise#17881
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
2021-05-19 07:28:31 +00:00
Yannick Tivisse d3c498c4b3 [FIX] hr_contract: Display incoming employees as "under contract"
X-original-commit: 7669eb6436fe84119359350f3621fc943305bc89
2021-05-17 09:36:00 +00:00
Yannick Tivisse 339b9706a2 [IMP] hr_contract: Use running contract on contract history resume
Use the running contract instead of a draft contract in the future

closes odoo/odoo#67685

Related: odoo/enterprise#17004
Related: odoo/upgrade#2265
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
2021-03-16 10:34:55 +00:00
Yannick Tivisse 0506d4e6fa [IMP] hr_contract: Add stat button to access contracts from calendars
Purpose
=======

Currently there's no easy way to retrieve all the contract using a given
calendar.

closes odoo/odoo#65621

Related: odoo/enterprise#16157
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
2021-02-05 14:06:01 +00:00
Laurent Stukkens (LTU) 7a516973d3 [IMP] hr_contract: add employee type
Prior to this commit:

* All employees were treated the same way regarding the contractual point of vue.

From this commit on:

* Three employee types will be created:
 - Employee, which is supposed to be under contract
 - Student & Contractor which are both not supposed to have an employee contract (but are still use the employee as working for the company)

* Employee view and Contract History will take this consideration into account.

closes odoo/odoo#64931

Taskid: 2446000
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
2021-01-28 12:20:16 +00:00
Yannick Tivisse 481cfe2818 [FIX] hr_contract: Select employee's company contracts on history
closes odoo/odoo#64914

X-original-commit: 22e46f28e0fae90098a0111ea601eadf80a3e3b6
Related: odoo/enterprise#15907
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
2021-01-22 10:59:11 +00:00
Laurent Stukkens (LTU) 94909c3f0f [FIX] hr_contract: order contract_ids by date_start desc in hr_contract_history
Prior to this commit:

    * The contract_ids one2many widget in the hr_contract_history form was not sorted
      desc.

After this commit:

    * The contract_ids one2many widget in the hr_contract_history form is correctly sorted
      desc.

related PR's: odoo/enterprise#14647, odoo/upgrade#1939

closes odoo/odoo#61512

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
2020-11-17 13:37:49 +00:00
Laurent Stukkens (LTU) 76489303c8 [IMP] hr_contract: ease contract management through contract history
Before this commit:

    It was complicated to manage the contracts as they were all displayed in
    one view.
    When the contract was a time credit one (which is by definition a temporary
    situation) the data used was based on the time credit and not on the full time
    equivalent. This usually forced the HR to create fake new contracts without
    time credit for the appraisals.

After this commit:

    A new report will ease the followup of contracts with the time running.
    It comes with a new view that highlight the reference information which
    allow to easily manage credit time. Simulation is also made on FTE data which
    eases HR work.
    This commit also fixes a bug in the simulation with the meal voucher (only one
    was taken into account in the summary right panel.
    The wage on signature is now populated when the document is signed.

Closes odoo/odoo#58120
Related PR: odoo/enterprise#13384, odoo/upgrade#1802

task-2326407

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
2020-11-03 15:08:45 +00:00