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

Merge pull request #39209 from nabinhait/asset-depreciation-currency

Browse Source 
fix: Introduced company field to show amounts in company currency
This commit is contained in:
Nabin Hait 2024-01-08 21:37:57 +05:30 committed by GitHub
commit 6b5c54bcbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
View File

@ -9,6 +9,7 @@
"field_order": [ "field_order": [
"asset", "asset",
"naming_series", "naming_series",
"company",
"column_break_2", "column_break_2",
"gross_purchase_amount", "gross_purchase_amount",
"opening_accumulated_depreciation", "opening_accumulated_depreciation",
@ -193,12 +194,20 @@
"fieldtype": "Check", "fieldtype": "Check",
"label": "Depreciate based on shifts", "label": "Depreciate based on shifts",
"read_only": 1 "read_only": 1
},
{
"fetch_from": "asset.company",
"fieldname": "company",
"fieldtype": "Link",
"label": "Company",
"options": "Company",
"read_only": 1
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2023-11-29 00:57:00.461998", "modified": "2024-01-08 16:31:04.533928",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset Depreciation Schedule", "name": "Asset Depreciation Schedule",

1
erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
View File

@ -35,6 +35,7 @@ class AssetDepreciationSchedule(Document):
amended_from: DF.Link | None amended_from: DF.Link | None
asset: DF.Link asset: DF.Link
company: DF.Link | None
daily_prorata_based: DF.Check daily_prorata_based: DF.Check
depreciation_method: DF.Literal[ depreciation_method: DF.Literal[
"", "Straight Line", "Double Declining Balance", "Written Down Value", "Manual" "", "Straight Line", "Double Declining Balance", "Written Down Value", "Manual"