Skip to content

refactor: support payment against reverse payment reconciliation by ruthra-kumar [frappe] PR#40260

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

From: https://github.com/frappe/erpnext/pull/40260
Date: 2024-03-15 12:51:38+05:30

  • Merge pull request #40260 from ruthra-kumar/support_payment_against_payment
  • refactor(test): generate and use unique party
  • test: advance payment reconciliation against payment
  • test: reverse payment reconciliation
  • refactor: support payment against reverse payment reconciliation


Diagnostics

pre-commit failed for source commit: 5f15297f28d02289746946f46366044bc2b18c8e
check python ast.........................................................Failed
- hook id: check-ast
- exit code: 1

erpnext/accounts/doctype/payment_entry/payment_entry.py: failed parsing with CPython 3.10.13:

    Traceback (most recent call last):
      File "/root/.cache/pre-commit/repo2vdt_l8j/py_env-python3.10/lib/python3.10/site-packages/pre_commit_hooks/check_ast.py", line 21, in main
        ast.parse(f.read(), filename=filename)
      File "/usr/local/lib/python3.10/ast.py", line 50, in parse
        return compile(source, filename, mode, flags,
      File "erpnext/accounts/doctype/payment_entry/payment_entry.py", line 1258
        				gle = party_gl_dict.copy()
        			^
    IndentationError: unexpected indent

debug statements (python)................................................Failed
- hook id: debug-statements
- exit code: 1

erpnext/accounts/doctype/payment_entry/payment_entry.py - Could not parse ast

	Traceback (most recent call last):
	  File "/root/.cache/pre-commit/repo2vdt_l8j/py_env-python3.10/lib/python3.10/site-packages/pre_commit_hooks/debug_statement_hook.py", line 56, in check_file
	    ast_obj = ast.parse(f.read(), filename=filename)
	  File "/usr/local/lib/python3.10/ast.py", line 50, in parse
	    return compile(source, filename, mode, flags,
	  File "erpnext/accounts/doctype/payment_entry/payment_entry.py", line 1258
	    				gle = party_gl_dict.copy()
	    			^
	IndentationError: unexpected indent

flake8...................................................................Failed
- hook id: flake8
- exit code: 1

erpnext/accounts/doctype/payment_entry/payment_entry.py:1258:5: E999 IndentationError: unexpected indent


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

erpnext/accounts/doctype/payment_entry/test_payment_entry.py:10:1: F401 'erpnext.accounts.doctype.payment_entry.payment_entry.InvalidPaymentEntry' imported but unused


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

erpnext/accounts/doctype/payment_entry/test_payment_entry.py:10:1: F401 'erpnext.accounts.doctype.payment_entry.payment_entry.InvalidPaymentEntry' imported but unused


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

erpnext/accounts/doctype/payment_entry/test_payment_entry.py:10:1: F401 'erpnext.accounts.doctype.payment_entry.payment_entry.InvalidPaymentEntry' imported but unused


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

erpnext/accounts/doctype/payment_entry/test_payment_entry.py:10:1: F401 'erpnext.accounts.doctype.payment_entry.payment_entry.InvalidPaymentEntry' imported but unused
erpnext/accounts/doctype/payment_entry/test_payment_entry.py:1544:2: F811 redefinition of unused 'check_gl_entries' from line 1354
erpnext/accounts/doctype/payment_entry/test_payment_entry.py:1560:2: F811 redefinition of unused 'test_reverse_payment_reconciliation' from line 1370
erpnext/accounts/doctype/payment_entry/test_payment_entry.py:1599:2: F811 redefinition of unused 'test_advance_reverse_payment_reconciliation' from line 1409


Suspicious merge commit detected: ec558314405b243f029483757dbe6436cf9a7c94


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

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

# 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