nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: show descriptive message for missing fields

Browse Source
This commit is contained in:
Mangesh-Khairnar
2020-10-23 13:38:55 +05:30
parent ed1553ea81
commit e03a02d9c0
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/accounts/doctype/payment_request/test_payment_request.py
View File

@@ -127,6 +127,7 @@ class TestPaymentRequest(unittest.TestCase):
recipient_id="nabin@erpnext.com", return_doc=1) recipient_id="nabin@erpnext.com", return_doc=1)
pr1.grand_total = 200 pr1.grand_total = 200
pr1.submit() pr1.submit()
pr1.set_as_paid()
# Make a 2nd Payment Request # Make a 2nd Payment Request
pr2 = make_payment_request(dt="Sales Order", dn=so.name, pr2 = make_payment_request(dt="Sales Order", dn=so.name,

4
erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.js
View File

@@ -13,7 +13,9 @@ frappe.ui.form.on('Mpesa Settings', {
}, },
get_account_balance: function(frm) { get_account_balance: function(frm) {
if (!frm.initiator_name && !frm.security_credentials) return; if (!frm.initiator_name && !frm.security_credentials) {
frappe.throw(__("Please set the initiator name and the security credential"));
}
frappe.call({ frappe.call({
method: "get_account_balance_info", method: "get_account_balance_info",
doc: frm.doc doc: frm.doc

6
erpnext/erpnext_integrations/doctype/mpesa_settings/test_mpesa_settings.py
View File

@@ -10,7 +10,7 @@ from erpnext.accounts.doctype.pos_invoice.test_pos_invoice import create_pos_inv
class TestMpesaSettings(unittest.TestCase): class TestMpesaSettings(unittest.TestCase):
def test_creation_of_payment_gateway(self): def test_creation_of_payment_gateway(self):
mpesa_doc = create_mpesa_settings(payment_gateway_name="_Test") create_mpesa_settings(payment_gateway_name="_Test")
mode_of_payment = frappe.get_doc("Mode of Payment", "Mpesa-_Test") mode_of_payment = frappe.get_doc("Mode of Payment", "Mpesa-_Test")
self.assertTrue(frappe.db.exists("Payment Gateway Account", {'payment_gateway': "Mpesa-_Test"})) self.assertTrue(frappe.db.exists("Payment Gateway Account", {'payment_gateway': "Mpesa-_Test"}))
@@ -41,7 +41,7 @@ class TestMpesaSettings(unittest.TestCase):
})) }))
def test_processing_of_callback_payload(self): def test_processing_of_callback_payload(self):
mpesa_doc = create_mpesa_settings(payment_gateway_name="Payment") create_mpesa_settings(payment_gateway_name="Payment")
mpesa_account = frappe.db.get_value("Payment Gateway Account", {"payment_gateway": 'Mpesa-Payment'}, "payment_account") mpesa_account = frappe.db.get_value("Payment Gateway Account", {"payment_gateway": 'Mpesa-Payment'}, "payment_account")
frappe.db.set_value("Account", mpesa_account, "account_currency", "KES") frappe.db.set_value("Account", mpesa_account, "account_currency", "KES")
@@ -73,7 +73,7 @@ def create_mpesa_settings(payment_gateway_name="Express"):
if frappe.db.exists("Mpesa Settings", payment_gateway_name): if frappe.db.exists("Mpesa Settings", payment_gateway_name):
return frappe.get_doc("Mpesa Settings", payment_gateway_name) return frappe.get_doc("Mpesa Settings", payment_gateway_name)
doc = frappe.get_doc(dict( doc = frappe.get_doc(dict( #nosec
doctype="Mpesa Settings", doctype="Mpesa Settings",
payment_gateway_name=payment_gateway_name, payment_gateway_name=payment_gateway_name,
consumer_key="5sMu9LVI1oS3oBGPJfh3JyvLHwZOdTKn", consumer_key="5sMu9LVI1oS3oBGPJfh3JyvLHwZOdTKn",