fix: cost center filter by company #42297
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rohitwaghchaure
added
backport version-14-hotfix
mergify bot
pushed a commit
that referenced
this pull request
Jul 12, 2024
(cherry picked from commit 9838f7e) # Conflicts: # erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js # erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js
mergify bot
pushed a commit
that referenced
this pull request
Jul 12, 2024
(cherry picked from commit 9838f7e)
rohitwaghchaure
added a commit
that referenced
this pull request
Jul 12, 2024
nabinhait
added a commit
that referenced
this pull request
Jul 12, 2024
* fix(Warehouse): add buttons only if the user can use them (cherry picked from commit 10ae5aa) * fix: missing discount on POS Credit Notes (cherry picked from commit 1049550) * chore: rename test suite for payable report (cherry picked from commit 9474f72) * refactor: test suite for item-wise sales register (cherry picked from commit 3aaa22e) * refactor(test): use each instance UOM for assertion (cherry picked from commit cf4fbfb) * fix: slowness in reposting dependent vouchers. (backport #42282) (#42292) fix: slowness in reposting dependent vouchers. (#42282) (cherry picked from commit b17696a) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com> * refactor(test): clear old records * fix: keep status as In Progress for RIV for Timeout Error (backport #42274) (#42296) fix: keep status as In Progress for RIV for Timeout Error (#42274) (cherry picked from commit 10280d6) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com> * fix: cost center filter by company (backport #42297) (#42299) fix: cost center filter by company (#42297) (cherry picked from commit 9838f7e) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com> * feat: configurable depreciation calculation via accounts settings (#42276) * feat: configurable depreciation calculation via accounts settings * refactor: code optimization * style: changes in description and label (cherry picked from commit b04da63) * fix: not able to submit LCV entry (backport #42303) (#42304) fix: not able to submit LCV entry (#42303) (cherry picked from commit 9cf92ea) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com> * fix: While submitting PCV ensure previous FY is closed (backport #42284) (#42300) fix: While submitting PCV ensure previous FY is closed (#42284) (cherry picked from commit d0bbc8c) Co-authored-by: Nabin Hait <nabinhait@gmail.com> --------- Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com> Co-authored-by: ruthra kumar <ruthra@erpnext.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com> Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
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))
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cost Center is not filtered via selected company in the subcontracting order and subcontracting receipt.