nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 05:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into develop

Browse Source
This commit is contained in:
Nabin Hait
2018-09-18 11:44:42 +05:30
parent 13761dde38 aa856c474a
commit 63a58a6752
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/healthcare/doctype/patient_appointment/patient_appointment.json
View File

@@ -978,7 +978,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-08-21 16:15:45.704550", "modified": "2018-09-13 10:15:45.704550",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Healthcare", "module": "Healthcare",
"name": "Patient Appointment", "name": "Patient Appointment",

2
erpnext/hub_node/api.py
View File

@@ -184,7 +184,7 @@ def item_sync_postprocess():
def convert_relative_image_urls_to_absolute(items): def convert_relative_image_urls_to_absolute(items):
from urlparse import urljoin from six.moves.urllib.parse import urljoin
for item in items: for item in items:
file_path = item['image'] file_path = item['image']

18
erpnext/public/js/setup_wizard.js
View File

@@ -141,9 +141,7 @@ erpnext.setup.slides_settings = [
let me = this; let me = this;
let exist; let exist;
// validate fiscal year start and end dates if (!this.validate_fy_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"));
return false; return false;
} }
@@ -170,6 +168,20 @@ erpnext.setup.slides_settings = [
return true; 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) { set_fy_dates: function (slide) {
var country = frappe.wizard.values.country; var country = frappe.wizard.values.country;