diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js index a52a9dbeac2..f6ba4ae9fab 100755 --- a/erpnext/public/js/utils.js +++ b/erpnext/public/js/utils.js @@ -823,11 +823,14 @@ erpnext.utils.map_current_doc = function (opts) { if (opts.source_doctype) { let data_fields = []; if (["Purchase Receipt", "Delivery Note"].includes(opts.source_doctype)) { - data_fields.push({ - fieldname: "merge_taxes", - fieldtype: "Check", - label: __("Merge taxes from multiple documents"), - }); + let target_meta = frappe.get_meta(cur_frm.doc.doctype); + if (target_meta.fields.find((f) => f.fieldname === "taxes")) { + data_fields.push({ + fieldname: "merge_taxes", + fieldtype: "Check", + label: __("Merge taxes from multiple documents"), + }); + } } const d = new frappe.ui.form.MultiSelectDialog({ doctype: opts.source_doctype, diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py index 9ff22d384e7..2ad3f485d08 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note.py @@ -772,7 +772,7 @@ def make_delivery_trip(source_name, target_doc=None): @frappe.whitelist() -def make_installation_note(source_name, target_doc=None): +def make_installation_note(source_name, target_doc=None, kwargs=None): def update_item(obj, target, source_parent): target.qty = flt(obj.qty) - flt(obj.installed_qty) target.serial_no = obj.serial_no