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: make item field read-only in batch (backport #38010) #38033

Merged
merged 2 commits into from
Nov 11, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 10, 2023

This is an automatic backport of pull request #38010 done by Mergify.
Cherry-pick of 779260f has failed:

On branch mergify/bp/version-14-hotfix/pr-38010
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit 779260fb49.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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

(cherry picked from commit 779260f)

# Conflicts:
#	erpnext/stock/doctype/batch/batch.json
@s-aga-r s-aga-r removed the conflicts label Nov 11, 2023
@s-aga-r s-aga-r merged commit 424ebd1 into version-14-hotfix Nov 11, 2023
10 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-38010 branch November 11, 2023 05:22
frappe-pr-bot pushed a commit that referenced this pull request Nov 14, 2023
# [14.48.0](v14.47.4...v14.48.0) (2023-11-14)

### Bug Fixes

* asset depreciation ledger (backport [#37991](#37991)) ([#37992](#37992)) ([043dc1b](043dc1b))
* close `Credit Limit Crossed` dialog (backport [#38052](#38052)) ([#38058](#38058)) ([6979c3e](6979c3e))
* COA Importer app related issues ([#37238](#37238)) ([57ce73d](57ce73d))
* german translations of Accounts Settings ([b75aae9](b75aae9))
* indentation issue in the Production Plan Summary report (backport [#38019](#38019)) ([#38068](#38068)) ([c552884](c552884))
* make adjustment entry using stock reconciliation (backport [#37995](#37995)) ([#38008](#38008)) ([984703c](984703c))
* make item field read-only in batch (backport [#38010](#38010)) ([#38033](#38033)) ([424ebd1](424ebd1))
* minor change added to test_case ([6b34568](6b34568))
* minor issue ([0eab723](0eab723))
* new logic for handling revaluation journals ([9c0d80c](9c0d80c))
* pick serial nos from selected batch only ([#37988](#37988)) ([db29180](db29180))
* sales order not assigned to territory orders ([#37905](#37905)) ([#38024](#38024)) ([620f4f2](620f4f2))
* Set right party name in bank transaction ([21b430a](21b430a))
* **translations:** suggestions from review ([4d2169e](4d2169e))
* Use `process.extract` to get the corresponding party doc name of the result ([b0a184e](b0a184e))

### Features

* **accounts_receivable:** test_case added for multi-select customer group ([cf0d936](cf0d936))
* multi-select customer group in AR Report ([935286f](935286f))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.48.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 Jan 12, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants