Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15567 from rohitwaghchaure/fix_payment_request

Browse Source 
[Fix] Payment request not working
This commit is contained in:
rohitwaghchaure 2018-10-03 16:03:48 +05:30 committed by GitHub
commit d6cacbe565
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
View File

@ -77,8 +77,9 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
} }
if (doc.outstanding_amount > 0 && !cint(doc.is_return)) { if (doc.outstanding_amount > 0 && !cint(doc.is_return)) {
cur_frm.add_custom_button(__('Payment Request'), cur_frm.add_custom_button(__('Payment Request'), function() {
this.make_payment_request, __("Make")); me.make_payment_request()
}, __("Make"));
} }
if(doc.docstatus===0) { if(doc.docstatus===0) {

9
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View File

@ -35,6 +35,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
}, },
refresh: function(doc, dt, dn) { refresh: function(doc, dt, dn) {
const me = this;
this._super(); this._super();
if(cur_frm.msgbox && cur_frm.msgbox.$wrapper.is(":visible")) { if(cur_frm.msgbox && cur_frm.msgbox.$wrapper.is(":visible")) {
// hide new msgbox // hide new msgbox
@ -82,9 +83,10 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
} }
} }
if(doc.outstanding_amount>0 && !cint(doc.is_return)) { if (doc.outstanding_amount>0 && !cint(doc.is_return)) {
cur_frm.add_custom_button(__('Payment Request'), cur_frm.add_custom_button(__('Payment Request'), function() {
this.make_payment_request, __("Make")); me.make_payment_request();
}, __("Make"));
} }
if(!doc.auto_repeat) { if(!doc.auto_repeat) {
@ -102,7 +104,6 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
} }
this.set_default_print_format(); this.set_default_print_format();
var me = this;
if (doc.docstatus == 1 && !doc.inter_company_invoice_reference) { if (doc.docstatus == 1 && !doc.inter_company_invoice_reference) {
frappe.model.with_doc("Customer", me.frm.doc.customer, function() { frappe.model.with_doc("Customer", me.frm.doc.customer, function() {
var customer = frappe.model.get_doc("Customer", me.frm.doc.customer); var customer = frappe.model.get_doc("Customer", me.frm.doc.customer);

4
erpnext/public/js/controllers/transaction.js
View File

@ -211,8 +211,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}, },
make_payment_request: function() { make_payment_request: function() {
const me = this; var me = this;
const payment_request_type = (in_list(['Sales Order', 'Sales Invoice'], me.frm.doc.doctype)) const payment_request_type = (in_list(['Sales Order', 'Sales Invoice'], this.frm.doc.doctype))
? "Inward" : "Outward"; ? "Inward" : "Outward";
frappe.call({ frappe.call({