Skip to content

Commit

Permalink
feat: add local holidays (#36116)
Browse files Browse the repository at this point in the history
* feat: add local holidays

(cherry picked from commit aa18b25)

* test(Holiday List): weekly off and local holidays

(cherry picked from commit fd23bd0)

* feat(Holiday List): display localized country name

(cherry picked from commit 4888d75)

* fix: German translations of Holiday List

(cherry picked from commit 509061f)

# Conflicts:
#	erpnext/translations/de.csv

* fix(Holiday List): use current user's language

For consistency with "weekly off" descriptions

(cherry picked from commit 8271a39)

* fix(Holiday List): allow empty value

(cherry picked from commit 8aff5a1)

* refactor(Holiday List): use autocomplete fieldtype

(cherry picked from commit dab9688)

* chore: resolve merge conflicts

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
  • Loading branch information
mergify[bot] and barredterra authored Jul 14, 2023
1 parent d10e5e6 commit 94caf7f
Show file tree
Hide file tree
Showing 6 changed files with 210 additions and 407 deletions.
30 changes: 29 additions & 1 deletion erpnext/setup/doctype/holiday_list/holiday_list.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,41 @@ frappe.ui.form.on("Holiday List", {
if (frm.doc.holidays) {
frm.set_value("total_holidays", frm.doc.holidays.length);
}

frm.call("get_supported_countries").then(r => {
frm.subdivisions_by_country = r.message.subdivisions_by_country;
frm.fields_dict.country.set_data(
r.message.countries.sort((a, b) => a.label.localeCompare(b.label))
);

if (frm.doc.country) {
frm.trigger("set_subdivisions");
}
});
},
from_date: function(frm) {
if (frm.doc.from_date && !frm.doc.to_date) {
var a_year_from_start = frappe.datetime.add_months(frm.doc.from_date, 12);
frm.set_value("to_date", frappe.datetime.add_days(a_year_from_start, -1));
}
}
},
country: function(frm) {
frm.set_value("subdivision", "");

if (frm.doc.country) {
frm.trigger("set_subdivisions");
}
},
set_subdivisions: function(frm) {
const subdivisions = [...frm.subdivisions_by_country[frm.doc.country]];
if (subdivisions && subdivisions.length > 0) {
frm.fields_dict.subdivision.set_data(subdivisions);
frm.set_df_property("subdivision", "hidden", 0);
} else {
frm.fields_dict.subdivision.set_data([]);
frm.set_df_property("subdivision", "hidden", 1);
}
},
});

frappe.tour["Holiday List"] = [
Expand Down
Loading

0 comments on commit 94caf7f

Please sign in to comment.