Merge branch 'develop' into internal_transfer
This commit is contained in:
commit
cbfd8da848
@ -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
|
||||
|
@ -159,6 +159,12 @@
|
||||
}
|
||||
}
|
||||
|
||||
.item-img {
|
||||
@extend .image;
|
||||
border-radius: 8px 8px 0 0;
|
||||
object-fit: cover;
|
||||
}
|
||||
|
||||
> .item-detail {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
@ -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">
|
||||
<img
|
||||
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)}"
|
||||
style="object-fit: cover;">
|
||||
>
|
||||
</div>`;
|
||||
} else {
|
||||
return `<div class="item-qty-pill">
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user