Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Holiday List): allow empty value

Browse Source
This commit is contained in:
barredterra 2023-07-14 12:33:27 +02:00
parent 8271a39cdb
commit 8aff5a1dab
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/setup/doctype/holiday_list/holiday_list.js
View File

@ -9,11 +9,10 @@ frappe.ui.form.on("Holiday List", {
frm.call("get_supported_countries").then(r => { frm.call("get_supported_countries").then(r => {
frm.subdivisions_by_country = r.message.subdivisions_by_country; frm.subdivisions_by_country = r.message.subdivisions_by_country;
frm.set_df_property( const countries = r.message.countries.sort((a, b) => a.label.localeCompare(b.label));
"country", countries.unshift({ value: "", label: __("Select Country ...") });
"options",
r.message.countries.sort((a, b) => a.label.localeCompare(b.label)) frm.set_df_property("country", "options", countries);
);
if (frm.doc.country) { if (frm.doc.country) {
frm.trigger("set_subdivisions"); frm.trigger("set_subdivisions");
@ -34,9 +33,10 @@ frappe.ui.form.on("Holiday List", {
} }
}, },
set_subdivisions: function(frm) { set_subdivisions: function(frm) {
const subdivisions = frm.subdivisions_by_country[frm.doc.country]; const subdivisions = [...frm.subdivisions_by_country[frm.doc.country]];
if (subdivisions && subdivisions.length > 0) { if (subdivisions && subdivisions.length > 0) {
frm.set_df_property("subdivision", "options", frm.subdivisions_by_country[frm.doc.country]); subdivisions.unshift({ value: "", label: __("Select Subdivision ...") });
frm.set_df_property("subdivision", "options", subdivisions);
frm.set_df_property("subdivision", "hidden", 0); frm.set_df_property("subdivision", "hidden", 0);
} else { } else {
frm.set_df_property("subdivision", "options", ""); frm.set_df_property("subdivision", "options", "");

2
erpnext/setup/doctype/holiday_list/holiday_list.py
View File

@ -53,7 +53,7 @@ class HolidayList(Document):
@frappe.whitelist() @frappe.whitelist()
def get_local_holidays(self): def get_local_holidays(self):
if not self.country: if not self.country:
throw(_("Please select Country")) throw(_("Please select a country"))
existing_holidays = self.get_holidays() existing_holidays = self.get_holidays()
from_date = getdate(self.from_date) from_date = getdate(self.from_date)

3
erpnext/translations/de.csv
View File

@ -4004,6 +4004,8 @@ Search for a payment,Suche nach einer Zahlung,
Search for anything ...,Nach etwas suchen ..., Search for anything ...,Nach etwas suchen ...,
Search results for,Suchergebnisse für, Search results for,Suchergebnisse für,
Select All,Alles auswählen, Select All,Alles auswählen,
Select Country ...,Land auswählen ...,
Select Subdivision ...,Teilgebiet auswählen ...,
Select Difference Account,Wählen Sie Differenzkonto, Select Difference Account,Wählen Sie Differenzkonto,
Select a Default Priority.,Wählen Sie eine Standardpriorität., Select a Default Priority.,Wählen Sie eine Standardpriorität.,
Select a company,Wählen Sie eine Firma aus, Select a company,Wählen Sie eine Firma aus,
@ -4194,6 +4196,7 @@ Mode Of Payment,Zahlungsart,
No students Found,Keine Schüler gefunden, No students Found,Keine Schüler gefunden,
Not in Stock,Nicht lagernd, Not in Stock,Nicht lagernd,
Please select a Customer,Bitte wählen Sie einen Kunden aus, Please select a Customer,Bitte wählen Sie einen Kunden aus,
Please select a country,Bitte wählen Sie ein Land aus,
Printed On,Gedruckt auf, Printed On,Gedruckt auf,
Received From,Erhalten von, Received From,Erhalten von,
Sales Person,Verkäufer, Sales Person,Verkäufer,

Can't render this file because it is too large.