Skip to content

fix: advance journal fetching logic in Advances section by ruthra-kumar [frappe] PR#40420

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

From: https://github.com/frappe/erpnext/pull/40420
Date: 2024-03-14 15:35:06+05:30

  • Merge pull request #40420 from ruthra-kumar/fix_advance_journal_fixing_logic
  • fix: advance journal fetching logic in Advances section


Diagnostics

pre-commit failed for source commit: e786a93c2ece97d9b680127003d058b9a9e21d26
flake8...................................................................Failed
- hook id: flake8
- exit code: 1

erpnext/controllers/accounts_controller.py:2915:16: F821 undefined name 'include_unallocated_query'
erpnext/controllers/accounts_controller.py:2915:44: F821 undefined name 'order_list_query'
erpnext/controllers/accounts_controller.py:2917:16: F821 undefined name 'include_unallocated_query'
erpnext/controllers/accounts_controller.py:2920:15: F821 undefined name 'order_list_query'


pre-commit failed for source commit: 4ed7e3eacd14327513388f98caa7893511d244f1
flake8...................................................................Failed
- hook id: flake8
- exit code: 1

erpnext/controllers/accounts_controller.py:2915:16: F821 undefined name 'include_unallocated_query'
erpnext/controllers/accounts_controller.py:2915:44: F821 undefined name 'order_list_query'
erpnext/controllers/accounts_controller.py:2917:16: F821 undefined name 'include_unallocated_query'
erpnext/controllers/accounts_controller.py:2920:15: F821 undefined name 'order_list_query'


Suspicious merge commit detected: 4ed7e3eacd14327513388f98caa7893511d244f1


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

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

# 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