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: incoming rate for sales return with Moving Average valuation method (backport #38849) #38863

Merged
merged 2 commits into from
Dec 19, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 19, 2023

This is an automatic backport of pull request #38849 done by Mergify.
Cherry-pick of 7fdac62 has failed:

On branch mergify/bp/develop/pr-38849
Your branch is up to date with 'origin/develop'.

You are currently cherry-picking commit 7fdac62393.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/controllers/selling_controller.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/doctype/delivery_note/test_delivery_note.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…hod (#38849)

(cherry picked from commit 7fdac62)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py
@rohitwaghchaure rohitwaghchaure merged commit 4057682 into develop Dec 19, 2023
12 checks passed
@mergify mergify bot deleted the mergify/bp/develop/pr-38849 branch December 19, 2023 13:00
mergify bot added a commit that referenced this pull request Dec 19, 2023
…hod (backport #38849) (#38863)

* fix: incoming rate for sales return with Moving Average valuation method (#38849)

(cherry picked from commit 7fdac62)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 4057682)
rohitwaghchaure pushed a commit that referenced this pull request Dec 19, 2023
…hod (backport #38849) (backport #38863) (#38866)

fix: incoming rate for sales return with Moving Average valuation method (backport #38849) (#38863)

* fix: incoming rate for sales return with Moving Average valuation method (#38849)

(cherry picked from commit 7fdac62)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 4057682)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
frappe-pr-bot pushed a commit that referenced this pull request Dec 20, 2023
# [15.7.0](v15.6.1...v15.7.0) (2023-12-20)

### Bug Fixes

* asset patch failure due to missing shift_based column (backport [#38776](#38776)) ([#38777](#38777)) ([6e92c78](6e92c78))
* barcode scanning for the stock entry (backport [#38716](#38716)) ([#38718](#38718)) ([1dcb065](1dcb065))
* **demo:** Demo setup for canadian COA ([7d84441](7d84441))
* fetch exc rate of multi currency journals ([f55b561](f55b561))
* fetch item_tax_template values if fields with fetch_from exisit ([fba28d6](fba28d6))
* groups for current accounts in German CoAs ([58de991](58de991))
* homepage not working (backport [#38755](#38755)) ([#38756](#38756)) ([ad3a5b5](ad3a5b5))
* if not budget then don't validate (backport [#38861](#38861)) ([#38865](#38865)) ([5ec75fb](5ec75fb))
* incoming rate for sales return with Moving Average valuation method (backport [#38849](#38849)) (backport [#38863](#38863)) ([#38866](#38866)) ([d65be69](d65be69))
* incorrect available qty for backdated stock reco with batch (backport [#37858](#37858)) ([#38811](#38811)) ([18bd330](18bd330))
* Init internal child table values ([7802f6c](7802f6c))
* item variant with manufacturer (backport [#38845](#38845)) (backport [#38847](#38847)) ([#38851](#38851)) ([7320440](7320440))
* not able to cancel SCR with Batch (backport [#38817](#38817)) (backport [#38821](#38821)) ([#38829](#38829)) ([4bd1a5f](4bd1a5f))
* not able to make inter-company po from so (backport [#38826](#38826)) (backport [#38828](#38828)) ([#38833](#38833)) ([02ceee6](02ceee6))
* on closed unreserved the production plan qty (backport [#38848](#38848)) (backport [#38859](#38859)) ([#38862](#38862)) ([cbbc6af](cbbc6af))
* **pe:** show split alert only on splitting ([77dba48](77dba48))
* Reset SLA on issue doesn't work (backport [#38789](#38789)) ([#38791](#38791)) ([2045306](2045306))
* serial and batch bundle return not working (backport [#38754](#38754)) ([#38806](#38806)) ([8990c48](8990c48))
* set `fg-itm-qty` based on `qty` instead of the other way round in Subcontracting POs (backport [#38842](#38842)) ([#38855](#38855)) ([4e27174](4e27174))
* show bill_date and bill_no in Purchase Register ([4ed86db](4ed86db))
* skip jvs against bank accounts ([bf8a2d0](bf8a2d0))
* supplier removed on selection of item (backport [#38712](#38712)) ([#38713](#38713)) ([feb452b](feb452b))
* timezone aware SLA banner (backport [#38745](#38745)) ([#38747](#38747)) ([a551660](a551660))
* **ux:** don't override Item Name and Description in MR (backport [#38720](#38720)) ([#38763](#38763)) ([703be50](703be50))
* validation error on reconciling PE to Journals as Invoice ([aa5e16e](aa5e16e))
* wrong currency in Stock Balance report (backport [#38778](#38778)) ([#38780](#38780)) ([7fc8150](7fc8150))
* wrong paid and cn amount on pos invoice ([cff9e47](cff9e47))

### Features

* RFQ print preview ([f30bede](f30bede))
* set lead name from email ([f770621](f770621))

### Performance Improvements

* index `return_against` on delivery note (backport [#38827](#38827)) ([#38832](#38832)) ([6ad75e7](6ad75e7))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 3, 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.

1 participant