nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 19:49:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolved conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2025-08-05 16:05:54 +05:30
committed by GitHub
parent 78857cd798
commit 4a8465df90
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/assets/doctype/asset/depreciation.py
View File

@@ -276,15 +276,10 @@ def _make_journal_entry_for_depreciation(
je.naming_series = depreciation_series je.naming_series = depreciation_series
je.posting_date = depr_schedule.schedule_date je.posting_date = depr_schedule.schedule_date
je.company = asset.company je.company = asset.company
<<<<<<< HEAD
je.finance_book = asset_depr_schedule_doc.finance_book je.finance_book = asset_depr_schedule_doc.finance_book
je.remark = f"Depreciation Entry against {asset.name} worth {depr_schedule.depreciation_amount}"
=======
je.finance_book = depr_schedule_doc.finance_book
je.remark = _("Depreciation Entry against {0} worth {1}").format( je.remark = _("Depreciation Entry against {0} worth {1}").format(
asset.name, depr_schedule.depreciation_amount asset.name, depr_schedule.depreciation_amount
) )
>>>>>>> 803180d5de (chore: add translation function on remark in setup_journal_entry_metadata in depreciation.py)
credit_entry = { credit_entry = {
"account": credit_account, "account": credit_account,