From 31e5431fe0c7873fc093764058f3ce3addaa3af7 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 14 Sep 2018 15:31:35 +0530 Subject: [PATCH 1/3] fix(urljoin): 2 and 3 compatible (#15401) --- erpnext/hub_node/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/hub_node/api.py b/erpnext/hub_node/api.py index 0492dde527..23564010e7 100644 --- a/erpnext/hub_node/api.py +++ b/erpnext/hub_node/api.py @@ -184,7 +184,7 @@ def item_sync_postprocess(): def convert_relative_image_urls_to_absolute(items): - from urlparse import urljoin + from six.moves.urllib.parse import urljoin for item in items: file_path = item['image'] From ada13213c0414b18ae0a74b55918b01df510e371 Mon Sep 17 00:00:00 2001 From: Zarrar Date: Fri, 14 Sep 2018 15:32:04 +0530 Subject: [PATCH 2/3] reload Patient Appointment doctype with added fields (#15397) --- .../doctype/patient_appointment/patient_appointment.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json index 5215c2888c..cef49d730b 100644 --- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json +++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json @@ -978,7 +978,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2018-08-21 16:15:45.704550", + "modified": "2018-09-13 10:15:45.704550", "modified_by": "Administrator", "module": "Healthcare", "name": "Patient Appointment", From aa856c474aed9867bfeda8963c1536691ab1c28b Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 18 Sep 2018 10:42:04 +0530 Subject: [PATCH 3/3] fix(setup wizard): Validate FY dates (#15419) - start date should be less than end date --- erpnext/public/js/setup_wizard.js | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js index a030381b55..82d6f6e226 100644 --- a/erpnext/public/js/setup_wizard.js +++ b/erpnext/public/js/setup_wizard.js @@ -141,9 +141,7 @@ erpnext.setup.slides_settings = [ let me = this; let exist; - // validate fiscal year start and end dates - if (this.values.fy_start_date == 'Invalid date' || this.values.fy_end_date == 'Invalid date') { - frappe.msgprint(__("Please enter valid Financial Year Start and End Dates")); + if (!this.validate_fy_dates()) { return false; } @@ -170,6 +168,20 @@ erpnext.setup.slides_settings = [ return true; }, + validate_fy_dates: function() { + // validate fiscal year start and end dates + const invalid = this.values.fy_start_date == 'Invalid date' || + this.values.fy_end_date == 'Invalid date'; + const start_greater_than_end = this.values.fy_start_date > this.values.fy_end_date; + + if (invalid || start_greater_than_end) { + frappe.msgprint(__("Please enter valid Financial Year Start and End Dates")); + return false; + } + + return true; + }, + set_fy_dates: function (slide) { var country = frappe.wizard.values.country;