[fix] Condition for Payment and Return button visibility
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index d3a72d6..b158ea2 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -24,11 +24,13 @@
if(!doc.is_return) {
if(doc.docstatus==1) {
- if(doc.outstanding_amount != 0) {
+ if(doc.outstanding_amount < 0) {
this.frm.add_custom_button(__('Payment'), this.make_bank_entry, __("Make"));
cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
}
- cur_frm.add_custom_button(__('Debit Note'), this.make_debit_note, __("Make"));
+ if(Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) {
+ cur_frm.add_custom_button(__('Debit Note'), this.make_debit_note, __("Make"));
+ }
}
if(doc.docstatus===0) {
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 26a9fa6..7b9b803 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -57,10 +57,12 @@
return item.is_delivered_by_supplier ? true : false;
})
- cur_frm.add_custom_button(doc.update_stock ? __('Sales Return') : __('Credit Note'),
- this.make_sales_return, __("Make"));
- cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
-
+ if(Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) {
+ cur_frm.add_custom_button(doc.update_stock ? __('Sales Return') : __('Credit Note'),
+ this.make_sales_return, __("Make"));
+ cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
+ }
+
if(cint(doc.update_stock)!=1) {
// show Make Delivery Note button only if Sales Invoice is not created from Delivery Note
var from_delivery_note = false;
@@ -75,7 +77,7 @@
}
}
- 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'), this.make_payment_request, __("Make"));
cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry, __("Make"));
}