Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Asset capitalization #27466

Merged
merged 21 commits into from
Sep 13, 2022
Merged

Conversation

SaiFi0102
Copy link
Collaborator

@SaiFi0102 SaiFi0102 commented Sep 13, 2021

Documentation (Under Review):
https://docs.erpnext.com/docs/v13/user/manual/en/asset/new?wiki_page_patch=ee64cad18b

Dependent On:
#27585

Example Capitalization Entry

Example Decapitalization Entry

@SaiFi0102 SaiFi0102 changed the title Asset capitalization feat: Asset capitalization Sep 13, 2021
@stale stale bot added the inactive label Oct 6, 2021
@stale stale bot closed this Oct 9, 2021
@ankush ankush reopened this Oct 9, 2021
@stale stale bot removed the inactive label Oct 9, 2021
@stale stale bot added the inactive label Oct 24, 2021
@frappe frappe deleted a comment from stale bot Oct 24, 2021
@frappe frappe deleted a comment from stale bot Oct 24, 2021
@ankush ankush added the hotfix label Nov 2, 2021
@ankush
Copy link
Member

ankush commented Nov 2, 2021

(hotfix label is to avoid auto-closure of PRs by stale bot, looks weird but eh...)

…t-capitalization

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
#	erpnext/assets/doctype/asset/test_asset.py
#	erpnext/assets/workspace/assets/assets.json
@codecov
Copy link

codecov bot commented Nov 4, 2021

Codecov Report

Merging #27466 (bb00d38) into develop (071118f) will increase coverage by 0.25%.
The diff coverage is 89.86%.

@@             Coverage Diff             @@
##           develop   #27466      +/-   ##
===========================================
+ Coverage    55.20%   55.46%   +0.25%     
===========================================
  Files         1121     1125       +4     
  Lines        66751    67190     +439     
===========================================
+ Hits         36853    37264     +411     
- Misses       29898    29926      +28     
Impacted Files Coverage Δ
erpnext/assets/doctype/asset/depreciation.py 86.09% <78.94%> (-1.32%) ⬇️
erpnext/controllers/accounts_controller.py 83.82% <80.35%> (-0.16%) ⬇️
...ctype/asset_capitalization/asset_capitalization.py 91.24% <91.24%> (ø)
...xt/accounts/doctype/sales_invoice/sales_invoice.py 78.04% <100.00%> (-0.06%) ⬇️
erpnext/assets/doctype/asset/asset.py 74.23% <100.00%> (ø)
...tion_asset_item/asset_capitalization_asset_item.py 100.00% <100.00%> (ø)
..._service_item/asset_capitalization_service_item.py 100.00% <100.00%> (ø)
...tion_stock_item/asset_capitalization_stock_item.py 100.00% <100.00%> (ø)
...payroll/doctype/income_tax_slab/income_tax_slab.py 83.33% <0.00%> (-16.67%) ⬇️
...t/payroll/doctype/payroll_period/payroll_period.py 64.81% <0.00%> (-5.56%) ⬇️
... and 17 more

…tion

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@SaiFi0102
Copy link
Collaborator Author

isort error is due to merging develop branch in this PR

@ankush
Copy link
Member

ankush commented Nov 10, 2021

isort error is due to merging develop branch in this PR

It's not from the merge. You removed an unused import, so it now fits on a single line. Just add pre-commit hook to avoid this manual work 😄

@nextchamp-saqib
Copy link
Member

We are planning to separate the Asset module into an App. So, this will be moved to the App once we have moved all the existing features.

Hence closing this for now.

cc: @GangaManoj @nabinhait @umairsy

@nabinhait
Copy link
Member

As we have changed our plan for a separate Asset app, reopening the PR.

@stale
Copy link

stale bot commented Sep 13, 2022

This pull request has been automatically marked as inactive because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing.

@stale stale bot added the inactive label Sep 13, 2022
@nabinhait nabinhait merged commit fefe950 into frappe:develop Sep 13, 2022
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.2.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants