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: add the company in payment request bcz delete company transactions (backport #42664) #42982

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 29, 2024

version 15

fixes: #42659

Before:

before_payment_request.mp4

After:

after_payment_request.mp4

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

Nihantra-Patel and others added 2 commits August 29, 2024 09:46
(cherry picked from commit 12834cc)

# Conflicts:
#	erpnext/accounts/doctype/payment_request/payment_request.json
Copy link
Contributor Author

mergify bot commented Aug 29, 2024

Cherry-pick of 12834cc has failed:

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

You are currently cherry-picking commit 12834ccf9a.
  (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/accounts/doctype/payment_request/payment_request.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/payment_request/payment_request.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

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Aug 29, 2024
@Nihantra-Patel Nihantra-Patel removed needs-tests This PR needs automated unit-tests. conflicts labels Aug 29, 2024
@Nihantra-Patel Nihantra-Patel merged commit 42e7725 into version-15-hotfix Aug 29, 2024
11 checks passed
@Nihantra-Patel Nihantra-Patel deleted the mergify/bp/version-15-hotfix/pr-42664 branch August 29, 2024 10:11
frappe-pr-bot pushed a commit that referenced this pull request Sep 5, 2024
## [15.34.1](v15.34.0...v15.34.1) (2024-09-05)

### Bug Fixes

* add the company in payment request bcz delete company transactions (backport [#42664](#42664)) ([#42982](#42982)) ([42e7725](42e7725))
* added app permission check for apps page ([a35ce12](a35ce12))
* adjust price insertion logic for internal suppliers/customers ([#42988](#42988)) ([daa75ee](daa75ee))
* auto reorder material request mail issue (backport [#43066](#43066)) ([#43068](#43068)) ([d2b2002](d2b2002))
* **capitalization:** debit cwip account instead of fixed asset account ([#42857](#42857)) ([f3c60ea](f3c60ea))
* company accounts setup_queries ([b99cdb5](b99cdb5))
* disabled batches showing in the list (backport [#43024](#43024)) ([#43069](#43069)) ([56dad7d](56dad7d))
* don't allow capitalizing only service item for new composite asset ([a833010](a833010))
* improve asset item matching logic ([3bb1867](3bb1867))
* indentation ([4d7c0c0](4d7c0c0))
* link Purchase Invoice and Receipt Items to Asset ([1121c66](1121c66))
* retain date filter when redirecting in Profit and Loss report ([f0e3fb4](f0e3fb4))
* typeerror on Payment Entry ([6d51d14](6d51d14))
* typerror on default_currency ([7d6984c](7d6984c))
* update develop_version in hooks ([6c8e0fd](6c8e0fd))
* validate component quantity according to BOM (backport [#43011](#43011)) ([#43014](#43014)) ([fee2255](fee2255))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 16, 2024
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.

1 participant