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: service item capitalization #42188

Merged
merged 4 commits into from
Jul 16, 2024

Conversation

khushi8112
Copy link
Member

@khushi8112 khushi8112 commented Jul 4, 2024

Allow Capitalize Only Service Item

  • This PR includes a fix that allows for the capitalization of service items independently, without requiring either a consumed item or consumed stock item to be capitalized alongside the service item.

Removed Capitalized In field from aseet doc

  • Required for allowing multiple capitalization against a composite asset

@khushi8112 khushi8112 marked this pull request as ready for review July 8, 2024 15:34
@khushi8112 khushi8112 requested a review from nabinhait July 8, 2024 15:34
@nabinhait nabinhait merged commit 81e0b96 into frappe:develop Jul 16, 2024
23 checks passed
mergify bot pushed a commit that referenced this pull request Jul 16, 2024
* feat: capitalize with service expenses only

* chore: added test

* refactor: removed Capitalized In field from asset doc

(cherry picked from commit 81e0b96)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.py
khushi8112 added a commit that referenced this pull request Jul 16, 2024
…-42188

fix: service item capitalization (backport #42188)
frappe-pr-bot pushed a commit that referenced this pull request Jul 17, 2024
# [15.30.0](v15.29.4...v15.30.0) (2024-07-17)

### Bug Fixes

* address and contact filters for SCO and SCR (backport [#42310](#42310)) ([#42312](#42312)) ([cb64c73](cb64c73))
* bin deadlock issue (backport [#42342](#42342)) ([#42357](#42357)) ([29ee2d4](29ee2d4))
* cost center filter by company (backport [#42297](#42297)) ([#42299](#42299)) ([4c9ce1b](4c9ce1b))
* extra qty pick in pick list (backport [#42345](#42345)) ([#42349](#42349)) ([1754adf](1754adf))
* **gross profit:** incorrect valuation rate on different warehouses ([f161e59](f161e59))
* incoming rate zero for supplied items in returned SCR (backport [#42314](#42314)) ([#42315](#42315)) ([076bf17](076bf17))
* items not fetching in End Transit entry (backport [#42358](#42358)) ([#42361](#42361)) ([b5a2e5a](b5a2e5a))
* keep status as In Progress for RIV for Timeout Error (backport [#42274](#42274)) ([#42296](#42296)) ([1de66e5](1de66e5))
* missing discount on POS Credit Notes ([4055ef9](4055ef9))
* not able to cancel the inter transfer DN (backport [#42333](#42333)) ([#42340](#42340)) ([cf2651d](cf2651d))
* not able to submit LCV entry (backport [#42303](#42303)) ([#42304](#42304)) ([6d098b7](6d098b7))
* remove doctype link from serial no ledger report (backport [#42327](#42327)) ([#42348](#42348)) ([b741b2a](b741b2a))
* removed patch from patches.txt ([c45d11c](c45d11c))
* same posting date and time causing incorrect valuation rate (backport [#42351](#42351)) ([#42356](#42356)) ([62fc428](62fc428))
* service item capitalization ([#42188](#42188)) ([2ffe7d5](2ffe7d5))
* show total rows credit row in balance sheet ([0d2ef0d](0d2ef0d))
* slowness in reposting dependent vouchers. (backport [#42282](#42282)) ([#42292](#42292)) ([ef16313](ef16313))
* **Warehouse:** add buttons only if the user can use them ([a2b21c7](a2b21c7))
* While submitting PCV ensure previous FY is closed (backport [#42284](#42284)) ([#42300](#42300)) ([e250dcc](e250dcc))

### Features

* configurable depreciation calculation via accounts settings ([#42276](#42276)) ([ddd1ca7](ddd1ca7))
* create variant with/without image (backport [#41317](#41317)) ([#42343](#42343)) ([5f1d6ed](5f1d6ed))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants