nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into sales-commission-payout

Browse Source
This commit is contained in:
Afshan
2021-10-27 15:38:48 +05:30
committed by GitHub
parent f82163b7ae e0cf45e7ec
commit 6f4275d488
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/payment_order/payment_order.js
View File

@@ -10,6 +10,9 @@ frappe.ui.form.on('Payment Order', {
} }
} }
}); });
frm.set_df_property('references', 'cannot_add_rows', true);
frm.set_df_property('references', 'cannot_delete_rows', true);
}, },
refresh: function(frm) { refresh: function(frm) {
if (frm.doc.docstatus == 0) { if (frm.doc.docstatus == 0) {

4
erpnext/manufacturing/doctype/bom/bom.json
View File

@@ -436,7 +436,7 @@
"description": "Item Image (if not slideshow)", "description": "Item Image (if not slideshow)",
"fieldname": "website_image", "fieldname": "website_image",
"fieldtype": "Attach Image", "fieldtype": "Attach Image",
"label": "Image" "label": "Website Image"
}, },
{ {
"allow_on_submit": 1, "allow_on_submit": 1,
@@ -539,7 +539,7 @@
"image_field": "image", "image_field": "image",
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2021-05-16 12:25:09.081968", "modified": "2021-10-27 14:52:04.500251",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "BOM", "name": "BOM",