Skip to content

chore: Add missing commits back by deepeshgarg007 [frappe] PR#37618

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

From: https://github.com/frappe/erpnext/pull/37618
Date: 2023-10-23 00:16:40+05:30

  • chore: Add missing commits back (#37618)


Diagnostics

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

erpnext/stock/doctype/purchase_receipt/purchase_receipt.py: failed parsing with CPython 3.10.13:

    Traceback (most recent call last):
      File "/root/.cache/pre-commit/repoucjpdwn8/py_env-python3.10/lib/python3.10/site-packages/pre_commit_hooks/check_ast.py", line 20, 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/stock/doctype/purchase_receipt/purchase_receipt.py", line 392
        					if (
        				^
    IndentationError: unexpected indent

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

erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:392:6: E999 IndentationError: unexpected indent


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

# 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