Skip to content

Commit

Permalink
Merge pull request #37647 from frappe/mergify/copy/version-14-hotfix/…
Browse files Browse the repository at this point in the history
…pr-37200

refactor: button in Payment Entry to filter associated Journals (copy #37200)
  • Loading branch information
ruthra-kumar authored Oct 24, 2023
2 parents 922ace4 + 0b082f0 commit 356b1bd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
6 changes: 6 additions & 0 deletions erpnext/accounts/doctype/payment_entry/payment_entry.js
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,12 @@ frappe.ui.form.on('Payment Entry', {
frm.events.hide_unhide_fields(frm);
frm.events.set_dynamic_labels(frm);
frm.events.show_general_ledger(frm);
if(frm.doc.references.find((elem) => {return elem.exchange_gain_loss != 0})) {
frm.add_custom_button(__("View Exchange Gain/Loss Journals"), function() {
frappe.set_route("List", "Journal Entry", {"voucher_type": "Exchange Gain Or Loss", "reference_name": frm.doc.name});
}, __('Actions'));

}
erpnext.accounts.unreconcile_payments.add_unreconcile_btn(frm);
},

Expand Down
6 changes: 3 additions & 3 deletions erpnext/public/js/utils/unreconcile.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ erpnext.accounts.unreconcile_payments = {
},
callback: function(r) {
if (r.message) {
frm.add_custom_button(__("Un-Reconcile"), function() {
frm.add_custom_button(__("UnReconcile"), function() {
erpnext.accounts.unreconcile_payments.build_unreconcile_dialog(frm);
}, __('Actions'));
}
Expand Down Expand Up @@ -87,11 +87,11 @@ erpnext.accounts.unreconcile_payments = {
unreconcile_dialog_fields[0].get_data = function(){ return r.message};

let d = new frappe.ui.Dialog({
title: 'Un-Reconcile Allocations',
title: 'UnReconcile Allocations',
fields: unreconcile_dialog_fields,
size: 'large',
cannot_add_rows: true,
primary_action_label: 'Un-Reconcile',
primary_action_label: 'UnReconcile',
primary_action(values) {

let selected_allocations = values.allocations.filter(x=>x.__checked);
Expand Down

0 comments on commit 356b1bd

Please sign in to comment.