From 2f4940cc269ab6402dae649ebd9e2f9dfc18d1e7 Mon Sep 17 00:00:00 2001 From: Sabu Siyad Date: Thu, 17 Nov 2022 12:56:42 +0530 Subject: [PATCH 1/3] fix(pos): item selector image border radius Signed-off-by: Sabu Siyad --- erpnext/public/scss/point-of-sale.scss | 6 ++++++ erpnext/selling/page/point_of_sale/pos_item_selector.js | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/erpnext/public/scss/point-of-sale.scss b/erpnext/public/scss/point-of-sale.scss index 7a3854cc61..7b7530b150 100644 --- a/erpnext/public/scss/point-of-sale.scss +++ b/erpnext/public/scss/point-of-sale.scss @@ -159,6 +159,12 @@ } } + .item-img { + @extend .image; + border-radius: 8px 8px 0 0; + object-fit: cover; + } + > .item-detail { display: flex; flex-direction: column; diff --git a/erpnext/selling/page/point_of_sale/pos_item_selector.js b/erpnext/selling/page/point_of_sale/pos_item_selector.js index 7a90fb044f..b5eb0489f9 100644 --- a/erpnext/selling/page/point_of_sale/pos_item_selector.js +++ b/erpnext/selling/page/point_of_sale/pos_item_selector.js @@ -103,9 +103,9 @@ erpnext.PointOfSale.ItemSelector = class {
${frappe.get_abbr(item.item_name)} + >
`; } else { return `
From fd3c7903ba454b163b97c5040b49951a7ac4eb4d Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Thu, 17 Nov 2022 14:18:05 +0530 Subject: [PATCH 2/3] chore: typo --- erpnext/stock/doctype/quality_inspection/quality_inspection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/quality_inspection/quality_inspection.py b/erpnext/stock/doctype/quality_inspection/quality_inspection.py index e44e1b7e9d..9321c2c166 100644 --- a/erpnext/stock/doctype/quality_inspection/quality_inspection.py +++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.py @@ -222,7 +222,7 @@ def item_query(doctype, txt, searchfield, start, page_len, filters): from frappe.desk.reportview import get_match_cond from_doctype = cstr(filters.get("doctype")) - if not from_doctype or not frappe.db.exist("DocType", from_doctype): + if not from_doctype or not frappe.db.exists("DocType", from_doctype): return [] mcond = get_match_cond(from_doctype) From 546c809cbeead2b556b3b09b632f3d73a500900e Mon Sep 17 00:00:00 2001 From: Sabu Siyad Date: Thu, 17 Nov 2022 17:46:49 +0530 Subject: [PATCH 3/3] fix: use `list()` on self mutating iteration https://github.com/frappe/erpnext/issues/30325 Signed-off-by: Sabu Siyad --- erpnext/erpnext_integrations/taxjar_integration.py | 2 +- erpnext/stock/report/stock_ledger/stock_ledger.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/erpnext_integrations/taxjar_integration.py b/erpnext/erpnext_integrations/taxjar_integration.py index b8893aa773..2d9093b6e9 100644 --- a/erpnext/erpnext_integrations/taxjar_integration.py +++ b/erpnext/erpnext_integrations/taxjar_integration.py @@ -302,7 +302,7 @@ def check_for_nexus(doc, tax_dict): item.tax_collectable = flt(0) item.taxable_amount = flt(0) - for tax in doc.taxes: + for tax in list(doc.taxes): if tax.account_head == TAX_ACCOUNT_HEAD: doc.taxes.remove(tax) return diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py index af7f20f3cc..b725d49de7 100644 --- a/erpnext/stock/report/stock_ledger/stock_ledger.py +++ b/erpnext/stock/report/stock_ledger/stock_ledger.py @@ -394,7 +394,7 @@ def get_opening_balance(filters, columns, sl_entries): ) # check if any SLEs are actually Opening Stock Reconciliation - for sle in sl_entries: + for sle in list(sl_entries): if ( sle.get("voucher_type") == "Stock Reconciliation" and sle.posting_date == filters.from_date