schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Missing args while fetching items from delivery note

Browse Source 
(cherry picked from commit bbe323fbb4)
This commit is contained in:
Nabin Hait
2024-04-22 16:28:31 +05:30
committed by Mergify
parent c71d1118a9
commit 0df80ad923
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/public/js/utils.js
View File

@@ -823,12 +823,15 @@ erpnext.utils.map_current_doc = function (opts) {
if (opts.source_doctype) { if (opts.source_doctype) {
let data_fields = []; let data_fields = [];
if (["Purchase Receipt", "Delivery Note"].includes(opts.source_doctype)) { if (["Purchase Receipt", "Delivery Note"].includes(opts.source_doctype)) {
let target_meta = frappe.get_meta(cur_frm.doc.doctype);
if (target_meta.fields.find((f) => f.fieldname === "taxes")) {
data_fields.push({ data_fields.push({
fieldname: "merge_taxes", fieldname: "merge_taxes",
fieldtype: "Check", fieldtype: "Check",
label: __("Merge taxes from multiple documents"), label: __("Merge taxes from multiple documents"),
}); });
} }
}
const d = new frappe.ui.form.MultiSelectDialog({ const d = new frappe.ui.form.MultiSelectDialog({
doctype: opts.source_doctype, doctype: opts.source_doctype,
target: opts.target, target: opts.target,

2
erpnext/stock/doctype/delivery_note/delivery_note.py
View File

@@ -772,7 +772,7 @@ def make_delivery_trip(source_name, target_doc=None):
@frappe.whitelist() @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): def update_item(obj, target, source_parent):
target.qty = flt(obj.qty) - flt(obj.installed_qty) target.qty = flt(obj.qty) - flt(obj.installed_qty)
target.serial_no = obj.serial_no target.serial_no = obj.serial_no