From 8b137648996735b129cb722f10f85a1caf45af00 Mon Sep 17 00:00:00 2001 From: maniamartial Date: Wed, 11 Oct 2023 14:19:25 +0300 Subject: [PATCH] Payment reference changes --- .../outward_bank_payment.py | 1 + .../utils/js/common_fields.js | 26 ++++++++++--------- bank_api_integration/hooks.py | 5 +++- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/bank_api_integration/bank_api_integration/doctype/outward_bank_payment/outward_bank_payment.py b/bank_api_integration/bank_api_integration/doctype/outward_bank_payment/outward_bank_payment.py index de041cb..45f8010 100644 --- a/bank_api_integration/bank_api_integration/doctype/outward_bank_payment/outward_bank_payment.py +++ b/bank_api_integration/bank_api_integration/doctype/outward_bank_payment/outward_bank_payment.py @@ -13,6 +13,7 @@ from erpnext.accounts.utils import get_outstanding_invoices, get_account_currency from frappe.utils import add_months, nowdate from bank_api_integration.bank_api_integration.doctype.bank_api_integration.bank_api_integration import is_authorized + class OutwardBankPayment(Document): def validate(self): final_remark="" diff --git a/bank_api_integration/bank_api_integration/utils/js/common_fields.js b/bank_api_integration/bank_api_integration/utils/js/common_fields.js index 985fd7f..8d0e6b8 100644 --- a/bank_api_integration/bank_api_integration/utils/js/common_fields.js +++ b/bank_api_integration/bank_api_integration/utils/js/common_fields.js @@ -1,14 +1,16 @@ // Copyright (c) 2019, Aerele Technologies Private Limited and contributors // For license information, please see license.txt -frappe.ui.form.on(cur_frm.doctype,{ - onload: function(frm) { - frm.set_query("company_bank_account", function() { - return { - query: "bank_api_integration.bank_api_integration.doctype.bank_api_integration.bank_api_integration.get_company_bank_account", - filters: { - "company":frm.doc.company, - "is_company_account": 1 - } - }; - }); - }}) \ No newline at end of file +frappe.ui.form.on(cur_frm.doctype, { + onload: function (frm) { + frm.set_query("company_bank_account", function () { + return { + query: + "bank_api_integration.bank_api_integration.doctype.bank_api_integration.bank_api_integration.get_company_bank_account", + filters: { + company: frm.doc.company, + is_company_account: 1, + }, + }; + }); + }, +}); diff --git a/bank_api_integration/hooks.py b/bank_api_integration/hooks.py index dd9c49c..24830bf 100644 --- a/bank_api_integration/hooks.py +++ b/bank_api_integration/hooks.py @@ -150,8 +150,11 @@ # exempt linked doctypes from being automatically cancelled # # auto_cancel_exempted_doctypes = ["Auto Repeat"] + + doctype_js = { "Bank Account": "bank_api_integration/utils/js/bank_account.js", "Purchase Invoice" : "bank_api_integration/custom/js/purchase_invoice.js", "Purchase Order" : "bank_api_integration/custom/js/purchase_order.js" -} \ No newline at end of file +} +