commit | 0b5584a54a09ce3ae584c4d63cfd1985549a16ca | [log] [tgz] |
---|---|---|
author | Sabu Siyad <hello@ssiyad.com> | Thu Nov 17 17:58:49 2022 +0530 |
committer | GitHub <noreply@github.com> | Thu Nov 17 17:58:49 2022 +0530 |
tree | 6d89917994b7a534006d2975c681e95469df481f | |
parent | 546c809cbeead2b556b3b09b632f3d73a500900e [diff] | |
parent | cbe8fa7fd229f8e9fe896476f494261b50cd1f39 [diff] |
Merge branch 'develop' into fix/mutate_iter_list
diff --git a/erpnext/erpnext_integrations/taxjar_integration.py b/erpnext/erpnext_integrations/taxjar_integration.py index b8893aa..2d9093b 100644 --- a/erpnext/erpnext_integrations/taxjar_integration.py +++ b/erpnext/erpnext_integrations/taxjar_integration.py
@@ -302,7 +302,7 @@ 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 af7f20f..b725d49 100644 --- a/erpnext/stock/report/stock_ledger/stock_ledger.py +++ b/erpnext/stock/report/stock_ledger/stock_ledger.py
@@ -394,7 +394,7 @@ ) # 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