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: use serial/batch field for rejected items (backport #40327) #40329

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 7, 2024

This is an automatic backport of pull request #40327 done by Mergify.


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

@github-actions github-actions bot added the stock label Mar 7, 2024
@rohitwaghchaure rohitwaghchaure merged commit 7ca7242 into version-15-hotfix Mar 7, 2024
12 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-15-hotfix/pr-40327 branch March 7, 2024 09:07
@rohitwaghchaure
Copy link
Collaborator

@Mergifyio backport version-15

Copy link
Contributor Author

mergify bot commented Mar 7, 2024

backport version-15

✅ Backports have been created

mergify bot added a commit that referenced this pull request Mar 7, 2024
)

fix: use serial/batch field for rejected items (#40327)

(cherry picked from commit 01856a6)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 7ca7242)
rohitwaghchaure pushed a commit that referenced this pull request Mar 7, 2024
…kport #40329) (#40332)

fix: use serial/batch field for rejected items (backport #40327) (#40329)

fix: use serial/batch field for rejected items (#40327)

(cherry picked from commit 01856a6)

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

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
frappe-pr-bot pushed a commit that referenced this pull request Mar 7, 2024
## [15.16.2](v15.16.1...v15.16.2) (2024-03-07)

### Bug Fixes

* use serial/batch field for rejected items (backport [#40327](#40327)) (backport [#40329](#40329)) ([#40332](#40332)) ([5af335d](5af335d))
frappe-pr-bot pushed a commit that referenced this pull request Mar 13, 2024
# [15.17.0](v15.16.2...v15.17.0) (2024-03-13)

### Bug Fixes

* **accounts:** Allow setting Number of new Cost Center (backport [#40212](#40212)) ([#40314](#40314)) ([7001e0a](7001e0a))
* advance paid amount and ledger entries against SO/PO ([6a5a941](6a5a941))
* barcode field on line item not working (backport [#40381](#40381)) ([#40384](#40384)) ([9ce68de](9ce68de))
* batch no not copied while making Material Consumption entry (backport [#40290](#40290)) ([#40300](#40300)) ([6d1c144](6d1c144))
* Blanket order rate getting changed on converting to order ([d8c6eb0](d8c6eb0))
* conditionally apply `is_group` filter in accounting dimension query (backport [#40414](#40414)) ([#40416](#40416)) ([40752c1](40752c1))
* decimal issue while making the stock entry (backport [#40394](#40394)) ([#40397](#40397)) ([91af7c0](91af7c0))
* error message wording ([#40403](#40403)) ([2a40808](2a40808))
* Filter for projects in Sales Cycle ([173b3b8](173b3b8))
* get_user_default_as_list args order ([44ff607](44ff607))
* if input manualy material request on WO the material_request_item is not set so validate WO give error (backport [#40180](#40180)) ([#40421](#40421)) ([a5e6763](a5e6763))
* incorrect advance paid in Sales/Purchase Order ([6832908](6832908))
* incorrect work order status (backport [#40407](#40407)) ([#40411](#40411)) ([605132a](605132a))
* load ignored doctype and include Mode of Payment Account ([#40334](#40334)) ([5fac500](5fac500))
* MR Default Supplier search query (backport [#40273](#40273)) ([#40351](#40351)) ([a195dd3](a195dd3))
* negative stock error for the batch (backport [#40389](#40389)) ([#40391](#40391)) ([478b988](478b988))
* not able to cancel purchase receipt for old subcontracting flow (backport [#40298](#40298)) ([#40302](#40302)) ([e0e80f7](e0e80f7))
* qc created for raw materials during manufacture entry (backport [#40408](#40408)) ([#40413](#40413)) ([f932265](f932265))
* recursion issue while submitting work order (backport [#40400](#40400)) ([#40402](#40402)) ([d6e87f3](d6e87f3))
* Sender email in process statements of accounts ([953f640](953f640))
* **Shipment Parcel:** make length, width and height non-mandatory ([1476196](1476196))
* stock ledger balance qty for the batch (backport [#40274](#40274)) ([#40301](#40301)) ([62aefce](62aefce))
* use serial batch fields for subcontracting receipt (backport [#40311](#40311)) ([#40315](#40315)) ([4b15c00](4b15c00))
* use serial/batch field for rejected items (backport [#40327](#40327)) ([#40329](#40329)) ([7ca7242](7ca7242))
* Use serial/batch fields for delivery note return (backport [#40374](#40374)) ([#40376](#40376)) ([32660ab](32660ab))

### Features

* add recursion qty field in promotional scheme ([5f4b23d](5f4b23d))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.17.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 Mar 30, 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