Skip to content

fix: valuation tax entries on LCV after billing PR by GursheenK [frappe] PR#40187

Bot Dokos requested to merge ft-pr-40187 into develop

From: https://github.com/frappe/erpnext/pull/40187
Date: 2024-06-15 20:41:22+05:30

  • Merge pull request #40187 from GursheenK/valuation-tax-gle-via-lcv
  • chore: resolve conflicts
  • fix: reset perpetual inventory flag after test
  • fix: parameters for PI references
  • test: LCV entries after billing
  • fix: add LCV flag to determine negative expenses



Diagnostics

pre-commit failed for source commit: baa3fee1bf9ce814a889ecf264fb6bac4ebaf93c
Run ruff linter..........................................................Failed
- hook id: ruff
- exit code: 1

erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:268:7: UP030 Use implicit references for positional format fields
erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:271:13: RUF005 Consider `[item.valuation_rate, *serial_nos]` instead of concatenation
Found 2 errors.
No fixes available (2 hidden fixes can be enabled with the `--unsafe-fixes` option).

Run ruff formatter.......................................................Failed
- hook id: ruff-format
- files were modified by this hook

1 file reformatted, 2 files left unchanged


pre-commit failed for source commit: 53642e7417c54197ba526625902d2671a7a564c2
Run ruff linter..........................................................Failed
- hook id: ruff
- exit code: 1

erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py:2525:3: F841 Local variable `lcv` is assigned to but never used
Found 1 error.
No fixes available (1 hidden fix can be enabled with the `--unsafe-fixes` option).


pre-commit failed for source commit: 8b3d46610eacd27edbceaefff6452efb68a83365
Run ruff linter..........................................................Failed
- hook id: ruff
- exit code: 1

erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:272:7: UP030 Use implicit references for positional format fields
erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:275:13: RUF005 Consider `[item.valuation_rate, *serial_nos]` instead of concatenation
erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py:2525:3: F841 Local variable `lcv` is assigned to but never used
Found 3 errors.
No fixes available (3 hidden fixes can be enabled with the `--unsafe-fixes` option).


pre-commit failed for source commit: 54a58e9205af43f4aabe1668e8d8cf925a226536
Run ruff linter..........................................................Failed
- hook id: ruff
- exit code: 1

erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:272:7: UP030 Use implicit references for positional format fields
erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:275:13: RUF005 Consider `[item.valuation_rate, *serial_nos]` instead of concatenation
Found 2 errors.
No fixes available (2 hidden fixes can be enabled with the `--unsafe-fixes` option).


pre-commit failed for source commit: 7479459cb6b79ccac04930b8feec8251a438fbce
Run ruff linter..........................................................Failed
- hook id: ruff
- exit code: 1

erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py:2559:3: F841 Local variable `rej_warehouse` is assigned to but never used
erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py:2606:3: F821 Undefined name `make_landed_cost_voucher`
Found 2 errors.
No fixes available (1 hidden fix can be enabled with the `--unsafe-fixes` option).


Suspicious merge commit detected: 7479459cb6b79ccac04930b8feec8251a438fbce



Checkout instructions
# Checkout locally
git fetch upstream
git switch ft-pr-40187

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-40187

# Make changes then rebase
git rebase -i develop

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

Merge request reports