From 78fbd6452b69097804446de61d799ae0c7a5a0ce Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 19 Jun 2023 09:14:43 +0530 Subject: [PATCH] fix: unsupported operand type(s) for //: 'float' and 'NoneType' for POS Barcode search (#35710) * fix: unsupported operand type(s) for //: 'float' and 'NoneType' for POS Barcode search (#35710) (cherry picked from commit 58a6bbcf6d95f59821484ff29b585c10529a0fe4) # Conflicts: # erpnext/selling/page/point_of_sale/point_of_sale.py * chore: resolve conflicts --------- Co-authored-by: Vishal Dhayagude Co-authored-by: Deepesh Garg --- erpnext/selling/page/point_of_sale/point_of_sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.py b/erpnext/selling/page/point_of_sale/point_of_sale.py index 62b31058720..fd2338174cd 100644 --- a/erpnext/selling/page/point_of_sale/point_of_sale.py +++ b/erpnext/selling/page/point_of_sale/point_of_sale.py @@ -65,7 +65,7 @@ def search_by_term(search_term, warehouse, price_list): "item_code": item_code, "batch_no": batch_no, }, - fields=["uom", "stock_uom", "currency", "price_list_rate", "batch_no"], + fields=["uom", "currency", "price_list_rate", "batch_no"], ) def __sort(p):