From bed7201efe15808df66cf21c4e53eee577b105bf Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Mon, 31 Jan 2022 11:40:59 +0530 Subject: [PATCH] fix: merge conflicts --- erpnext/selling/doctype/sales_order/sales_order.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 13def783a35..2d5bb2013f2 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -505,11 +505,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( } }, -<<<<<<< HEAD - make_delivery_note: function() { -======= - make_delivery_note(delivery_dates) { ->>>>>>> a73ad6759d (fix(sales order): incorrect no. of items fetched while creating dn) + make_delivery_note: function(delivery_dates) { frappe.model.open_mapped_doc({ method: "erpnext.selling.doctype.sales_order.sales_order.make_delivery_note", frm: this.frm,