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: issue occured when creating supplier with contact details (backport #38147) #39046

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 31, 2023

This is an automatic backport of pull request #38147 done by Mergify.
Cherry-pick of 7842c9f has failed:

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

You are currently cherry-picking commit 7842c9fba8.
  (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/selling/doctype/customer/customer.py

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 7842c9f)

# Conflicts:
#	erpnext/selling/doctype/customer/customer.py
@mergify mergify bot requested a review from deepeshgarg007 as a code owner December 31, 2023 07:56
@mergify mergify bot added the conflicts label Dec 31, 2023
@mergify mergify bot requested a review from ruthra-kumar as a code owner December 31, 2023 07:56
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Dec 31, 2023
@rohitwaghchaure rohitwaghchaure merged commit 81ef7b4 into version-14-hotfix Dec 31, 2023
10 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-14-hotfix/pr-38147 branch December 31, 2023 12:36
frappe-pr-bot pushed a commit that referenced this pull request Jan 3, 2024
# [14.58.0](v14.57.0...v14.58.0) (2024-01-03)

### Bug Fixes

* Add missing french translations (backport [#38368](#38368)) ([#38513](#38513)) ([2c90ee2](2c90ee2))
* **DX:** capture tracebacks with context (backport [#39060](#39060)) ([#39062](#39062)) ([fe9acc8](fe9acc8))
* **Hierarchy Chart:** check if company is set before loading children ([#38985](#38985)) ([e4d6df3](e4d6df3))
* issue occured when creating supplier with contact details (backport [#38147](#38147)) ([#39046](#39046)) ([81ef7b4](81ef7b4))
* Opening balance in bank reconciliation tool ([#38977](#38977)) ([a2cba1b](a2cba1b))
* remove bad defaults (backport [#38986](#38986)) ([#38987](#38987)) ([29d383a](29d383a))
* select options should dynamically load dimensions ([bfc94cf](bfc94cf))
* take quantity into account when setting asset's gross purchase amt (backport [#39056](#39056)) ([#39057](#39057)) ([b8dce3e](b8dce3e))
* undefined error in Budget Variance and Profitability report ([cad15cd](cad15cd))
* use `Stock Qty` while getting `POS Reserved Qty` (backport [#38962](#38962)) ([#38982](#38982)) ([7ad42ec](7ad42ec))
* Validate account in Sales/Purchase Taxes and Charges Template ([#39013](#39013)) ([c0b5980](c0b5980))
* work order with multi level, fetch operting cost from sub-assembly (backport [#38992](#38992)) ([#39027](#39027)) ([88e5c9e](88e5c9e))

### Features

* Merge taxes from mapped docs ([#38346](#38346)) ([c74e6aa](c74e6aa))
* Show Ledger view for Purchase & Sales Register ([#38801](#38801)) ([04fb215](04fb215))

### Performance Improvements

* index item_code in bom explosion item (backport [#39085](#39085)) ([#39087](#39087)) ([558861b](558861b))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.58.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 18, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
conflicts needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants