nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-27 02:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Table row in dialog should not have delete row option

Browse Source 
(cherry picked from commit eb89903dec)
This commit is contained in:
nishkagosalia
2026-04-06 19:09:20 +05:30
committed by Mergify
parent 4d300f7d34
commit 5916e570af
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/public/js/controllers/transaction.js
View File

@@ -472,6 +472,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
frappe.msgprint(__("No pending payment schedules available.")); frappe.msgprint(__("No pending payment schedules available."));
return; return;
} }
schedules.forEach((schedule) => (schedule.__checked = 1));
const dialog = new frappe.ui.Dialog({ const dialog = new frappe.ui.Dialog({
title: __("Select Payment Schedule"), title: __("Select Payment Schedule"),
@@ -481,6 +482,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
fieldname: "payment_schedules", fieldname: "payment_schedules",
label: __("Payment Schedules"), label: __("Payment Schedules"),
cannot_add_rows: true, cannot_add_rows: true,
cannot_delete_rows: true,
in_place_edit: false, in_place_edit: false,
data: schedules, data: schedules,
fields: [ fields: [
@@ -526,7 +528,6 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}); });
return; return;
} }
console.log(selected);
dialog.hide(); dialog.hide();
let me = this; let me = this;
const payment_request_type = ["Sales Order", "Sales Invoice"].includes(this.frm.doc.doctype) const payment_request_type = ["Sales Order", "Sales Invoice"].includes(this.frm.doc.doctype)

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

@@ -1405,6 +1405,7 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
make_raw_material_request_dialog(r) { make_raw_material_request_dialog(r) {
var me = this; var me = this;
r.message.forEach((item) => (item.__checked = 1));
var fields = [ var fields = [
{ fieldtype: "Check", fieldname: "include_exploded_items", label: __("Include Exploded Items") }, { fieldtype: "Check", fieldname: "include_exploded_items", label: __("Include Exploded Items") },
{ {
@@ -1415,7 +1416,8 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
{ {
fieldtype: "Table", fieldtype: "Table",
fieldname: "items", fieldname: "items",
description: __("Select BOM, Qty and For Warehouse"), description: __("Finished Goods"),
cannot_delete_rows: true,
fields: [ fields: [
{ {
fieldtype: "Read Only", fieldtype: "Read Only",

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

@@ -2050,14 +2050,14 @@ def get_work_order_items(sales_order, for_raw_material_request=0):
if not pending_qty: if not pending_qty:
pending_qty = stock_qty * overproduction_percentage_for_sales_order pending_qty = stock_qty * overproduction_percentage_for_sales_order
if pending_qty > 0 and i.item_code not in product_bundle_parents: if pending_qty > 0 and i.item_code not in product_bundle_parents and bom:
items.append( items.append(
dict( dict(
name=i.name, name=i.name,
item_code=i.item_code, item_code=i.item_code,
item_name=i.item_name, item_name=i.item_name,
description=i.description, description=i.description,
bom=bom or "", bom=bom,
warehouse=i.warehouse, warehouse=i.warehouse,
pending_qty=pending_qty, pending_qty=pending_qty,
required_qty=pending_qty if for_raw_material_request else 0, required_qty=pending_qty if for_raw_material_request else 0,