Skip to content

fix: prorate factor in subscription invoice total by GursheenK [frappe] PR#36880

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

From: https://github.com/frappe/erpnext/pull/36880
Date: 2023-09-14 12:05:05+05:30

  • fix: prorate factor in subscription invoice total (#36880)


Diagnostics

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

erpnext/accounts/doctype/subscription_plan/subscription_plan.py:22:10: F821 undefined name 'price'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:23:4: F706 'return' outside function
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:25:4: F706 'return' outside function
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:27:7: F821 undefined name 'plan'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:28:16: F821 undefined name 'getdate'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:28:24: F821 undefined name 'start_date'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:29:14: F821 undefined name 'getdate'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:29:22: F821 undefined name 'end_date'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:31:18: F821 undefined name 'relativedelta'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:32:10: F821 undefined name 'plan'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:35:13: F821 undefined name 'frappe'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:38:12: F821 undefined name 'plan'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:38:24: F821 undefined name 'get_prorate_factor'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:39:3: F706 'return' outside function
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:43:23: F821 undefined name 'date_diff'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:43:45: F821 undefined name 'get_first_day'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:44:28: F821 undefined name 'get_last_day'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:45:19: F821 undefined name 'flt'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:47:23: F821 undefined name 'date_diff'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:47:33: F821 undefined name 'get_last_day'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:48:28: F821 undefined name 'get_last_day'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:49:20: F821 undefined name 'flt'


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

# 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