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

fix: client side UX fixes

Browse Source
This commit is contained in:
Kenneth Sequeira 2020-12-07 11:18:20 +05:30
parent 00510e7f12
commit 85af44b7ed
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/crm/doctype/contract/contract.js
View File

@ -12,8 +12,11 @@ frappe.ui.form.on("Contract", {
}, },
callback: function(r) { callback: function(r) {
if (r && r.message) { if (r && r.message) {
let contract_template = r.message.contract_template;
frm.set_value("contract_terms", r.message.contract_terms); frm.set_value("contract_terms", r.message.contract_terms);
frm.set_value("requires_fulfilment", contract_template.requires_fulfilment);
if (frm.doc.requires_fulfilment) {
// Populate the fulfilment terms table from a contract template, if any // Populate the fulfilment terms table from a contract template, if any
r.message.contract_template.fulfilment_terms.forEach(element => { r.message.contract_template.fulfilment_terms.forEach(element => {
let d = frm.add_child("fulfilment_terms"); let d = frm.add_child("fulfilment_terms");
@ -22,6 +25,7 @@ frappe.ui.form.on("Contract", {
frm.refresh_field("fulfilment_terms"); frm.refresh_field("fulfilment_terms");
} }
} }
}
}); });
} }
} }

3
erpnext/crm/doctype/contract/contract.json
View File

@ -176,7 +176,6 @@
}, },
{ {
"default": "0", "default": "0",
"fetch_from": "contract_template.requires_fulfilment",
"fieldname": "requires_fulfilment", "fieldname": "requires_fulfilment",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Requires Fulfilment" "label": "Requires Fulfilment"
@ -249,7 +248,7 @@
], ],
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2020-12-02 21:12:44.118155", "modified": "2020-12-07 11:15:58.385521",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "CRM", "module": "CRM",
"name": "Contract", "name": "Contract",