nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix/scr-return-rejected-qty

Browse Source
This commit is contained in:
Sagar Sharma
2022-11-18 12:06:59 +05:30
committed by GitHub
parent da4c20f7be d1f85dd9fc
commit 29132609ff
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/erpnext_integrations/taxjar_integration.py
View File

@@ -302,7 +302,7 @@ def check_for_nexus(doc, tax_dict):
item.tax_collectable = flt(0) item.tax_collectable = flt(0)
item.taxable_amount = 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: if tax.account_head == TAX_ACCOUNT_HEAD:
doc.taxes.remove(tax) doc.taxes.remove(tax)
return return

6
erpnext/public/scss/point-of-sale.scss
View File

@@ -159,6 +159,12 @@
} }
} }
.item-img {
@extend .image;
border-radius: 8px 8px 0 0;
object-fit: cover;
}
> .item-detail { > .item-detail {
display: flex; display: flex;
flex-direction: column; flex-direction: column;

4
erpnext/selling/page/point_of_sale/pos_item_selector.js
View File

@@ -103,9 +103,9 @@ erpnext.PointOfSale.ItemSelector = class {
<div class="flex items-center justify-center h-32 border-b-grey text-6xl text-grey-100"> <div class="flex items-center justify-center h-32 border-b-grey text-6xl text-grey-100">
<img <img
onerror="cur_pos.item_selector.handle_broken_image(this)" onerror="cur_pos.item_selector.handle_broken_image(this)"
class="h-full" src="${item_image}" class="h-full item-img" src="${item_image}"
alt="${frappe.get_abbr(item.item_name)}" alt="${frappe.get_abbr(item.item_name)}"
style="object-fit: cover;"> >
</div>`; </div>`;
} else { } else {
return `<div class="item-qty-pill"> return `<div class="item-qty-pill">

2
erpnext/stock/doctype/quality_inspection/quality_inspection.py
View File

@@ -222,7 +222,7 @@ def item_query(doctype, txt, searchfield, start, page_len, filters):
from frappe.desk.reportview import get_match_cond from frappe.desk.reportview import get_match_cond
from_doctype = cstr(filters.get("doctype")) 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 [] return []
mcond = get_match_cond(from_doctype) mcond = get_match_cond(from_doctype)

2
erpnext/stock/report/stock_ledger/stock_ledger.py
View File

@@ -394,7 +394,7 @@ def get_opening_balance(filters, columns, sl_entries):
) )
# check if any SLEs are actually Opening Stock Reconciliation # check if any SLEs are actually Opening Stock Reconciliation
for sle in sl_entries: for sle in list(sl_entries):
if ( if (
sle.get("voucher_type") == "Stock Reconciliation" sle.get("voucher_type") == "Stock Reconciliation"
and sle.posting_date == filters.from_date and sle.posting_date == filters.from_date