Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "fix: remove multiple accounts from against in capitalization"

Browse Source 
This reverts commit f705bf2efe7bf079bb9b8af200f4c8cadfddd4ee.
This commit is contained in:
Deepesh Garg 2024-01-14 11:06:01 +05:30
parent 498c9c7955
commit 93ff84bf56
1 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
View File

@ -485,7 +485,6 @@ class AssetCapitalization(StockController):
self.get_gl_dict( self.get_gl_dict(
{ {
"account": account, "account": account,
"against_type": "Account",
"against": target_account, "against": target_account,
"against_link": target_account, "against_link": target_account,
"cost_center": item_row.cost_center, "cost_center": item_row.cost_center,
@ -528,7 +527,6 @@ class AssetCapitalization(StockController):
self.set_consumed_asset_status(asset) self.set_consumed_asset_status(asset)
for gle in fixed_asset_gl_entries: for gle in fixed_asset_gl_entries:
gle["against_type"] = "Account"
gle["against"] = target_account gle["against"] = target_account
gle["against_link"] = target_account gle["against_link"] = target_account
gl_entries.append(self.get_gl_dict(gle, item=item)) gl_entries.append(self.get_gl_dict(gle, item=item))
@ -546,7 +544,6 @@ class AssetCapitalization(StockController):
self.get_gl_dict( self.get_gl_dict(
{ {
"account": item_row.expense_account, "account": item_row.expense_account,
"against_type": "Account",
"against": target_account, "against": target_account,
"against_link": target_account, "against_link": target_account,
"cost_center": item_row.cost_center, "cost_center": item_row.cost_center,
@ -559,18 +556,15 @@ class AssetCapitalization(StockController):
) )
def get_gl_entries_for_target_item(self, gl_entries, target_against, precision): def get_gl_entries_for_target_item(self, gl_entries, target_against, precision):
for target_account in target_against:
if self.target_is_fixed_asset: if self.target_is_fixed_asset:
# Capitalization # Capitalization
gl_entries.append( gl_entries.append(
self.get_gl_dict( self.get_gl_dict(
{ {
"account": self.target_fixed_asset_account, "account": self.target_fixed_asset_account,
"against_type": "Account", "against": ", ".join(target_against),
"against": target_account,
"against_link": target_account,
"remarks": self.get("remarks") or _("Accounting Entry for Asset"), "remarks": self.get("remarks") or _("Accounting Entry for Asset"),
"debit": flt(self.total_value, precision) / len(target_against), "debit": flt(self.total_value, precision),
"cost_center": self.get("cost_center"), "cost_center": self.get("cost_center"),
}, },
item=self, item=self,
@ -587,13 +581,11 @@ class AssetCapitalization(StockController):
self.get_gl_dict( self.get_gl_dict(
{ {
"account": account, "account": account,
"against_type": "Account", "against": ", ".join(target_against),
"against": target_account,
"against_link": target_account,
"cost_center": self.cost_center, "cost_center": self.cost_center,
"project": self.get("project"), "project": self.get("project"),
"remarks": self.get("remarks") or "Accounting Entry for Stock", "remarks": self.get("remarks") or "Accounting Entry for Stock",
"debit": stock_value_difference / len(target_against), "debit": stock_value_difference,
}, },
self.warehouse_account[sle.warehouse]["account_currency"], self.warehouse_account[sle.warehouse]["account_currency"],
item=self, item=self,