Skip to content

[FIX] hr_holidays: limit days selection for accruals to the corresponding month days #4953

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

Open
ibmah-odoo wants to merge 1 commit into
base: master-hr-onboarding-ibmah
Choose a base branch
from
Open

[FIX] hr_holidays: limit days selection for accruals to the corresponding month days #4953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions addons/hr_holidays/static/src/components/day_of_month/day_of_month.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { registry } from "@web/core/registry";
import { SelectionField, selectionField } from "@web/views/fields/selection/selection_field";

export class DayOfMonth extends SelectionField {
static props = {
...SelectionField.props,
month: String,
};

get options() {
const days = this.props.record.fields[this.props.name].selection;
const month = this.props.record.data[this.props.month];
// using non-leap year (2025) to avoid having the date set to 29th of Feb and only triggering once every 4 years
const lastDay = new Date(2025, month, 0).getDate();
return days.filter((day) => day[0] <= lastDay);
}
}

export const dayOfMonth = {
...selectionField,
component: DayOfMonth,
extractProps({ options }) {
return {
...selectionField.extractProps(...arguments),
month: options.depends_on,
};
},
};

registry.category("fields").add("day_of_month", dayOfMonth);
6 changes: 3 additions & 3 deletions addons/hr_holidays/views/hr_leave_accrual_views.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@
</span>
<span name="biyearly" invisible="frequency != 'biyearly'">
on the
<field nolabel="1" name="first_month_day" class="o_field_accrual" placeholder="select a day" required="frequency == 'biyearly'"/>
<field nolabel="1" name="first_month_day" widget="day_of_month" options="{'depends_on': 'first_month'}" class="o_field_accrual" placeholder="select a day" required="frequency == 'biyearly'"/>
of
<field name="first_month" class="o_field_accrual" placeholder="select a month" required="frequency == 'biyearly'"/>
and the
<field nolabel="1" name="second_month_day" class="o_field_accrual" placeholder="select a day" required="frequency == 'biyearly'"/>
<field nolabel="1" name="second_month_day" widget="day_of_month" options="{'depends_on': 'second_month'}" class="o_field_accrual" placeholder="select a day" required="frequency == 'biyearly'"/>
of
<field nolabel="1" name="second_month" class="o_field_accrual" placeholder="select a month" required="frequency == 'biyearly'"/>
</span>
<span name="yearly" invisible="frequency != 'yearly'">
on the
<field nolabel="1" name="yearly_day" class="o_field_accrual" required="frequency == 'yearly'" placeholder="select a day"/>
<field nolabel="1" name="yearly_day" widget="day_of_month" options="{'depends_on': 'yearly_month'}" class="o_field_accrual" required="frequency == 'yearly'" placeholder="select a day"/>
of
<field nolabel="1" name="yearly_month" class="o_field_accrual" required="frequency == 'yearly'" placeholder="select a month"/>
</span>
Expand Down