nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 23:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: allow to pick manually qty / batches / serial nos

Browse Source 
(cherry picked from commit 50dd9fa8a3)

# Conflicts:
#	erpnext/stock/doctype/pick_list/pick_list.json
This commit is contained in:
Rohit Waghchaure
2024-03-27 22:53:42 +05:30
committed by Mergify
parent d3044e635e
commit 5ea11af36b
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/stock/doctype/pick_list/pick_list.json
View File

@@ -18,6 +18,7 @@
"parent_warehouse", "parent_warehouse",
"consider_rejected_warehouses", "consider_rejected_warehouses",
"get_item_locations", "get_item_locations",
"pick_manually",
"section_break_6", "section_break_6",
"scan_barcode", "scan_barcode",
"column_break_13", "column_break_13",
@@ -192,11 +193,22 @@
"fieldname": "consider_rejected_warehouses", "fieldname": "consider_rejected_warehouses",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Consider Rejected Warehouses" "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, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-02-02 16:17:44.877426", "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", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Pick List", "name": "Pick List",

5
erpnext/stock/doctype/pick_list/pick_list.py
View File

@@ -42,6 +42,7 @@ class PickList(Document):
amended_from: DF.Link | None amended_from: DF.Link | None
company: DF.Link company: DF.Link
consider_rejected_warehouses: DF.Check
customer: DF.Link | None customer: DF.Link | None
customer_name: DF.Data | None customer_name: DF.Data | None
for_qty: DF.Float for_qty: DF.Float
@@ -50,6 +51,7 @@ class PickList(Document):
material_request: DF.Link | None material_request: DF.Link | None
naming_series: DF.Literal["STO-PICK-.YYYY.-"] naming_series: DF.Literal["STO-PICK-.YYYY.-"]
parent_warehouse: DF.Link | None parent_warehouse: DF.Link | None
pick_manually: DF.Check
prompt_qty: DF.Check prompt_qty: DF.Check
purpose: DF.Literal["Material Transfer for Manufacture", "Material Transfer", "Delivery"] purpose: DF.Literal["Material Transfer for Manufacture", "Material Transfer", "Delivery"]
scan_barcode: DF.Data | None scan_barcode: DF.Data | None
@@ -71,7 +73,8 @@ class PickList(Document):
def before_save(self): def before_save(self):
self.update_status() self.update_status()
self.set_item_locations() if not self.pick_manually:
self.set_item_locations()
if self.get("locations"): if self.get("locations"):
self.validate_sales_order_percentage() self.validate_sales_order_percentage()