Skip to content

Commit 5916e57

Browse files
nishkagosaliamergify[bot]
authored andcommitted
fix: Table row in dialog should not have delete row option
(cherry picked from commit eb89903)
1 parent 4d300f7 commit 5916e57

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

erpnext/public/js/controllers/transaction.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
472472
frappe.msgprint(__("No pending payment schedules available."));
473473
return;
474474
}
475+
schedules.forEach((schedule) => (schedule.__checked = 1));
475476

476477
const dialog = new frappe.ui.Dialog({
477478
title: __("Select Payment Schedule"),
@@ -481,6 +482,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
481482
fieldname: "payment_schedules",
482483
label: __("Payment Schedules"),
483484
cannot_add_rows: true,
485+
cannot_delete_rows: true,
484486
in_place_edit: false,
485487
data: schedules,
486488
fields: [
@@ -526,7 +528,6 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
526528
});
527529
return;
528530
}
529-
console.log(selected);
530531
dialog.hide();
531532
let me = this;
532533
const payment_request_type = ["Sales Order", "Sales Invoice"].includes(this.frm.doc.doctype)

erpnext/selling/doctype/sales_order/sales_order.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1405,6 +1405,7 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
14051405

14061406
make_raw_material_request_dialog(r) {
14071407
var me = this;
1408+
r.message.forEach((item) => (item.__checked = 1));
14081409
var fields = [
14091410
{ fieldtype: "Check", fieldname: "include_exploded_items", label: __("Include Exploded Items") },
14101411
{
@@ -1415,7 +1416,8 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
14151416
{
14161417
fieldtype: "Table",
14171418
fieldname: "items",
1418-
description: __("Select BOM, Qty and For Warehouse"),
1419+
description: __("Finished Goods"),
1420+
cannot_delete_rows: true,
14191421
fields: [
14201422
{
14211423
fieldtype: "Read Only",

erpnext/selling/doctype/sales_order/sales_order.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2050,14 +2050,14 @@ def get_work_order_items(sales_order, for_raw_material_request=0):
20502050
if not pending_qty:
20512051
pending_qty = stock_qty * overproduction_percentage_for_sales_order
20522052

2053-
if pending_qty > 0 and i.item_code not in product_bundle_parents:
2053+
if pending_qty > 0 and i.item_code not in product_bundle_parents and bom:
20542054
items.append(
20552055
dict(
20562056
name=i.name,
20572057
item_code=i.item_code,
20582058
item_name=i.item_name,
20592059
description=i.description,
2060-
bom=bom or "",
2060+
bom=bom,
20612061
warehouse=i.warehouse,
20622062
pending_qty=pending_qty,
20632063
required_qty=pending_qty if for_raw_material_request else 0,

0 commit comments

Comments
 (0)