CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-23 21:22:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: pass company from asset to asset capitalization

Browse Source 
(cherry picked from commit f3445d645d)
This commit is contained in:
Khushi Rawat
2024-09-08 23:23:54 +05:30
committed by Mergify
parent 208bd2b8ff
commit 9e72a844f7
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -506,6 +506,7 @@ frappe.ui.form.on("Asset", {
create_asset_repair: function (frm) { create_asset_repair: function (frm) {
frappe.call({ frappe.call({
args: { args: {
company: frm.doc.company,
asset: frm.doc.name, asset: frm.doc.name,
asset_name: frm.doc.asset_name, asset_name: frm.doc.asset_name,
}, },
@@ -520,6 +521,7 @@ frappe.ui.form.on("Asset", {
create_asset_capitalization: function (frm) { create_asset_capitalization: function (frm) {
frappe.call({ frappe.call({
args: { args: {
company: frm.doc.company,
asset: frm.doc.name, asset: frm.doc.name,
asset_name: frm.doc.asset_name, asset_name: frm.doc.asset_name,
item_code: frm.doc.item_code, item_code: frm.doc.item_code,

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

@@ -895,18 +895,19 @@ def create_asset_maintenance(asset, item_code, item_name, asset_category, compan
@frappe.whitelist() @frappe.whitelist()
def create_asset_repair(asset, asset_name): def create_asset_repair(company, asset, asset_name):
asset_repair = frappe.new_doc("Asset Repair") asset_repair = frappe.new_doc("Asset Repair")
asset_repair.update({"asset": asset, "asset_name": asset_name}) asset_repair.update({"company": company, "asset": asset, "asset_name": asset_name})
return asset_repair return asset_repair
@frappe.whitelist() @frappe.whitelist()
def create_asset_capitalization(asset, asset_name, item_code): def create_asset_capitalization(company, asset, asset_name, item_code):
asset_capitalization = frappe.new_doc("Asset Capitalization") asset_capitalization = frappe.new_doc("Asset Capitalization")
asset_capitalization.update( asset_capitalization.update(
{ {
"target_asset": asset, "target_asset": asset,
"company": company,
"capitalization_method": "Choose a WIP composite asset", "capitalization_method": "Choose a WIP composite asset",
"target_asset_name": asset_name, "target_asset_name": asset_name,
"target_item_code": item_code, "target_item_code": item_code,