feat: editable journal entries by GursheenK [frappe] PR#37477
From: https://github.com/frappe/erpnext/pull/37477
Date: 2024-02-27 12:59:18+05:30
- Merge pull request #37477 from GursheenK/editable-journal-entries
- fix: test for repost accounting in JVs
- feat: add patch for making repostable dimension fields editable
- fix: allow editable accounting dimensions for repostable doctypes
- fix: disable editable account heads
- chore: rebase
- fix: test for reposting pi
- fix: check child rows before update
- chore: correct typo
- test: reposting entries for JV
- refactor: use qb for JV tests
- feat: repost ledger button in JV
- feat: validate before allowing repost
- refactor: better abstraction for controller code
- feat: update after submit in JV
- feat: allow on submit for selected fields
- refactor: remove controller logic for setting balances
- refactor: exclude balances while setting currency
- refactor: exclude balance while setting acc details
- refactor: remove balance formatter
- refactor: remove balance fields from jv account
Diagnostics
Conflicts detected for source commit: 2d78dba66f94571f444773c8fdaf0978eae516ed
- DU .github/workflows/server-tests-mariadb.yml
- DU erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py
Cleaning files from denylist:
.github/workflows/server-tests-mariadb.yml | 158 +++++++++++++++++++++++++++++
1 file changed, 158 insertions(+)
pre-commit failed for source commit: 2d78dba66f94571f444773c8fdaf0978eae516ed
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/doctype/account/test_account.py:18:19: F821 undefined name 'FrappeTestCase'
erpnext/accounts/doctype/bank_account/bank_account.py:14:1: F811 redefinition of unused 'comma_and' from line 12
erpnext/accounts/doctype/bank_account/bank_account.py:14:1: F811 redefinition of unused 'get_link_to_form' from line 12
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:5:1: F401 'unittest' imported but unused
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:16:27: F821 undefined name 'FrappeTestCase'
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:26:3: F821 undefined name 'make_pos_profile'
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:44:21: F821 undefined name 'get_linked_payments'
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:48:12: F821 undefined name 'utils'
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:59:14: F821 undefined name 'json'
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:68:3: F821 undefined name 'reconcile_vouchers'
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:90:14: F821 undefined name 'json'
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:99:3: F821 undefined name 'reconcile_vouchers'
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:103:48: F821 undefined name 'DocStatus'
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:113:21: F821 undefined name 'get_linked_payments'
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:117:12: F821 undefined name 'utils'
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:128:14: F821 undefined name 'json'
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:137:3: F821 undefined name 'reconcile_vouchers'
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:144:14: F821 undefined name 'json'
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:155:4: F821 undefined name 'reconcile_vouchers'
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:167:14: F821 undefined name 'json'
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:176:3: F821 undefined name 'reconcile_vouchers'
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:186:3: F821 undefined name 'if_lending_app_installed'
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:211:21: F821 undefined name 'create_loan_and_repayment'
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:213:21: F821 undefined name 'get_linked_payments'
erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py:217:2: F821 undefined name 'if_lending_app_installed'
erpnext/controllers/stock_controller.py:10:1: F401 'frappe.utils.cstr' imported but unused
Suspicious merge commit detected: 2d78dba66f94571f444773c8fdaf0978eae516ed
pre-commit failed for source commit: b193fafe49005791b0de531a50936981d69e3aa0
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
erpnext/accounts/doctype/journal_entry/journal_entry.py:197:2: F811 redefinition of unused 'on_update_after_submit' from line 188
Suspicious merge commit detected: b193fafe49005791b0de531a50936981d69e3aa0
Suspicious changes found (dokos|telemetry|shipping_rule|capture_doc):
4bd2010dc3da52542c144aa4122c8570f1f5f038 feat: add patch for making repostable dimension fields editable
1d6f711c67cfea5fd9341c459a5e5ec57f29b497 chore: rebase
Checkout instructions
# Checkout locally
git fetch upstream
git switch ft-pr-37477
# Make changes then rebase
git rebase -i upstream/develop --reapply-cherry-picks
# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue
# Force-push changes
git push --force-with-lease