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

Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to

Browse Source
This commit is contained in:
Himanshu Warekar
2020-03-13 19:40:00 +05:30
parent 7be9120730 c06ba54f1e
commit 841be6713b
536 changed files with 44105 additions and 28622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/www/book_appointment/index.js
View File

@@ -181,10 +181,32 @@ function setup_details_page() {
navigate_to_page(2)
let date_container = document.getElementsByClassName('date-span')[0];
let time_container = document.getElementsByClassName('time-span')[0];
setup_search_params();
date_container.innerHTML = moment(window.selected_date).format("MMM Do YYYY");
time_container.innerHTML = moment(window.selected_time, "HH:mm:ss").format("LT");
}
function setup_search_params() {
let search_params = new URLSearchParams(window.location.search);
let customer_name = search_params.get("name")
let customer_email = search_params.get("email")
let detail = search_params.get("details")
if (customer_name) {
let name_input = document.getElementById("customer_name");
name_input.value = customer_name;
name_input.disabled = true;
}
if(customer_email) {
let email_input = document.getElementById("customer_email");
email_input.value = customer_email;
email_input.disabled = true;
}
if(detail) {
let detail_input = document.getElementById("customer_notes");
detail_input.value = detail;
detail_input.disabled = true;
}
}
async function submit() {
let button = document.getElementById('submit-button');
button.disabled = true;

2
erpnext/www/lms/program.py
View File

@@ -22,7 +22,7 @@ def get_program(program_name):
try:
return frappe.get_doc('Program', program_name)
except frappe.DoesNotExistError:
frappe.throw(_("Program {0} does not exist.".format(program_name)))
frappe.throw(_("Program {0} does not exist.").format(program_name))
def get_course_progress(courses, program):
progress = {course.name: utils.get_course_progress(course, program) for course in courses}