mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-16 11:39:18 +00:00
fix: unsaved status on opening gain loss journal
(cherry picked from commit e5b02e81a9)
# Conflicts:
# erpnext/accounts/doctype/journal_entry/journal_entry.js
This commit is contained in:
@@ -95,6 +95,15 @@ frappe.ui.form.on("Journal Entry", {
|
|||||||
}
|
}
|
||||||
|
|
||||||
erpnext.accounts.unreconcile_payment.add_unreconcile_btn(frm);
|
erpnext.accounts.unreconcile_payment.add_unreconcile_btn(frm);
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
|
||||||
|
if (frm.doc.voucher_type !== "Exchange Gain Or Loss") {
|
||||||
|
$.each(frm.doc.accounts || [], function (i, row) {
|
||||||
|
erpnext.journal_entry.set_exchange_rate(frm, row.doctype, row.name);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
>>>>>>> e5b02e81a9 (fix: unsaved status on opening gain loss journal)
|
||||||
},
|
},
|
||||||
before_save: function (frm) {
|
before_save: function (frm) {
|
||||||
if (frm.doc.docstatus == 0 && !frm.doc.is_system_generated) {
|
if (frm.doc.docstatus == 0 && !frm.doc.is_system_generated) {
|
||||||
|
|||||||
Reference in New Issue
Block a user