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(Vehicle): allow doc renaming and add test (backport #41729) #41785

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 4, 2024

Please provide enough information so that others can review your pull request:

Explain the details for making this change. What existing problem does the pull request solve?

Screenshots/GIFs


This is an automatic backport of pull request #41729 done by [Mergify](https://mergify.com).

fix(Vehicle): allow renaming doc and add test

(cherry picked from commit c76f466)

# Conflicts:
#	erpnext/setup/doctype/vehicle/vehicle.json
Copy link
Contributor Author

mergify bot commented Jun 4, 2024

Cherry-pick of c76f466 has failed:

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

You are currently cherry-picking commit c76f466528.
  (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/setup/doctype/vehicle/test_vehicle.py

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

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

@ruchamahabal ruchamahabal merged commit 4d37739 into version-15-hotfix Jun 7, 2024
11 checks passed
@ruchamahabal ruchamahabal deleted the mergify/bp/version-15-hotfix/pr-41729 branch June 7, 2024 10:15
frappe-pr-bot pushed a commit that referenced this pull request Jun 11, 2024
## [15.27.4](v15.27.3...v15.27.4) (2024-06-11)

### Bug Fixes

* Add additional condition application ([1fca6ea](1fca6ea))
* Add posting date to key for consolidated view ([9472085](9472085))
* Add timestamp to key for immutable views ([9e9bc8b](9e9bc8b))
* asset depreciations and balances report correction (backport [#41824](#41824)) ([#41851](#41851)) ([28b7fad](28b7fad))
* calculate totals and taxes ([5544309](5544309))
* Do no apply pricing rule on qty change for mapped docs ([822bc58](822bc58))
* do not fetch items with no active BOM in PP (backport [#41833](#41833)) ([#41835](#41835)) ([30c0b2b](30c0b2b))
* enable no_copy for timesheet in sales invoice ([f1ad0f6](f1ad0f6))
* fixing Item-wise sales register ([f36db7e](f36db7e))
* fixing Item-wise sales register [#41373](#41373) ([5e0fa1b](5e0fa1b))
* fixing Item-wise sales register and purchase register [#41373](#41373) ([a4b28ba](a4b28ba))
* Item-wise Sales and Purchase register with no item codes [#41373](#41373) ([96405e8](96405e8))
* stock_value_change for legacy serial nos (backport [#41825](#41825)) ([#41826](#41826)) ([a7971cf](a7971cf))
* terms and conditions for material request (backport [#41834](#41834)) ([#41837](#41837)) ([1ead667](1ead667))
* typo in method - holiday list (backport [#41811](#41811)) ([#41812](#41812)) ([4d3e883](4d3e883))
* valuation rate for backdated legacy serial/batches (backport [#41788](#41788)) ([#41821](#41821)) ([8d31243](8d31243))
* valuation rate for serial and batch bundle for current bundle (backport [#41850](#41850)) ([#41860](#41860)) ([3e4c568](3e4c568))
* **Vehicle:** allow doc renaming and add test (backport [#41729](#41729)) ([#41785](#41785)) ([4d37739](4d37739))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.27.4 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 26, 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.

3 participants