nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 05:29:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28852 from frappe/mergify/bp/version-13-hotfix/pr-28677

Browse Source 
fix: Fix 'Adjust Asset Value' button (backport #28677)
This commit is contained in:
Saqib
2021-12-13 22:17:40 +05:30
committed by GitHub
parent 8fe5326c8e cefd0185a6
commit 99c6db155d
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/assets/doctype/asset/asset.js
View File

@@ -110,7 +110,7 @@ frappe.ui.form.on('Asset', {
if (frm.doc.status != 'Fully Depreciated') { if (frm.doc.status != 'Fully Depreciated') {
frm.add_custom_button(__("Adjust Asset Value"), function() { frm.add_custom_button(__("Adjust Asset Value"), function() {
frm.trigger("create_asset_adjustment"); frm.trigger("create_asset_value_adjustment");
}, __("Manage")); }, __("Manage"));
} }
@@ -322,14 +322,14 @@ frappe.ui.form.on('Asset', {
}); });
}, },
create_asset_adjustment: function(frm) { create_asset_value_adjustment: function(frm) {
frappe.call({ frappe.call({
args: { args: {
"asset": frm.doc.name, "asset": frm.doc.name,
"asset_category": frm.doc.asset_category, "asset_category": frm.doc.asset_category,
"company": frm.doc.company "company": frm.doc.company
}, },
method: "erpnext.assets.doctype.asset.asset.create_asset_adjustment", method: "erpnext.assets.doctype.asset.asset.create_asset_value_adjustment",
freeze: 1, freeze: 1,
callback: function(r) { callback: function(r) {
var doclist = frappe.model.sync(r.message); var doclist = frappe.model.sync(r.message);

8
erpnext/assets/doctype/asset/asset.py
View File

@@ -732,14 +732,14 @@ def create_asset_repair(asset, asset_name):
return asset_repair return asset_repair
@frappe.whitelist() @frappe.whitelist()
def create_asset_adjustment(asset, asset_category, company): def create_asset_value_adjustment(asset, asset_category, company):
asset_maintenance = frappe.get_doc("Asset Value Adjustment") asset_value_adjustment = frappe.new_doc("Asset Value Adjustment")
asset_maintenance.update({ asset_value_adjustment.update({
"asset": asset, "asset": asset,
"company": company, "company": company,
"asset_category": asset_category "asset_category": asset_category
}) })
return asset_maintenance return asset_value_adjustment
@frappe.whitelist() @frappe.whitelist()
def transfer_asset(args): def transfer_asset(args):