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

fix(merge): merge develop

Browse Source
This commit is contained in:
Rushabh Mehta
2020-12-08 16:23:09 +05:30
parent f4d645f87a 08d57e3530
commit fec8dba16c
306 changed files with 8707 additions and 2317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.js
View File

@@ -4,7 +4,7 @@ function check_times(frm) {
let from_time = Date.parse('01/01/2019 ' + d.from_time);
let to_time = Date.parse('01/01/2019 ' + d.to_time);
if (from_time > to_time) {
frappe.throw(__(`In row ${i + 1} of Appointment Booking Slots : "To Time" must be later than "From Time"`));
frappe.throw(__('In row {0} of Appointment Booking Slots: "To Time" must be later than "From Time".', [i + 1]));
}
});
}

5
erpnext/crm/doctype/contract_template/contract_template.json
View File

@@ -23,8 +23,7 @@
{
"fieldname": "contract_terms",
"fieldtype": "Text Editor",
"label": "Contract Terms and Conditions",
"read_only": 1
"label": "Contract Terms and Conditions"
},
{
"fieldname": "sb_fulfilment",
@@ -45,7 +44,7 @@
}
],
"links": [],
"modified": "2020-06-03 00:24:58.179816",
"modified": "2020-11-11 17:49:44.879363",
"modified_by": "Administrator",
"module": "CRM",
"name": "Contract Template",