mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-12 17:51:20 +00:00
fix: include accounting dimensions in stock entries created during asset repair.
(cherry picked from commit 147a5ee953)
This commit is contained in:
@@ -7,6 +7,9 @@ from frappe.query_builder import DocType
|
|||||||
from frappe.utils import cint, flt, get_link_to_form, getdate, time_diff_in_hours
|
from frappe.utils import cint, flt, get_link_to_form, getdate, time_diff_in_hours
|
||||||
|
|
||||||
import erpnext
|
import erpnext
|
||||||
|
from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
|
||||||
|
get_accounting_dimensions,
|
||||||
|
)
|
||||||
from erpnext.accounts.general_ledger import make_gl_entries
|
from erpnext.accounts.general_ledger import make_gl_entries
|
||||||
from erpnext.assets.doctype.asset.asset import get_asset_account
|
from erpnext.assets.doctype.asset.asset import get_asset_account
|
||||||
from erpnext.assets.doctype.asset_activity.asset_activity import add_asset_activity
|
from erpnext.assets.doctype.asset_activity.asset_activity import add_asset_activity
|
||||||
@@ -231,6 +234,12 @@ class AssetRepair(AccountsController):
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
accounting_dimensions = {
|
||||||
|
"cost_center": self.cost_center,
|
||||||
|
"project": self.project,
|
||||||
|
**{dimension: self.get(dimension) for dimension in get_accounting_dimensions()},
|
||||||
|
}
|
||||||
|
|
||||||
for stock_item in self.get("stock_items"):
|
for stock_item in self.get("stock_items"):
|
||||||
self.validate_serial_no(stock_item)
|
self.validate_serial_no(stock_item)
|
||||||
|
|
||||||
@@ -242,8 +251,7 @@ class AssetRepair(AccountsController):
|
|||||||
"qty": stock_item.consumed_quantity,
|
"qty": stock_item.consumed_quantity,
|
||||||
"basic_rate": stock_item.valuation_rate,
|
"basic_rate": stock_item.valuation_rate,
|
||||||
"serial_and_batch_bundle": stock_item.serial_and_batch_bundle,
|
"serial_and_batch_bundle": stock_item.serial_and_batch_bundle,
|
||||||
"cost_center": self.cost_center,
|
**accounting_dimensions,
|
||||||
"project": self.project,
|
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user