Skip to content

refactor: prevent foreign currency subscription for a party by ruthra-kumar [frappe] PR#39332

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

From: https://github.com/frappe/erpnext/pull/39332
Date: 2024-01-15 15:05:31+05:30

  • Merge pull request #39332 from ruthra-kumar/validate_subscription_billing_currency
  • refactor(test): supply default currency for subscription plans
  • refactor: making currency mandatory for subcscription plans
  • refactor: prevent foreign currency subscription for a party


Diagnostics

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

erpnext/accounts/doctype/subscription/subscription.py:11:1: F401 'frappe.utils.data.add_months' imported but unused
erpnext/accounts/doctype/subscription/subscription.py:11:1: F401 'frappe.utils.data.cint' imported but unused
erpnext/accounts/doctype/subscription/subscription.py:11:1: F401 'frappe.utils.data.date_diff' imported but unused
erpnext/accounts/doctype/subscription/subscription.py:11:1: F401 'frappe.utils.data.get_last_day' imported but unused
erpnext/accounts/doctype/subscription/subscription.py:142:18: F821 undefined name 'posting_date'
erpnext/accounts/doctype/subscription/subscription.py:156:2: F811 redefinition of unused 'validate' from line 109
erpnext/accounts/doctype/subscription/subscription.py:162:23: F821 undefined name 'get_default_cost_center'
erpnext/accounts/doctype/subscription/subscription.py:198:2: F811 redefinition of unused 'validate_trial_period' from line 123
erpnext/accounts/doctype/subscription/subscription.py:212:2: F811 redefinition of unused 'validate_end_date' from line 131
erpnext/accounts/doctype/subscription/subscription.py:523:4: F821 undefined name 'global_date_format'
erpnext/accounts/doctype/subscription/subscription.py:527:4: F821 undefined name 'global_date_format'
erpnext/accounts/doctype/subscription/subscription.py:536:57: F821 undefined name 'global_date_format'
erpnext/accounts/doctype/subscription/subscription.py:645:12: F821 undefined name 'get_mapped_doc'


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

erpnext/accounts/doctype/subscription_plan/subscription_plan.py:37:4: F821 undefined name 'frappe'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:37:17: F821 undefined name '_'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:40:2: F821 undefined name 'frappe'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:44:9: F821 undefined name 'frappe'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:50:21: F821 undefined name 'frappe'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:54:11: F821 undefined name 'get_price'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:63:3: F842 local variable 'disabled' is annotated but never used
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:63:13: F821 undefined name 'DF'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:64:3: F842 local variable 'plan_name' is annotated but never used
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:64:14: F821 undefined name 'DF'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:65:3: F842 local variable 'portal_description' is annotated but never used
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:65:23: F821 undefined name 'DF'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:66:3: F842 local variable 'portal_image' is annotated but never used
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:66:17: F821 undefined name 'DF'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:67:3: F842 local variable 'subscription_plans_template' is annotated but never used
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:67:32: F821 undefined name 'DF'
erpnext/accounts/doctype/subscription_plan/subscription_plan.py:67:41: F821 undefined name 'SubscriptionPlanDetail'


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

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

    Traceback (most recent call last):
      File "/root/.cache/pre-commit/repo0wlj_bqb/py_env-python3.10/lib/python3.10/site-packages/pre_commit_hooks/check_ast.py", line 21, 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/test_subscription.py", line 289
        		frappe.flags.current_date = add_days(subscription.current_invoice_end, 1)
        	^
    IndentationError: unexpected indent

debug statements (python)................................................Failed
- hook id: debug-statements
- exit code: 1

erpnext/accounts/doctype/subscription/test_subscription.py - Could not parse ast

	Traceback (most recent call last):
	  File "/root/.cache/pre-commit/repo0wlj_bqb/py_env-python3.10/lib/python3.10/site-packages/pre_commit_hooks/debug_statement_hook.py", line 56, in check_file
	    ast_obj = 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/test_subscription.py", line 289
	    		frappe.flags.current_date = add_days(subscription.current_invoice_end, 1)
	    	^
	IndentationError: unexpected indent

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

erpnext/accounts/doctype/subscription/test_subscription.py:289:3: E999 IndentationError: unexpected indent


Suspicious merge commit detected: a4ddf934920f622fba68f08d893041a7810394d1


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

# 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