mirror of
https://github.com/frappe/erpnext.git
synced 2026-09-20 03:47:11 +00:00
Merge pull request #58941 from Henil666/fix/asset-depreciation-checkbox-order-clean
fix: asset depreciation table stays empty if you check the box before entering the amount
This commit is contained in:
@@ -546,15 +546,22 @@ frappe.ui.form.on("Asset", {
|
|||||||
},
|
},
|
||||||
|
|
||||||
set_finance_book: function (frm) {
|
set_finance_book: function (frm) {
|
||||||
|
let item_code = frm.doc.item_code;
|
||||||
|
let net_purchase_amount = frm.doc.net_purchase_amount;
|
||||||
|
|
||||||
frappe.call({
|
frappe.call({
|
||||||
method: "erpnext.assets.doctype.asset.asset.get_item_details",
|
method: "erpnext.assets.doctype.asset.asset.get_item_details",
|
||||||
args: {
|
args: {
|
||||||
item_code: frm.doc.item_code,
|
item_code: item_code,
|
||||||
asset_category: frm.doc.asset_category,
|
asset_category: frm.doc.asset_category,
|
||||||
net_purchase_amount: frm.doc.net_purchase_amount,
|
net_purchase_amount: net_purchase_amount,
|
||||||
},
|
},
|
||||||
callback: function (r, rt) {
|
callback: function (r, rt) {
|
||||||
if (r.message) {
|
if (
|
||||||
|
r.message &&
|
||||||
|
frm.doc.item_code === item_code &&
|
||||||
|
frm.doc.net_purchase_amount === net_purchase_amount
|
||||||
|
) {
|
||||||
frm.set_value("finance_books", r.message);
|
frm.set_value("finance_books", r.message);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -752,10 +759,12 @@ frappe.ui.form.on("Asset", {
|
|||||||
},
|
},
|
||||||
|
|
||||||
net_purchase_amount: function (frm) {
|
net_purchase_amount: function (frm) {
|
||||||
if (frm.doc.finance_books) {
|
if (frm.doc.finance_books && frm.doc.finance_books.length) {
|
||||||
frm.doc.finance_books.forEach((d) => {
|
frm.doc.finance_books.forEach((d) => {
|
||||||
frm.events.set_depreciation_rate(frm, d);
|
frm.events.set_depreciation_rate(frm, d);
|
||||||
});
|
});
|
||||||
|
} else if (frm.doc.item_code && frm.doc.calculate_depreciation && frm.doc.net_purchase_amount) {
|
||||||
|
frm.trigger("set_finance_book");
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user