CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 01:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: enable no copy for serial no field (#46381)

Browse Source 
* fix: enable no copy for serial no field

* fix: remove no copy from serial no field of purchase receipt item

* fix: remove no copy from serial no field of delivery note item

* Revert "fix: remove no copy from serial no field of purchase receipt item"

This reverts commit 5d1752030b.

---------

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
(cherry picked from commit 5a72edcb82)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#	erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#	erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
This commit is contained in:
Mihir Kandoi
2025-03-12 15:11:55 +05:30
committed by Mergify
parent 4d49608a68
commit aaa2cd05f2
5 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
View File

@@ -461,7 +461,8 @@
"depends_on": "eval:!doc.is_fixed_asset && doc.use_serial_batch_fields === 1 && parent.update_stock === 1",
"fieldname": "serial_no",
"fieldtype": "Text",
"label": "Serial No"
"label": "Serial No",
"no_copy": 1
},
{
"depends_on": "eval:!doc.is_fixed_asset && doc.use_serial_batch_fields === 1 && parent.update_stock === 1",
@@ -972,17 +973,23 @@
"print_hide": 1
}
],
"grid_page_length": 50,
"idx": 1,
"istable": 1,
"links": [],
"modified": "2024-10-28 15:06:19.246141",
"modified": "2025-03-07 10:21:59.960021",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice Item",
"naming_rule": "Random",
"owner": "Administrator",
"permissions": [],
<<<<<<< HEAD
"sort_field": "modified",
=======
"row_format": "Dynamic",
"sort_field": "creation",
>>>>>>> 5a72edcb82 (fix: enable no copy for serial no field (#46381))
"sort_order": "DESC",
"states": []
}

3
erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
View File

@@ -633,6 +633,7 @@
"fieldname": "serial_no",
"fieldtype": "Text",
"label": "Serial No",
"no_copy": 1,
"oldfieldname": "serial_no",
"oldfieldtype": "Small Text"
},
@@ -976,7 +977,7 @@
"idx": 1,
"istable": 1,
"links": [],
"modified": "2025-03-05 12:22:11.801692",
"modified": "2025-03-07 10:25:30.275246",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice Item",

10
erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
View File

@@ -930,18 +930,28 @@
"fieldtype": "Column Break"
}
],
"grid_page_length": 50,
"idx": 1,
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2025-02-05 14:28:32.322181",
=======
"modified": "2025-03-07 12:33:40.868499",
>>>>>>> 5a72edcb82 (fix: enable no copy for serial no field (#46381))
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note Item",
"naming_rule": "Random",
"owner": "Administrator",
"permissions": [],
<<<<<<< HEAD
"sort_field": "modified",
=======
"row_format": "Dynamic",
"sort_field": "creation",
>>>>>>> 5a72edcb82 (fix: enable no copy for serial no field (#46381))
"sort_order": "DESC",
"states": []
}

10
erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
View File

@@ -1017,7 +1017,8 @@
{
"fieldname": "serial_no",
"fieldtype": "Text",
"label": "Serial No"
"label": "Serial No",
"no_copy": 1
},
{
"fieldname": "rejected_serial_no",
@@ -1140,7 +1141,7 @@
"idx": 1,
"istable": 1,
"links": [],
"modified": "2025-02-17 13:15:36.692202",
"modified": "2025-03-07 10:25:15.554985",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt Item",
@@ -1148,7 +1149,12 @@
"owner": "Administrator",
"permissions": [],
"quick_entry": 1,
<<<<<<< HEAD
"sort_field": "modified",
=======
"row_format": "Dynamic",
"sort_field": "creation",
>>>>>>> 5a72edcb82 (fix: enable no copy for serial no field (#46381))
"sort_order": "DESC",
"states": []
}

11
erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
View File

@@ -110,7 +110,8 @@
"depends_on": "eval:doc.use_serial_batch_fields === 1",
"fieldname": "serial_no",
"fieldtype": "Long Text",
"label": "Serial No"
"label": "Serial No",
"no_copy": 1
},
{
"fieldname": "column_break_11",
@@ -253,16 +254,22 @@
"label": "Reconcile All Serial Nos / Batches"
}
],
"grid_page_length": 50,
"istable": 1,
"links": [],
"modified": "2024-05-30 23:20:00.947243",
"modified": "2025-03-07 10:26:25.856337",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Reconciliation Item",
"owner": "Administrator",
"permissions": [],
"quick_entry": 1,
<<<<<<< HEAD
"sort_field": "modified",
=======
"row_format": "Dynamic",
"sort_field": "creation",
>>>>>>> 5a72edcb82 (fix: enable no copy for serial no field (#46381))
"sort_order": "DESC",
"states": [],
"track_changes": 1