[go: up one dir, main page]
Skip to content

fix(minor): filter tax template based on company in subscription by GursheenK [frappe] PR#37562

Bot Dokosrequested to merge
ft-pr-37562 into develop

From: https://github.com/frappe/erpnext/pull/37562
Date: 2023-10-18 17:49:09+05:30

  • Merge pull request #37562 from GursheenK/subscription-tax-filters
  • fix: filter tax template based on company


Diagnostics

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

erpnext/accounts/doctype/subscription/subscription.js
  60:4  error  Parsing error: Unexpected token )

✖ 1 problem (1 error, 0 warnings)


pre-commit failed for source commit: 6750af90f7ede5feade2efa398faa93b2b774483
eslint...................................................................Failed
- hook id: eslint
- exit code: 1

erpnext/accounts/doctype/subscription/subscription.js
  60:4  error  Parsing error: Unexpected token )

✖ 1 problem (1 error, 0 warnings)


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

# 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