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: convert default_item_manufacturer to link field (backport #30835) #30866

Merged
merged 1 commit into from
May 2, 2022
Merged

fix: convert default_item_manufacturer to link field (backport #30835) #30866

merged 1 commit into from
May 2, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 2, 2022

This is an automatic backport of pull request #30835 done by Mergify.
Cherry-pick of dcda556 has failed:

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

You are currently cherry-picking commit dcda55641b.
  (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/change_default_item_manufacturer_fieldtype.py

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

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

@mergify mergify bot added the conflicts label May 2, 2022
@mergify mergify bot assigned ankush May 2, 2022
@ankush ankush force-pushed the mergify/bp/version-13-hotfix/pr-30835 branch from 8eda11f to 656f2c6 Compare May 2, 2022 08:33
@ankush ankush removed the conflicts label May 2, 2022
@ankush ankush merged commit 37fad7e into version-13-hotfix May 2, 2022
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-30835 branch May 2, 2022 09:28
@ankush ankush restored the mergify/bp/version-13-hotfix/pr-30835 branch May 2, 2022 12:17
frappe-pr-bot pushed a commit that referenced this pull request May 3, 2022
@frappe-bot
chore(release): Bumped to Version 13.28.0
53024be 
# [13.28.0](v13.27.1...v13.28.0) (2022-05-03)

### Bug Fixes

* Consistent accounting dimensions across Sales and Purchase docs ([5df5058](5df5058))
* convert default_item_manufacturer to link field ([#30835](#30835)) ([#30866](#30866)) ([37fad7e](37fad7e))
* Cost center filter on payment reconciliation ([22e7f03](22e7f03))
* filters not working in Shift Assignment Calendar view ([#30822](#30822)) ([3cdbb65](3cdbb65))
* Ignore custom field validation while setup ([ee54bf7](ee54bf7))
* **india:** e-invoice generation for registered composition gst category type ([#30814](#30814)) ([#30877](#30877)) ([246869d](246869d))
* Multi currency opening invoices ([2e62d51](2e62d51))
* payment days calculation for employees joining/leaving mid-month ([#30863](#30863)) ([#30883](#30883)) ([a1b0813](a1b0813))
* Period Closing Voucher is considering GL entries with is_cancelled=1 ([#30865](#30865)) ([5a5b49b](5a5b49b))
* **pos:** number pad translations ([b01f855](b01f855))
* **pos:** search field doesn't reset on checkout ([edbf551](edbf551))
* Supply type for overseas invoices with payment of tax ([fdcc591](fdcc591))
* supply type for sez invoices with payment of tax ([cf08710](cf08710))
* Use `account_type == 'Stock'` to filter stock accounts ([93482f3](93482f3))
* **UX:** misleading stock entry lables ([#30870](#30870)) ([#30871](#30871)) ([57b03f0](57b03f0))
* **UX:** record reason for skipping attendance or marking absent for auto attendance ([#30846](#30846)) ([f7bf4a3](f7bf4a3))
* Vat Audit report fixes ([d5319a4](d5319a4))

### Features

* Copy task color from project template (backport [#30857](#30857)) ([#30859](#30859)) ([7ee18e8](7ee18e8))
* support product bundles in picklist (backport [#30762](#30762)) ([#30826](#30826)) ([645ee2d](645ee2d))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.28.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@ankush ankush deleted the mergify/bp/version-13-hotfix/pr-30835 branch May 11, 2022 14:27
deepeshgarg007 pushed a commit to deepeshgarg007/erpnext that referenced this pull request May 13, 2022
@frappe-bot @deepeshgarg007
chore(release): Bumped to Version 13.28.0
8cc2ea0 
# [13.28.0](frappe/erpnext@v13.27.1...v13.28.0) (2022-05-03)

### Bug Fixes

* Consistent accounting dimensions across Sales and Purchase docs ([5df5058](frappe@5df5058))
* convert default_item_manufacturer to link field ([frappe#30835](frappe#30835)) ([frappe#30866](frappe#30866)) ([37fad7e](frappe@37fad7e))
* Cost center filter on payment reconciliation ([22e7f03](frappe@22e7f03))
* filters not working in Shift Assignment Calendar view ([frappe#30822](frappe#30822)) ([3cdbb65](frappe@3cdbb65))
* Ignore custom field validation while setup ([ee54bf7](frappe@ee54bf7))
* **india:** e-invoice generation for registered composition gst category type ([frappe#30814](frappe#30814)) ([frappe#30877](frappe#30877)) ([246869d](frappe@246869d))
* Multi currency opening invoices ([2e62d51](frappe@2e62d51))
* payment days calculation for employees joining/leaving mid-month ([frappe#30863](frappe#30863)) ([frappe#30883](frappe#30883)) ([a1b0813](frappe@a1b0813))
* Period Closing Voucher is considering GL entries with is_cancelled=1 ([frappe#30865](frappe#30865)) ([5a5b49b](frappe@5a5b49b))
* **pos:** number pad translations ([b01f855](frappe@b01f855))
* **pos:** search field doesn't reset on checkout ([edbf551](frappe@edbf551))
* Supply type for overseas invoices with payment of tax ([fdcc591](frappe@fdcc591))
* supply type for sez invoices with payment of tax ([cf08710](frappe@cf08710))
* Use `account_type == 'Stock'` to filter stock accounts ([93482f3](frappe@93482f3))
* **UX:** misleading stock entry lables ([frappe#30870](frappe#30870)) ([frappe#30871](frappe#30871)) ([57b03f0](frappe@57b03f0))
* **UX:** record reason for skipping attendance or marking absent for auto attendance ([frappe#30846](frappe#30846)) ([f7bf4a3](frappe@f7bf4a3))
* Vat Audit report fixes ([d5319a4](frappe@d5319a4))

### Features

* Copy task color from project template (backport [frappe#30857](frappe#30857)) ([frappe#30859](frappe#30859)) ([7ee18e8](frappe@7ee18e8))
* support product bundles in picklist (backport [frappe#30762](frappe#30762)) ([frappe#30826](frappe#30826)) ([645ee2d](frappe@645ee2d))
mergify bot pushed a commit that referenced this pull request May 15, 2022
@frappe-bot @mergify
chore(release): Bumped to Version 13.28.0
b3964ee 
# [13.28.0](v13.27.1...v13.28.0) (2022-05-03)

### Bug Fixes

* Consistent accounting dimensions across Sales and Purchase docs ([5df5058](5df5058))
* convert default_item_manufacturer to link field ([#30835](#30835)) ([#30866](#30866)) ([37fad7e](37fad7e))
* Cost center filter on payment reconciliation ([22e7f03](22e7f03))
* filters not working in Shift Assignment Calendar view ([#30822](#30822)) ([3cdbb65](3cdbb65))
* Ignore custom field validation while setup ([ee54bf7](ee54bf7))
* **india:** e-invoice generation for registered composition gst category type ([#30814](#30814)) ([#30877](#30877)) ([246869d](246869d))
* Multi currency opening invoices ([2e62d51](2e62d51))
* payment days calculation for employees joining/leaving mid-month ([#30863](#30863)) ([#30883](#30883)) ([a1b0813](a1b0813))
* Period Closing Voucher is considering GL entries with is_cancelled=1 ([#30865](#30865)) ([5a5b49b](5a5b49b))
* **pos:** number pad translations ([b01f855](b01f855))
* **pos:** search field doesn't reset on checkout ([edbf551](edbf551))
* Supply type for overseas invoices with payment of tax ([fdcc591](fdcc591))
* supply type for sez invoices with payment of tax ([cf08710](cf08710))
* Use `account_type == 'Stock'` to filter stock accounts ([93482f3](93482f3))
* **UX:** misleading stock entry lables ([#30870](#30870)) ([#30871](#30871)) ([57b03f0](57b03f0))
* **UX:** record reason for skipping attendance or marking absent for auto attendance ([#30846](#30846)) ([f7bf4a3](f7bf4a3))
* Vat Audit report fixes ([d5319a4](d5319a4))

### Features

* Copy task color from project template (backport [#30857](#30857)) ([#30859](#30859)) ([7ee18e8](7ee18e8))
* support product bundles in picklist (backport [#30762](#30762)) ([#30826](#30826)) ([645ee2d](645ee2d))

(cherry picked from commit 8cc2ea0)

# Conflicts:
#	erpnext/__init__.py
hrwX pushed a commit to hrwX/erpnext that referenced this pull request May 20, 2022
@frappe-bot @hrwX
chore(release): Bumped to Version 13.28.0
1f6c962 
# [13.28.0](frappe/erpnext@v13.27.1...v13.28.0) (2022-05-03)

### Bug Fixes

* Consistent accounting dimensions across Sales and Purchase docs ([5df5058](frappe@5df5058))
* convert default_item_manufacturer to link field ([frappe#30835](frappe#30835)) ([frappe#30866](frappe#30866)) ([37fad7e](frappe@37fad7e))
* Cost center filter on payment reconciliation ([22e7f03](frappe@22e7f03))
* filters not working in Shift Assignment Calendar view ([frappe#30822](frappe#30822)) ([3cdbb65](frappe@3cdbb65))
* Ignore custom field validation while setup ([ee54bf7](frappe@ee54bf7))
* **india:** e-invoice generation for registered composition gst category type ([frappe#30814](frappe#30814)) ([frappe#30877](frappe#30877)) ([246869d](frappe@246869d))
* Multi currency opening invoices ([2e62d51](frappe@2e62d51))
* payment days calculation for employees joining/leaving mid-month ([frappe#30863](frappe#30863)) ([frappe#30883](frappe#30883)) ([a1b0813](frappe@a1b0813))
* Period Closing Voucher is considering GL entries with is_cancelled=1 ([frappe#30865](frappe#30865)) ([5a5b49b](frappe@5a5b49b))
* **pos:** number pad translations ([b01f855](frappe@b01f855))
* **pos:** search field doesn't reset on checkout ([edbf551](frappe@edbf551))
* Supply type for overseas invoices with payment of tax ([fdcc591](frappe@fdcc591))
* supply type for sez invoices with payment of tax ([cf08710](frappe@cf08710))
* Use `account_type == 'Stock'` to filter stock accounts ([93482f3](frappe@93482f3))
* **UX:** misleading stock entry lables ([frappe#30870](frappe#30870)) ([frappe#30871](frappe#30871)) ([57b03f0](frappe@57b03f0))
* **UX:** record reason for skipping attendance or marking absent for auto attendance ([frappe#30846](frappe#30846)) ([f7bf4a3](frappe@f7bf4a3))
* Vat Audit report fixes ([d5319a4](frappe@d5319a4))

### Features

* Copy task color from project template (backport [frappe#30857](frappe#30857)) ([frappe#30859](frappe#30859)) ([7ee18e8](frappe@7ee18e8))
* support product bundles in picklist (backport [frappe#30762](frappe#30762)) ([frappe#30826](frappe#30826)) ([645ee2d](frappe@645ee2d))

(cherry picked from commit 8cc2ea0)

# Conflicts:
#	erpnext/__init__.py
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@marination marination Awaiting requested review from marination

@rohitwaghchaure rohitwaghchaure Awaiting requested review from rohitwaghchaure rohitwaghchaure is a code owner

@ankush ankush Awaiting requested review from ankush

Assignees

@ankush ankush

Labels
released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@frappe-pr-bot @ankush