Skip to content

fix: Multiple subscription fixes by deepeshgarg007 [frappe] PR#39005

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

From: https://github.com/frappe/erpnext/pull/39005
Date: 2023-12-29 08:25:38+05:30

  • fix: Multiple subscription fixes (#39005)


Diagnostics

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

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

    Traceback (most recent call last):
      File "/root/.cache/pre-commit/repo1_z2r2lh/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/subscription/subscription.py", line 241
        				if (
        			^
    IndentationError: unexpected indent

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

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

	Traceback (most recent call last):
	  File "/root/.cache/pre-commit/repo1_z2r2lh/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/subscription/subscription.py", line 241
	    				if (
	    			^
	IndentationError: unexpected indent

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

erpnext/accounts/doctype/subscription/subscription.py:241:5: E999 IndentationError: unexpected indent


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

# 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

Merge request reports