From 5ea11af36b5f5f3e0ada7ecc94800683e053abf1 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 27 Mar 2024 22:53:42 +0530 Subject: [PATCH 1/2] feat: allow to pick manually qty / batches / serial nos (cherry picked from commit 50dd9fa8a32b8cd29b50d1c6181dfd8f6f5d27b6) # Conflicts: # erpnext/stock/doctype/pick_list/pick_list.json --- erpnext/stock/doctype/pick_list/pick_list.json | 12 ++++++++++++ erpnext/stock/doctype/pick_list/pick_list.py | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/pick_list/pick_list.json b/erpnext/stock/doctype/pick_list/pick_list.json index 0c474342a97..927d1a61edc 100644 --- a/erpnext/stock/doctype/pick_list/pick_list.json +++ b/erpnext/stock/doctype/pick_list/pick_list.json @@ -18,6 +18,7 @@ "parent_warehouse", "consider_rejected_warehouses", "get_item_locations", + "pick_manually", "section_break_6", "scan_barcode", "column_break_13", @@ -192,11 +193,22 @@ "fieldname": "consider_rejected_warehouses", "fieldtype": "Check", "label": "Consider Rejected Warehouses" + }, + { + "default": "0", + "description": "If enabled then system won't override the picked qty / batches / serial numbers.", + "fieldname": "pick_manually", + "fieldtype": "Check", + "label": "Pick Manually" } ], "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2024-02-02 16:17:44.877426", +======= + "modified": "2024-03-27 22:49:16.954637", +>>>>>>> 50dd9fa8a3 (feat: allow to pick manually qty / batches / serial nos) "modified_by": "Administrator", "module": "Stock", "name": "Pick List", diff --git a/erpnext/stock/doctype/pick_list/pick_list.py b/erpnext/stock/doctype/pick_list/pick_list.py index 4eab7e8a0cf..e6fb984785d 100644 --- a/erpnext/stock/doctype/pick_list/pick_list.py +++ b/erpnext/stock/doctype/pick_list/pick_list.py @@ -42,6 +42,7 @@ class PickList(Document): amended_from: DF.Link | None company: DF.Link + consider_rejected_warehouses: DF.Check customer: DF.Link | None customer_name: DF.Data | None for_qty: DF.Float @@ -50,6 +51,7 @@ class PickList(Document): material_request: DF.Link | None naming_series: DF.Literal["STO-PICK-.YYYY.-"] parent_warehouse: DF.Link | None + pick_manually: DF.Check prompt_qty: DF.Check purpose: DF.Literal["Material Transfer for Manufacture", "Material Transfer", "Delivery"] scan_barcode: DF.Data | None @@ -71,7 +73,8 @@ class PickList(Document): def before_save(self): self.update_status() - self.set_item_locations() + if not self.pick_manually: + self.set_item_locations() if self.get("locations"): self.validate_sales_order_percentage() From 52c4157723663e638068493fb15c0208e9f8531d Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 2 Apr 2024 22:23:22 +0530 Subject: [PATCH 2/2] chore: fix conflicts --- erpnext/stock/doctype/pick_list/pick_list.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/stock/doctype/pick_list/pick_list.json b/erpnext/stock/doctype/pick_list/pick_list.json index 927d1a61edc..0e466e44d1b 100644 --- a/erpnext/stock/doctype/pick_list/pick_list.json +++ b/erpnext/stock/doctype/pick_list/pick_list.json @@ -204,11 +204,7 @@ ], "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2024-02-02 16:17:44.877426", -======= "modified": "2024-03-27 22:49:16.954637", ->>>>>>> 50dd9fa8a3 (feat: allow to pick manually qty / batches / serial nos) "modified_by": "Administrator", "module": "Stock", "name": "Pick List",