From 2381b81aaceacddae9a8a326568a955208e8b6d5 Mon Sep 17 00:00:00 2001 From: Devin Slauenwhite Date: Tue, 19 Jul 2022 11:02:43 -0400 Subject: [PATCH] fix: make customer_name field read only. (cherry picked from commit 7083b3148b736567a2e1c684dcaf4918835d4332) # Conflicts: # erpnext/stock/doctype/pick_list/pick_list.json --- erpnext/stock/doctype/pick_list/pick_list.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/pick_list/pick_list.json b/erpnext/stock/doctype/pick_list/pick_list.json index acfc188717c..dca107b1b9f 100644 --- a/erpnext/stock/doctype/pick_list/pick_list.json +++ b/erpnext/stock/doctype/pick_list/pick_list.json @@ -162,17 +162,26 @@ "fetch_from": "customer.customer_name", "fieldname": "customer_name", "fieldtype": "Data", +<<<<<<< HEAD "label": "Customer Name" >>>>>>> 0a633a212d (fix: display customer name on picking list) +======= + "label": "Customer Name", + "read_only": 1 +>>>>>>> 7083b3148b (fix: make customer_name field read only.) } ], "is_submittable": 1, "links": [], +<<<<<<< HEAD <<<<<<< HEAD "modified": "2022-04-21 07:56:40.646473", ======= "modified": "2022-07-12 13:03:04.442174", >>>>>>> 0a633a212d (fix: display customer name on picking list) +======= + "modified": "2022-07-19 11:03:04.442174", +>>>>>>> 7083b3148b (fix: make customer_name field read only.) "modified_by": "Administrator", "module": "Stock", "name": "Pick List", @@ -244,4 +253,4 @@ "sort_order": "DESC", "states": [], "track_changes": 1 -} \ No newline at end of file +}