From 5d511035ec3e0610ff244fe7c9c271aa8c221c25 Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Fri, 14 Apr 2023 15:59:35 +0530 Subject: [PATCH 1/2] fix: unable to change `company` for manual `Serial No` entry (cherry picked from commit fb3271c6249d647c2add2a83c06cbbb879762b81) # Conflicts: # erpnext/stock/doctype/serial_no/serial_no.json --- erpnext/stock/doctype/serial_no/serial_no.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json index a3d44af4945..31170f8454d 100644 --- a/erpnext/stock/doctype/serial_no/serial_no.json +++ b/erpnext/stock/doctype/serial_no/serial_no.json @@ -411,10 +411,10 @@ "fieldtype": "Link", "label": "Company", "options": "Company", - "read_only": 1, "remember_last_selected_value": 1, "reqd": 1, - "search_index": 1 + "search_index": 1, + "set_only_once": 1 }, { "fieldname": "status", @@ -434,7 +434,11 @@ "icon": "fa fa-barcode", "idx": 1, "links": [], +<<<<<<< HEAD "modified": "2021-01-08 14:31:15.375996", +======= + "modified": "2023-04-14 15:58:46.139887", +>>>>>>> fb3271c624 (fix: unable to change `company` for manual `Serial No` entry) "modified_by": "Administrator", "module": "Stock", "name": "Serial No", @@ -461,7 +465,6 @@ "read": 1, "report": 1, "role": "Stock Manager", - "set_user_permissions": 1, "write": 1 }, { From 98ed6445a8e121e613ac7618f60a7558500c5555 Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Sun, 16 Apr 2023 20:10:18 +0530 Subject: [PATCH 2/2] chore: `conflicts` --- erpnext/stock/doctype/serial_no/serial_no.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json index 31170f8454d..975c87024eb 100644 --- a/erpnext/stock/doctype/serial_no/serial_no.json +++ b/erpnext/stock/doctype/serial_no/serial_no.json @@ -434,11 +434,7 @@ "icon": "fa fa-barcode", "idx": 1, "links": [], -<<<<<<< HEAD - "modified": "2021-01-08 14:31:15.375996", -======= "modified": "2023-04-14 15:58:46.139887", ->>>>>>> fb3271c624 (fix: unable to change `company` for manual `Serial No` entry) "modified_by": "Administrator", "module": "Stock", "name": "Serial No",