CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-27 00:26:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
Khushi Rawat
2025-09-30 17:39:57 +05:30
committed by khushi8112
parent 0eb76f4d2c
commit e81b85b241
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -799,13 +799,6 @@ erpnext.asset.scrap_asset = function (frm) {
fieldtype: "Date",
reqd: 1,
},
<<<<<<< HEAD
method: "erpnext.assets.doctype.asset.depreciation.scrap_asset",
callback: function (r) {
cur_frm.reload_doc();
},
});
=======
],
size: "medium",
primary_action_label: "Submit",
@@ -822,7 +815,6 @@ erpnext.asset.scrap_asset = function (frm) {
},
});
},
>>>>>>> e07bc5af41 (feat: validating asset scrap date (#43093))
});
scrap_dialog.show();
};