From db7a56b4538c53d1c8ede8c1c7ed1545caa6fa8a Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 17 Dec 2015 10:11:12 +0530 Subject: [PATCH] [fixes] fieldtype, message fixes on Payment Request --- erpnext/accounts/doctype/payment_request/payment_request.js | 2 ++ .../accounts/doctype/payment_request/payment_request.json | 6 +++--- erpnext/selling/sales_common.js | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.js b/erpnext/accounts/doctype/payment_request/payment_request.js index 142eacf95a..e0c1e14d55 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.js +++ b/erpnext/accounts/doctype/payment_request/payment_request.js @@ -1,3 +1,5 @@ +cur_frm.add_fetch("payment_gateway", "payment_account", "payment_account") + frappe.ui.form.on("Payment Request", "onload", function(frm, dt, dn){ frappe.call({ method:"erpnext.accounts.doctype.payment_request.payment_request.get_print_format_list", diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json index 25f786a70a..aa215206ed 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.json +++ b/erpnext/accounts/doctype/payment_request/payment_request.json @@ -161,7 +161,7 @@ "bold": 0, "collapsible": 0, "fieldname": "payment_account", - "fieldtype": "Read Only", + "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, @@ -169,7 +169,7 @@ "label": "Payment Account", "length": 0, "no_copy": 0, - "options": "payment_gateway.payment_account", + "options": "Account", "permlevel": 0, "precision": "", "print_hide": 0, @@ -410,7 +410,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2015-12-17 09:41:59.801913", + "modified": "2015-12-17 10:08:48.333171", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Request", diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js index 66422f09df..f6b42f7c69 100644 --- a/erpnext/selling/sales_common.js +++ b/erpnext/selling/sales_common.js @@ -300,7 +300,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({ }, callback: function(r) { if(!r.exc){ - frappe.msgprint(__("payment Request generated")) + frappe.msgprint(__("Payment Request generated")) } } })