From c9a1eb108164ff5cf788aefeac857b4c4d71c5bf Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 27 Mar 2018 11:26:43 +0530 Subject: [PATCH] [Fix] Not able to delete row in modal table (#13377) --- erpnext/buying/doctype/purchase_order/purchase_order.js | 2 +- erpnext/selling/doctype/sales_order/sales_order.js | 1 + erpnext/selling/doctype/sales_order/sales_order.py | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index 09402880ad..27d7a2b0f5 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -217,7 +217,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend( me.frm.doc['supplied_items'].forEach((item, index) => { if (item.rm_item_code && item.main_item_code) { me.raw_material_data.push ({ - 'name':index, + 'name':item.name, 'item_code': item.main_item_code, 'rm_item_code': item.rm_item_code, 'item_name': item.rm_item_code, diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 0657f9fab2..52fcb385de 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -229,6 +229,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( {fieldtype:'Data', fieldname:'sales_order_item', reqd: 1, label: __('Sales Order Item'), hidden:1} ], + data: r.message, get_data: function() { return r.message } diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 9e309397a2..8b0ecbf370 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -360,6 +360,7 @@ class SalesOrder(SellingController): where production_item=%s and sales_order=%s and sales_order_item = %s and docstatus<2''', (i.item_code, self.name, i.name))[0][0]) if pending_qty: items.append(dict( + name= i.name, item_code= i.item_code, bom = bom, warehouse = i.warehouse,