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

refactor: update_serial_no function for old Maintenance Visits (backport #28843) #29352

Merged
merged 8 commits into from
Jan 19, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 19, 2022

This is an automatic backport of pull request #28843 done by Mergify.
Cherry-pick of 4f52b86 has failed:

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

You are currently cherry-picking commit 4f52b86d7e.
  (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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js

Cherry-pick of c872aa4 has failed:

On branch mergify/bp/version-13-hotfix/pr-28843
Your branch is ahead of 'origin/version-13-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit c872aa43f8.
  (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:
	new file:   erpnext/patches/v13_0/update_maintenance_schedule_field_in_visit.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/patches.txt

Cherry-pick of b98c61f has failed:

On branch mergify/bp/version-13-hotfix/pr-28843
Your branch is ahead of 'origin/version-13-hotfix' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit b98c61f2a7.
  (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/maintenance/doctype/maintenance_visit/maintenance_visit.json
	modified:   erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js

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 4f52b86)

# Conflicts:
#	erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
(cherry picked from commit c872aa4)

# Conflicts:
#	erpnext/patches.txt
(cherry picked from commit b98c61f)

# Conflicts:
#	erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
@marination
Copy link
Collaborator

marination commented Jan 19, 2022

Unrelated test_rejected_serial_no and test_payment_days_in_salary_slip_based_on_timesheet failing
edit: test_rejected_serial_no breaks outside this branch too checked locally, will fix separately

@marination marination merged commit 6c45223 into version-13-hotfix Jan 19, 2022
@marination
Copy link
Collaborator

@Mergifyio backport version-13-pre-release

@mergify
Copy link
Contributor Author

mergify bot commented Jan 19, 2022

backport version-13-pre-release

✅ Backports have been created

marination added a commit that referenced this pull request Jan 19, 2022
…se/pr-29352

refactor: update_serial_no function for old Maintenance Visits (backport #28843) (backport #29352)
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 17, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants