Skip to content

Merge branch 'develop' of https://github.com/frappe/erpnext into asset_purchase_receipt_gl [frappe]

Bot Dokos requested to merge ft-commit-0b674b608bdac2 into develop

From: https://github.com/frappe/erpnext/commit/0b674b608bdac25055627bf2a8e230f12b23028e
Date: 2023-10-20 16:50:52+05:30
By: Deepesh Garg

Merge branch 'develop' of https://github.com/frappe/erpnext into asset_purchase_receipt_gl

This is a commit that is not part of any pull request.


Diagnostics

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

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

    Traceback (most recent call last):
      File "/root/.cache/pre-commit/repojpsxqxbe/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/accounts/doctype/subscription_plan/subscription_plan.py", line 14
        @frappe.whitelist()
        ^
    IndentationError: expected an indented block after class definition on line 10

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

erpnext/accounts/doctype/payment_request/payment_request.py:171:22: F821 undefined name 'get_url'
erpnext/accounts/doctype/payment_request/payment_request.py:463:5: F401 'payments.payment_gateways.stripe_integration.create_stripe_subscription' imported but unused
erpnext/accounts/doctype/payment_request/payment_request.py:483:19: F821 undefined name 'get_url'
erpnext/accounts/doctype/payment_request/payment_request.py:664:2: F821 undefined name 'filters'
erpnext/accounts/doctype/payment_request/payment_request.py:665:48: F821 undefined name 'filters'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:14:2: E999 IndentationError: expected an indented block after class definition on line 10
erpnext/accounts/doctype/tax_rule/tax_rule.py:15:1: F401 'erpnext.e_commerce.shopping_cart.cart.get_shopping_cart_settings' imported but unused
erpnext/selling/doctype/quotation/quotation.py:10:1: F401 'erpnext.e_commerce.shopping_cart.cart.get_shopping_cart_settings' imported but unused
erpnext/utilities/product.py:16:25: F821 undefined name 'nowdate'
erpnext/utilities/product.py:17:47: F821 undefined name 'nowdate'
erpnext/utilities/product.py:20:6: F821 undefined name 'uom'
erpnext/utilities/product.py:21:39: F821 undefined name 'uom'
erpnext/utilities/product.py:27:20: F821 undefined name 'stock_uom'
erpnext/utilities/product.py:28:39: F821 undefined name 'stock_uom'
erpnext/utilities/product.py:110:31: F821 undefined name 'uom'
erpnext/utilities/product.py:110:63: F821 undefined name 'uom'


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

erpnext/controllers/selling_controller.py:9:1: F401 'erpnext.accounts.party.render_address' imported but unused
erpnext/controllers/selling_controller.py:597:4: F811 redefinition of unused 'render_address' from line 9


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

erpnext/accounts/party.py:9:1: F401 'frappe.contacts.doctype.contact.contact.get_contact_details' imported but unused


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

erpnext/accounts/party.py:9:1: F401 'frappe.contacts.doctype.contact.contact.get_contact_details' imported but unused


Cleaning files from denylist:
 .github/workflows/patch.yml | 160 ++++++++++++++++++++++++++++++++++++++++++++
 .mergify.yml                | 101 ++++++++++++++++++++++++++++
 2 files changed, 261 insertions(+)


pre-commit failed for source commit: 79d51a0a0b685909371e9bda68d9702fb287c53e
eslint...................................................................Failed
- hook id: eslint
- exit code: 1

erpnext/stock/doctype/delivery_trip/delivery_trip.js
  83:10  error  Parsing error: Unexpected token function

✖ 1 problem (1 error, 0 warnings)


Checkout instructions 
# Checkout locally
git fetch upstream
git switch ft-commit-0b674b608bdac2

# 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