From dbf245c6878fb53e12d0fef6bc4e84f2017570db Mon Sep 17 00:00:00 2001 From: Devin Slauenwhite Date: Tue, 12 Jul 2022 13:05:40 -0400 Subject: [PATCH 1/3] fix: display customer name on picking list (cherry picked from commit 0a633a212d01c573668e46aa279fe04326e0b24f) # Conflicts: # erpnext/stock/doctype/pick_list/pick_list.json --- .../stock/doctype/pick_list/pick_list.json | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/erpnext/stock/doctype/pick_list/pick_list.json b/erpnext/stock/doctype/pick_list/pick_list.json index e984c082d48..acfc188717c 100644 --- a/erpnext/stock/doctype/pick_list/pick_list.json +++ b/erpnext/stock/doctype/pick_list/pick_list.json @@ -10,6 +10,7 @@ "company", "purpose", "customer", + "customer_name", "work_order", "material_request", "for_qty", @@ -126,11 +127,52 @@ "fieldtype": "Check", "label": "Group Same Items", "print_hide": 1 +<<<<<<< HEAD +======= + }, + { + "fieldname": "section_break_15", + "fieldtype": "Section Break" + }, + { + "fieldname": "scan_barcode", + "fieldtype": "Data", + "label": "Scan Barcode", + "options": "Barcode" + }, + { + "fieldname": "column_break_13", + "fieldtype": "Column Break" + }, + { + "default": "0", + "description": "If checked, picked qty won't automatically be fulfilled on submit of pick list.", + "fieldname": "scan_mode", + "fieldtype": "Check", + "label": "Scan Mode" + }, + { + "default": "0", + "fieldname": "prompt_qty", + "fieldtype": "Check", + "label": "Prompt Qty" + }, + { + "depends_on": "eval:doc.purpose==='Delivery' && doc.customer", + "fetch_from": "customer.customer_name", + "fieldname": "customer_name", + "fieldtype": "Data", + "label": "Customer Name" +>>>>>>> 0a633a212d (fix: display customer name on picking list) } ], "is_submittable": 1, "links": [], +<<<<<<< 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_by": "Administrator", "module": "Stock", "name": "Pick List", From 2381b81aaceacddae9a8a326568a955208e8b6d5 Mon Sep 17 00:00:00 2001 From: Devin Slauenwhite Date: Tue, 19 Jul 2022 11:02:43 -0400 Subject: [PATCH 2/3] 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 +} From 49fb177f869edbdb4c8f954b0d2eca8da566f673 Mon Sep 17 00:00:00 2001 From: Marica Date: Wed, 27 Jul 2022 16:22:17 +0530 Subject: [PATCH 3/3] chore: Merge Conflicts --- .../stock/doctype/pick_list/pick_list.json | 42 ------------------- 1 file changed, 42 deletions(-) diff --git a/erpnext/stock/doctype/pick_list/pick_list.json b/erpnext/stock/doctype/pick_list/pick_list.json index dca107b1b9f..dfa307de490 100644 --- a/erpnext/stock/doctype/pick_list/pick_list.json +++ b/erpnext/stock/doctype/pick_list/pick_list.json @@ -127,61 +127,19 @@ "fieldtype": "Check", "label": "Group Same Items", "print_hide": 1 -<<<<<<< HEAD -======= - }, - { - "fieldname": "section_break_15", - "fieldtype": "Section Break" - }, - { - "fieldname": "scan_barcode", - "fieldtype": "Data", - "label": "Scan Barcode", - "options": "Barcode" - }, - { - "fieldname": "column_break_13", - "fieldtype": "Column Break" - }, - { - "default": "0", - "description": "If checked, picked qty won't automatically be fulfilled on submit of pick list.", - "fieldname": "scan_mode", - "fieldtype": "Check", - "label": "Scan Mode" - }, - { - "default": "0", - "fieldname": "prompt_qty", - "fieldtype": "Check", - "label": "Prompt Qty" }, { "depends_on": "eval:doc.purpose==='Delivery' && doc.customer", "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",