Skip to content

fix: future subscription updates by deepeshgarg007 [frappe] PR#41311

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

From: https://github.com/frappe/erpnext/pull/41311
Date: 2024-05-03 12:04:39+05:30

  • Merge pull request #41311 from deepeshgarg007/future_subscription_updates
  • test: Add posting dates
  • fix: future subscripition updates


Diagnostics

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

erpnext/accounts/doctype/subscription/subscription.py:101:45: F821 undefined name 'DateTimeLikeObject'
erpnext/accounts/doctype/subscription/subscription.py:112:43: F821 undefined name 'DateTimeLikeObject'
erpnext/accounts/doctype/subscription/subscription.py:118:44: F821 undefined name 'DateTimeLikeObject'
erpnext/accounts/doctype/subscription/subscription.py:118:81: F821 undefined name 'DateTimeLikeObject'
erpnext/accounts/doctype/subscription/subscription.py:137:42: F821 undefined name 'DateTimeLikeObject'
erpnext/accounts/doctype/subscription/subscription.py:137:79: F821 undefined name 'DateTimeLikeObject'
erpnext/accounts/doctype/subscription/subscription.py:154:29: F821 undefined name 'add_to_date'
erpnext/accounts/doctype/subscription/subscription.py:158:30: F821 undefined name 'add_to_date'
erpnext/accounts/doctype/subscription/subscription.py:160:29: F821 undefined name 'add_to_date'
erpnext/accounts/doctype/subscription/subscription.py:162:28: F821 undefined name 'get_last_day'
erpnext/accounts/doctype/subscription/subscription.py:170:12: F821 undefined name 'add_months'
erpnext/accounts/doctype/subscription/subscription.py:171:28: F821 undefined name 'get_last_day'
erpnext/accounts/doctype/subscription/subscription.py:231:50: F821 undefined name 'DateTimeLikeObject'
erpnext/accounts/doctype/subscription/subscription.py:255:13: F821 undefined name 'DateTimeLikeObject'
erpnext/accounts/doctype/subscription/subscription.py:255:47: F821 undefined name 'DateTimeLikeObject'
erpnext/accounts/doctype/subscription/subscription.py:267:24: F821 undefined name 'cint'
erpnext/accounts/doctype/subscription/subscription.py:275:47: F821 undefined name 'DateTimeLikeObject'
erpnext/accounts/doctype/subscription/subscription.py:282:18: F821 undefined name 'cint'
erpnext/accounts/doctype/subscription/subscription.py:285:54: F821 undefined name 'DateTimeLikeObject'
erpnext/accounts/doctype/subscription/subscription.py:448:12: F821 undefined name 'posting_date'
erpnext/accounts/doctype/subscription/subscription.py:452:12: F821 undefined name 'posting_date'
erpnext/accounts/doctype/subscription/subscription.py:454:4: F821 undefined name 'customer'
erpnext/accounts/doctype/subscription/subscription.py:455:4: F821 undefined name 'customer'


Suspicious merge commit detected: 69d68592ad556e1aaab3fd374d7e0befd4a45281


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

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

# 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