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

fix: asset capitalization #35832

Merged
merged 5 commits into from
Jun 22, 2023
Merged

fix: asset capitalization #35832

merged 5 commits into from
Jun 22, 2023

Conversation

anandbaburajan
Copy link
Contributor

@anandbaburajan anandbaburajan commented Jun 21, 2023

  • Now users won't need to create the target asset -- it would be done automatically.
  • Now the issue of "incorrect number of General Ledger Entries found" when all the consumable assets are non-depreciable has been fixed -- the single unnecessary entry won't be posted.

https://docs.erpnext.com/docs/v14/user/manual/en/asset/asset-capitalization

@anandbaburajan anandbaburajan added the backport develop instructs mergify to frontport PR to develop branch label Jun 21, 2023
@muchai
Copy link

muchai commented Jun 22, 2023

Please include documentation for Asset Capitalization on the asset manual. It's usually missing there.

@anandbaburajan
Copy link
Contributor Author

@muchai https://docs.erpnext.com/docs/v14/user/manual/en/asset/asset-capitalization.

@anandbaburajan anandbaburajan merged commit fb823b5 into frappe:version-14-hotfix Jun 22, 2023
mergify bot pushed a commit that referenced this pull request Jun 22, 2023
* fix: misc asset capitalisation fixes

* chore: add location in tests and remove unnecessary code

* chore: more fixes and removals

* chore: show company and fix tests

* chore: make target qty read only on capitalization

(cherry picked from commit fb823b5)

# Conflicts:
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
@muchai
Copy link

muchai commented Jun 22, 2023

anandbaburajan added a commit that referenced this pull request Jun 22, 2023
* fix: asset capitalization (#35832)

* fix: misc asset capitalisation fixes

* chore: add location in tests and remove unnecessary code

* chore: more fixes and removals

* chore: show company and fix tests

* chore: make target qty read only on capitalization

(cherry picked from commit fb823b5)

# Conflicts:
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.py

* chore: fixing conflicts

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Jun 28, 2023
# [14.28.0](v14.27.14...v14.28.0) (2023-06-28)

### Bug Fixes

* asset capitalization ([#35832](#35832)) ([fb823b5](fb823b5))
* asset movement ([#35918](#35918)) ([e16c148](e16c148))
* delivery trip driver is only required on submit (backport [#35876](#35876)) ([#35893](#35893)) ([fc051d1](fc051d1))
* don't allow to make reposting entry for closing stock balance period ([e68b088](e68b088))
* filter parent warehouses not showing (backport [#35897](#35897)) ([#35899](#35899)) ([87ba196](87ba196))
* incorrect cost center error in bank reconciliation ([cacb0f6](cacb0f6))
* issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry (backport [#35821](#35821)) ([#35827](#35827)) ([20f2bef](20f2bef))
* make credit note and debit note exclusive ([#35781](#35781)) ([fafb46e](fafb46e))
* multiple Work Orders agaist same production plan ([8ddfc34](8ddfc34))
* no permission for accounts settings on payment reconciliation ([200ddbf](200ddbf))
* Payment Term must be mandatory if `Allocate Payment based on ..` is checked ([#35798](#35798)) ([3dd3935](3dd3935))
* POS Closing Entry load all invoices with one request on save ([#35819](#35819)) ([8ecca2a](8ecca2a))
* reconcile invoice against credit note. ([#35604](#35604)) ([5c388a1](5c388a1))
* Remove special treatment for P&L Accounts ([#35602](#35602)) ([b023448](b023448))
* Set Asset cost center default as PR or PI Item Cost Center while auto creating ([#35844](#35844)) ([4a7d75b](4a7d75b))
* show non-depreciable assets in fixed asset register ([#35858](#35858)) ([42d0944](42d0944))
* TDS amount calculation post LDC breach ([851b887](851b887))
* use correct fieldname for purchase receipt column in item_wise_purchase_register report ([#35828](#35828)) ([8f13b48](8f13b48))
* **ux:** PO Get Items From Open Material Requests (backport [#35894](#35894)) ([#35895](#35895)) ([2ef2057](2ef2057))

### Features

* Auto set Party in Bank Transaction ([#34675](#34675)) ([d53b197](d53b197))
* Provision to send Accounts Receivable Reports using Process SOA ([#35789](#35789)) ([21d560c](21d560c)), closes [#35707](#35707)

### Performance Improvements

* improve item wise register reports ([#35908](#35908)) ([33ee011](33ee011))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.28.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport develop instructs mergify to frontport PR to develop branch released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants