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

[12.0][IMP] allow different workday lengths #323

Merged
merged 7 commits into from
Oct 9, 2024
Merged

[12.0][IMP] allow different workday lengths #323

merged 7 commits into from
Oct 9, 2024

Commits on Aug 26, 2024

  1. [IMP] allow different workday lengths 

    * allow contracts with different workday lengths for different employees
  of the same company.
* use only the resource.calendar of the contracts to define the length
  of a workday, instead of using the resource.calendar of the company.
* improve compatibility with hr_holidays.
* test and fix access rights.
    @huguesdk
    huguesdk committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    4ca25c1 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2024

  1. [IMP] add resource.mixin.get_calendar_for_date()

    @huguesdk
    huguesdk committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    d1ddf95 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. [IMP] resource_work_time_from_contracts: Make more extensible 

    By splitting this method up, it will be easier for me to do some
extension work elsewhere.

Signed-off-by: Carmen Bianca BAKKER <[email protected]>
    @carmenbianca
    carmenbianca committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    ad2d743 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. [IMP] allow to configure day rounding mode

    @huguesdk
    huguesdk committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    bb0fe18 View commit details
    Browse the repository at this point in the history

  2. [FIX] resource_work_time_from_contracts: Return record instead of int… 

    …eger id

Signed-off-by: Carmen Bianca BAKKER <[email protected]>
    @carmenbianca @huguesdk
    carmenbianca authored and huguesdk committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    ab1da78 View commit details
    Browse the repository at this point in the history

  3. [FIX] handle contracts without a calendar 

    avoid error with contracts without a resource_calendar_id.
    @huguesdk
    huguesdk committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    db3f4c9 View commit details
    Browse the repository at this point in the history

  4. [IMP] improve naming of methods

    @huguesdk
    huguesdk committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    7338dbd View commit details
    Browse the repository at this point in the history