fix: move bank validation out of override class into hook (#142)

.pre-commit-config.yaml

@@ -7,8 +7,8 @@ repos:
     rev: v4.3.0
     hooks:
       - id: trailing-whitespace
-        files: "frappe.*"
-        exclude: ".*json$|.*txt$|.*csv|.*md|.*svg"
+        files: 'frappe.*'
+        exclude: '.*json$|.*txt$|.*csv|.*md|.*svg'
       - id: check-yaml
       - id: no-commit-to-branch
         args: ['--branch', 'develop']
@@ -37,22 +37,22 @@ repos:
         types_or: [javascript]
         # Ignore any files that might contain jinja / bundles
         exclude: |
-            (?x)^(
-                frappe/public/dist/.*|
-                .*node_modules.*|
-                .*boilerplate.*|
-                frappe/www/website_script.js|
-                frappe/templates/includes/.*|
-                frappe/public/js/lib/.*
-            )$
+          (?x)^(
+              frappe/public/dist/.*|
+              .*node_modules.*|
+              .*boilerplate.*|
+              frappe/www/website_script.js|
+              frappe/templates/includes/.*|
+              frappe/public/js/lib/.*
+          )$
 
   - repo: https://github.com/PyCQA/flake8
     rev: 5.0.4
     hooks:
       - id: flake8
-        additional_dependencies: ['flake8-bugbear',]
+        additional_dependencies: ['flake8-bugbear']
 
 ci:
-    autoupdate_schedule: weekly
-    skip: []
-    submodules: false
+  autoupdate_schedule: weekly
+  skip: []
+  submodules: false

.prettierrc.js

@@ -16,4 +16,4 @@ module.exports = {
 	trailingComma: 'es5',
 	useTabs: true,
 	vueIndentScriptAndStyle: false,
-}
+}

check_run/__init__.py

@@ -1,3 +1 @@
-
-__version__ = '14.0.0'
-
+__version__ = "14.0.0"

check_run/check_run/doctype/check_run/test_check_run.py

@@ -7,5 +7,3 @@
 
 class TestCheckRun(unittest.TestCase):
 	pass
-
-

check_run/check_run/doctype/check_run_settings/check_run_settings.py

@@ -4,15 +4,16 @@
 import frappe
 from frappe.model.document import Document
 
+
 class CheckRunSettings(Document):
 	pass
 
 
 @frappe.whitelist()
 def create(company, bank_account, pay_to_account):
-	crs =frappe.new_doc('Check Run Settings')
+	crs = frappe.new_doc("Check Run Settings")
 	crs.company = company
 	crs.bank_account = bank_account
 	crs.pay_to_account = pay_to_account
 	crs.save()
-	return crs.name
+	return crs.name

check_run/check_run/doctype/check_run_settings/test_check_run_settings.py

@@ -4,5 +4,6 @@
 # import frappe
 import unittest
 
+
 class TestCheckRunSettings(unittest.TestCase):
 	pass

check_run/check_run/report/positive_pay/positive_pay.py

@@ -3,17 +3,19 @@
 
 import frappe
 
+
 def execute(filters=None):
 	print(filters)
 	return get_columns(filters), get_data(filters)
 
+
 def get_columns(filters):
 	return [
 		{
 			"label": frappe._("Check Date"),
 			"fieldname": "check_date",
 			"fieldtype": "Date",
-			"width": "150px"
+			"width": "150px",
 		},
 		{
 			"label": frappe._("Check Number"),
@@ -29,8 +31,10 @@ def get_columns(filters):
 		},
 	]
 
+
 def get_data(filters):
-	return frappe.db.sql("""
+	return frappe.db.sql(
+		"""
 		SELECT
 			`tabPayment Entry`.reference_no AS check_number,
 			`tabPayment Entry`.reference_date AS check_date,
@@ -44,9 +48,11 @@ def get_data(filters):
 		AND `tabPayment Entry`.mode_of_payment = 'Check'
 		AND `tabPayment Entry`.docstatus = 1
 		ORDER BY check_date
-		""", {
-			'start_date': filters.start_date,
-			'end_date': filters.end_date,
-			'bank_account': filters.bank_account
-	}, as_dict=True)
-
+		""",
+		{
+			"start_date": filters.start_date,
+			"end_date": filters.end_date,
+			"bank_account": filters.bank_account,
+		},
+		as_dict=True,
+	)

check_run/config/desktop.py

