Merge branch 'develop' into fix-adjust-asset-value
diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js
index c2b1bbc..153f5c5 100644
--- a/erpnext/assets/doctype/asset/asset.js
+++ b/erpnext/assets/doctype/asset/asset.js
@@ -110,7 +110,7 @@
if (frm.doc.status != 'Fully Depreciated') {
frm.add_custom_button(__("Adjust Asset Value"), function() {
- frm.trigger("create_asset_adjustment");
+ frm.trigger("create_asset_value_adjustment");
}, __("Manage"));
}
@@ -322,14 +322,14 @@
});
},
- create_asset_adjustment: function(frm) {
+ create_asset_value_adjustment: function(frm) {
frappe.call({
args: {
"asset": frm.doc.name,
"asset_category": frm.doc.asset_category,
"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,
callback: function(r) {
var doclist = frappe.model.sync(r.message);
diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py
index 333906a..5a9f1c2 100644
--- a/erpnext/assets/doctype/asset/asset.py
+++ b/erpnext/assets/doctype/asset/asset.py
@@ -731,14 +731,14 @@
return asset_repair
@frappe.whitelist()
-def create_asset_adjustment(asset, asset_category, company):
- asset_maintenance = frappe.get_doc("Asset Value Adjustment")
- asset_maintenance.update({
+def create_asset_value_adjustment(asset, asset_category, company):
+ asset_value_adjustment = frappe.new_doc("Asset Value Adjustment")
+ asset_value_adjustment.update({
"asset": asset,
"company": company,
"asset_category": asset_category
})
- return asset_maintenance
+ return asset_value_adjustment
@frappe.whitelist()
def transfer_asset(args):