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: merge conflicts

Browse Source
This commit is contained in:
Saqib Ansari
2022-01-31 11:40:59 +05:30
parent e6f2343fb4
commit bed7201efe
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -505,11 +505,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
} }
}, },
<<<<<<< HEAD make_delivery_note: function(delivery_dates) {
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,