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

feat(Item Price): make UOM mandatory (backport #40588) #41312

Merged
merged 2 commits into from
May 3, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 3, 2024

A price is always specific to an UOM. For example, it doesn't make sense to use the same price for grams and kilograms.

Docs: https://docs.erpnext.com/docs/user/manual/en/item-price#2-1-unit-of-measurement-uom-


This is an automatic backport of pull request #40588 done by Mergify.

(cherry picked from commit a61148c)

# Conflicts:
#	erpnext/stock/doctype/item_price/item_price.json
@mergify mergify bot requested a review from rohitwaghchaure as a code owner May 3, 2024 04:35
@mergify mergify bot added the conflicts label May 3, 2024
@mergify mergify bot requested a review from s-aga-r as a code owner May 3, 2024 04:35
Copy link
Contributor Author

mergify bot commented May 3, 2024

Cherry-pick of a61148c has failed:

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

You are currently cherry-picking commit a61148c464.
  (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/stock/doctype/item_price/item_price.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/doctype/item_price/item_price.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 May 3, 2024
@s-aga-r s-aga-r removed the conflicts label May 3, 2024
@s-aga-r s-aga-r merged commit cab0e30 into version-15-hotfix May 3, 2024
11 checks passed
@s-aga-r s-aga-r deleted the mergify/bp/version-15-hotfix/pr-40588 branch May 3, 2024 05:47
frappe-pr-bot pushed a commit that referenced this pull request May 9, 2024
# [15.23.0](v15.22.2...v15.23.0) (2024-05-09)

### Bug Fixes

* Add PO reference ([c417b0c](c417b0c))
* correct ordered qty on SO when removing PO item - v15 ([#41342](#41342)) ([5c1043f](5c1043f))
* Cost center not getting saved in PSOA ([fbbc0af](fbbc0af))
* Do not deduct TCS for opening invoices ([1999b7a](1999b7a))
* filter validation for batch-wise balance history report (backport [#41356](#41356)) ([#41361](#41361)) ([913cea0](913cea0))
* future subscripition updates ([b27a55e](b27a55e))
* GL Entries against orders as an advance ([e49a401](e49a401))
* incorrect qty picked in the pick list (backport [#41378](#41378)) ([#41381](#41381)) ([a293ec0](a293ec0))
* incorrect query for Purchase Invoice rate in GP ([20daae4](20daae4))
* **Item:** allow UOM conversion for non-stock items (backport [#41267](#41267)) ([#41346](#41346)) ([cd3ca1e](cd3ca1e))
* Merge debit and credit in transaction currency while merging gle with similar head ([9a58823](9a58823))
* missing Item Name on Save for Quotation created from Item (backport [#41233](#41233)) ([#41304](#41304)) ([6491577](6491577))
* Patch to fix the incorrect debit and credit in transaction currency ([f7e165b](f7e165b))
* Patch to remove cancelled asset capitalization from asset ([a755540](a755540))
* pick list with multiple batch issue (backport [#41335](#41335)) ([#41338](#41338)) ([1b1dfa8](1b1dfa8))
* pricing rule rounding ([b93828c](b93828c))
* Purchase Invoice gain loss gl entry for periodic inventory ([0513481](0513481))
* resolved conflict ([5039f45](5039f45))
* resolved conflict ([81afdcf](81afdcf))
* search for item price in stock UOM (backport [#41075](#41075)) ([#41313](#41313)) ([112f96b](112f96b))
* update project URLs (backport [#41331](#41331)) ([#41332](#41332)) ([bb619a6](bb619a6))

### Features

* **Item Price:** make UOM mandatory (backport [#40588](#40588)) ([#41312](#41312)) ([cab0e30](cab0e30))

### Performance Improvements

* index on item code for the Pick List Item doctype (backport [#41357](#41357)) ([#41364](#41364)) ([bba738f](bba738f))
@frappe-pr-bot
Copy link
Collaborator

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

Successfully merging this pull request may close these issues.

None yet

3 participants