@@ -1,12 +1,13 @@
 from frappe import _
 
+
 def get_data():
 	return [
 		{
 			"module_name": "Check Run",
 			"color": "grey",
 			"icon": "octicon octicon-file-directory",
 			"type": "module",
-			"label": _("Check Run")
+			"label": _("Check Run"),
 		}
 	]

check_run/config/docs.py

@@ -7,5 +7,6 @@
 # headline = "App that does everything"
 # sub_heading = "Yes, you got that right the first time, everything"
 
+
 def get_context(context):
 	context.brand_html = "Check Run"

check_run/hooks.py

@@ -94,14 +94,14 @@
 # DocType Class
 # ---------------
 # Override standard doctype classes
-
-override_doctype_class = {"Bank": "check_run.overrides.bank.CustomBank"}
+# override_doctype_class = {"Bank": "check_run.overrides.bank.CustomBank"}
 
 # Document Events
 # ---------------
 # Hook on document methods and events
 
 doc_events = {
+	"Bank": {"validate": ["check_run.overrides.bank.validate"]},
 	"Payment Entry": {
 		"on_submit": "check_run.overrides.payment_entry.update_check_number",
 	},

check_run/overrides/bank.py

@@ -1,32 +1,28 @@
 import frappe
-from frappe import _
-from frappe.utils import cint, flt
 
-from erpnext.accounts.doctype.bank.bank import Bank
 
+@frappe.whitelist()
+def validate(doc, method=None):
+	# Canadian banking institutions limit DFI Routing Numbers to 8 characters
+	addresses = frappe.qb.DocType("Address")
+	dls = frappe.qb.DocType("Dynamic Link")
 
-class CustomBank(Bank):
-	def validate(self):
-		# Canadian banking institutions limit DFI Routing Numbers to 8 characters
-		addresses = frappe.qb.DocType('Address')
-		dls = frappe.qb.DocType('Dynamic Link')
+	countries_qb = (
+		frappe.qb.from_(addresses)
+		.inner_join(dls)
+		.on(addresses.name == dls.parent)
+		.select(addresses.country)
+		.where(dls.parenttype == "Address")
+		.where(dls.link_doctype == "Bank")
+		.where(dls.link_name == doc.name)
+	)
 
-		countries_qb = (
-			frappe.qb.from_(addresses)
-				.inner_join(dls)
-				.on(addresses.name == dls.parent)
-				.select(addresses.country)
-				.where(dls.parenttype == 'Address')
-				.where(dls.link_doctype == 'Bank')
-				.where(dls.link_name == self.name)
-		)
-
-		countries = frappe.db.sql(
-			countries_qb,
-			as_dict=True,
-			pluck='country'
-		)
-		if 'Canada' in countries:
-			if len(self.aba_number) > 8:
-				frappe.throw(_("This Bank is linked to at least one Canadian address. Canadian banking institutions require the ABA Number must not exceed 8 characters."))
-		return
+	countries = frappe.db.sql(countries_qb, as_dict=True, pluck="country")
+	if "Canada" in countries:
+		if len(doc.aba_number) > 8:
+			frappe.throw(
+				frappe._(
+					"This Bank is linked to at least one Canadian address. Canadian banking institutions require the ABA Number must not exceed 8 characters."
+				)
+			)
+	return

check_run/public/js/check_run/CheckRun.vue

@@ -135,13 +135,17 @@ export default {
 	},
 	methods: {
 		transactionUrl: transaction => {
-			if(transaction.doctype !== 'Journal Entry'){
+			if (transaction.doctype !== 'Journal Entry') {
 				return encodeURI(
-					`${frappe.urllib.get_base_url()}/app/${transaction.doctype.toLowerCase().replace(' ', '-')}/${transaction.name}`
+					`${frappe.urllib.get_base_url()}/app/${transaction.doctype.toLowerCase().replace(' ', '-')}/${
+						transaction.name
+					}`
 				)
 			} else {
 				return encodeURI(
-					`${frappe.urllib.get_base_url()}/app/${transaction.doctype.toLowerCase().replace(' ', '-')}/${transaction.ref_number}`
+					`${frappe.urllib.get_base_url()}/app/${transaction.doctype.toLowerCase().replace(' ', '-')}/${
+						transaction.ref_number
+					}`
 				)
 			}
 		},

package.json

@@ -24,4 +24,4 @@
 			"version-14"
 		]
 	}
-}
+}