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

fix(sales order): incorrect no. of items fetched while creating dn

Browse Source 
(cherry picked from commit a73ad6759d)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.js
This commit is contained in:
Saqib Ansari
2022-01-25 17:12:41 +05:30
committed by mergify-bot
parent f31e52123a
commit 9da63f2e79
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
erpnext/selling/doctype/sales_order/sales_order.js
View File

@@ -457,12 +457,8 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
make_delivery_note_based_on_delivery_date: function() { make_delivery_note_based_on_delivery_date: function() {
var me = this; var me = this;
var delivery_dates = []; var delivery_dates = this.frm.doc.items.map(i => i.delivery_date);
$.each(this.frm.doc.items || [], function(i, d) { delivery_dates = [ ...new Set(delivery_dates) ];
if(!delivery_dates.includes(d.delivery_date)) {
delivery_dates.push(d.delivery_date);
}
});
var item_grid = this.frm.fields_dict["items"].grid; var item_grid = this.frm.fields_dict["items"].grid;
if(!item_grid.get_selected().length && delivery_dates.length > 1) { if(!item_grid.get_selected().length && delivery_dates.length > 1) {
@@ -500,14 +496,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
if(!dates) return; if(!dates) return;
$.each(dates, function(i, d) { me.make_delivery_note(dates);
$.each(item_grid.grid_rows || [], function(j, row) {
if(row.doc.delivery_date == d) {
row.doc.__checked = 1;
}
});
})
me.make_delivery_note();
dialog.hide(); dialog.hide();
}); });
dialog.show(); dialog.show();
@@ -516,10 +505,17 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
} }
}, },
<<<<<<< HEAD
make_delivery_note: function() { make_delivery_note: function() {
=======
make_delivery_note(delivery_dates) {
>>>>>>> a73ad6759d (fix(sales order): incorrect no. of items fetched while creating dn)
frappe.model.open_mapped_doc({ frappe.model.open_mapped_doc({
method: "erpnext.selling.doctype.sales_order.sales_order.make_delivery_note", method: "erpnext.selling.doctype.sales_order.sales_order.make_delivery_note",
frm: this.frm frm: this.frm,
args: {
delivery_dates
}
}) })
}, },

8
erpnext/selling/doctype/sales_order/sales_order.py
View File

@@ -611,6 +611,12 @@ def make_delivery_note(source_name, target_doc=None, skip_item_mapping=False):
} }
if not skip_item_mapping: if not skip_item_mapping:
def condition(doc):
if frappe.flags.args and frappe.flags.args.delivery_dates:
if cstr(doc.delivery_date) not in frappe.flags.args.delivery_dates:
return False
return abs(doc.delivered_qty) < abs(doc.qty) and doc.delivered_by_supplier!=1
mapper["Sales Order Item"] = { mapper["Sales Order Item"] = {
"doctype": "Delivery Note Item", "doctype": "Delivery Note Item",
"field_map": { "field_map": {
@@ -619,7 +625,7 @@ def make_delivery_note(source_name, target_doc=None, skip_item_mapping=False):
"parent": "against_sales_order", "parent": "against_sales_order",
}, },
"postprocess": update_item, "postprocess": update_item,
"condition": lambda doc: abs(doc.delivered_qty) < abs(doc.qty) and doc.delivered_by_supplier!=1 "condition": condition
} }
target_doc = get_mapped_doc("Sales Order", source_name, mapper, target_doc, set_missing_values) target_doc = get_mapped_doc("Sales Order", source_name, mapper, target_doc, set_missing_values)