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.

Sign up for GitHub

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

Jump to bottom

fix: remove unnecessary permissions from Appointment and Appointment Booking Settings (backport #33358) #33395

Merged
merged 9 commits into from
Dec 20, 2022
Merged

fix: remove unnecessary permissions from Appointment and Appointment Booking Settings (backport #33358) #33395

merged 9 commits into from
Dec 20, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 20, 2022

This is an automatic backport of pull request #33358 done by Mergify.
Cherry-pick of 9a00b3b has failed:

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

You are currently cherry-picking commit 9a00b3bdbd.
  (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/www/book_appointment/verify/index.html

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

Cherry-pick of 56f3ac1 has failed:

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

You are currently cherry-picking commit 56f3ac15d8.
  (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/crm/doctype/appointment/appointment.py
	modified:   erpnext/www/book_appointment/verify/index.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/www/book_appointment/verify/index.html

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

@DaizyModi @mergify
fix: remove guest role from doctype
b218da1 
(cherry picked from commit ae8dd2b)
@DaizyModi @mergify
fix: remove unused page book-appointment
9402769 
(cherry picked from commit 25f0b26)
@DaizyModi @mergify
fix: format html of verify email for book appointment
0d74983 
(cherry picked from commit 9a00b3b)

# Conflicts:
#	erpnext/www/book_appointment/verify/index.html
@DaizyModi @mergify
fix: fetch required details from appointment booking settings
bdf23ce 
(cherry picked from commit ac51c27)
@DaizyModi @mergify
fix: agent assignment and permissions for appointment
4645769 
(cherry picked from commit 4bfe2ea)
@DaizyModi @mergify
fix: removed unncessary changes
fe3a1b7 
(cherry picked from commit 56f3ac1)

# Conflicts:
#	erpnext/www/book_appointment/verify/index.html
@DaizyModi @mergify
fix: pass necessary params instead of args
7b813e9 
(cherry picked from commit 5d0b5c8)
@DaizyModi @mergify
fix: removed unused data and minor changes
a3087c9 
(cherry picked from commit 4802d71)
@mergify mergify bot added the conflicts label Dec 20, 2022
@mergify mergify bot requested a review from NagariaHussain as a code owner December 20, 2022 06:23
@mergify mergify bot mentioned this pull request Dec 20, 2022
Merged
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Dec 20, 2022
@deepeshgarg007 deepeshgarg007 merged commit 6ef7eaf into version-14-hotfix Dec 20, 2022
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-33358 branch December 20, 2022 12:54
frappe-pr-bot pushed a commit that referenced this pull request Dec 20, 2022
@frappe-bot
chore(release): Bumped to Version 14.11.0
29bb873 
# [14.11.0](v14.10.1...v14.11.0) (2022-12-20)

### Bug Fixes

* Consolidated financial report ([16ce411](16ce411))
* Cost center filter not working in cash flow report ([ce5065b](ce5065b))
* Cost Center for tax withholding invoices ([728643a](728643a))
* cost_center filter fix for 'Get Outstanding Invoice' in PE ([ff61997](ff61997))
* cost_center filter gives incorrect output ([9b2b281](9b2b281))
* daily scheduler to identify and fix stock transfer entries having incorrect valuation ([deb3efd](deb3efd))
* disabled items showing in the report 'Itemwise Recommended Reorder Level ([493509e](493509e))
* get_serial_nos_for_fg() missing 1 required positional argument: 'args' ([bddb5b8](bddb5b8))
* incorrect type hints (backport [#33381](#33381)) ([#33384](#33384)) ([fa77259](fa77259))
* Payment Request flow fixes from Order to Payment Entry ([a01db8f](a01db8f))
* remove unnecessary permissions from Appointment and Appointment Booking Settings ([#33358](#33358)) ([#33395](#33395)) ([6ef7eaf](6ef7eaf))
* translation for warning on Overbilling/-receipt/-delivery ([ba51d50](ba51d50))
* Unable to import COA through importer ([f8c09ee](f8c09ee))
* unsupported operand type(s) for +: 'int' and 'NoneType' ([7bdfb3d](7bdfb3d))
* unsupported operand type(s) for +=: 'int' and 'NoneType' ([88dc81b](88dc81b))
* use highest precision for exchange rate. ([4a8a84d](4a8a84d))

### Features

* Ignore company related doctype for other apps via hooks ([cd5a2af](cd5a2af))
* improve visibility of default values ([7ff50b9](7ff50b9))
* incoterm named place ([bfe57ac](bfe57ac))
* more control when printing RFQ ([07cda0a](07cda0a))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.11.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@barredterra barredterra mentioned this pull request Mar 7, 2023
Closed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 12, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@NagariaHussain NagariaHussain Awaiting requested review from NagariaHussain

Assignees
No one assigned
Labels
needs-tests This PR needs automated unit-tests. released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@frappe-pr-bot @deepeshgarg007 @DaizyModi