| commit | 62c02104638822004c54da0af4bbfcd93965cdbf | [log] [tgz] |
|---|---|---|
| author | Daizy Modi <modidaizy5217@gmail.com> | Fri Nov 18 12:07:52 2022 +0530 |
| committer | Daizy Modi <modidaizy5217@gmail.com> | Fri Nov 18 12:07:52 2022 +0530 |
| tree | 2db4bbcd8de99c5f3512601641a999fedce8b033 | |
| parent | 48413b07789087fc65109e54cd22a34d0204cbc4 [diff] | |
| parent | d1f85dd9fc44a2d8e6f4742d0fcc6e08aa2d6ead [diff] |
Merge branch 'develop' into perf-fix-get-cached-value-for-accounts
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