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

chore: don't merge asset capitalization gl entries (copy #36514) (#36515)

Browse Source 
chore: don't merge asset capitalization gl entries

(cherry picked from commit 3c8f292ac3943ddad52a7041d8910552d47abf0a)

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
This commit is contained in:
mergify[bot] 2023-08-06 23:44:22 +05:30 committed by GitHub
parent 5435c641a2
commit b717e2b5bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -330,7 +330,7 @@ class AssetCapitalization(StockController):
gl_entries = self.get_gl_entries() gl_entries = self.get_gl_entries()
if gl_entries: if gl_entries:
make_gl_entries(gl_entries, from_repost=from_repost) make_gl_entries(gl_entries, merge_entries=False, from_repost=from_repost)
elif self.docstatus == 2: elif self.docstatus == 2:
make_reverse_gl_entries(voucher_type=self.doctype, voucher_no=self.name) make_reverse_gl_entries(voucher_type=self.doctype, voucher_no=self.name)
@ -360,9 +360,6 @@ class AssetCapitalization(StockController):
gl_entries, target_account, target_against, precision gl_entries, target_account, target_against, precision
) )
if not self.stock_items and not self.service_items and self.are_all_asset_items_non_depreciable:
return []
self.get_gl_entries_for_target_item(gl_entries, target_against, precision) self.get_gl_entries_for_target_item(gl_entries, target_against, precision)
return gl_entries return gl_entries