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: stock onboarding (backport #35453) #35480

Merged
merged 10 commits into from
May 30, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 30, 2023

This is an automatic backport of pull request #35453 done by Mergify.
Cherry-pick of 2e13fba has failed:

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

You are currently cherry-picking commit 2e13fbab5e.
  (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/form_tour/stock_settings/stock_settings.json

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

Cherry-pick of 964bb1d has failed:

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

You are currently cherry-picking commit 964bb1d948.
  (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/stock/doctype/stock_settings/stock_settings.json

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

- remove dead fields
- Keep only essential fields in tour

(cherry picked from commit 2e13fba)

# Conflicts:
#	erpnext/stock/doctype/stock_settings/stock_settings.json
- organize fields
- group transit fields and move them lower
- enable/disable should be button
- hide pointless fields from listview

(cherry picked from commit 40ce33d)
(cherry picked from commit 81e901b)
- remove warehouse type, it doesn't do what it says. Misleading.

(cherry picked from commit aa9f926)
(cherry picked from commit dd245cc)
Ledger is much more widely used report, better to show that first?

(cherry picked from commit 8fe8f80)
[skip ci]

(cherry picked from commit 964bb1d)

# Conflicts:
#	erpnext/stock/doctype/stock_settings/stock_settings.json
@ankush ankush merged commit d231b19 into version-14-hotfix May 30, 2023
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-35453 branch May 30, 2023 13:12
frappe-pr-bot pushed a commit that referenced this pull request May 31, 2023
# [14.26.0](v14.25.1...v14.26.0) (2023-05-31)

### Bug Fixes

* account group totals calculation to consider include_in_gross ([8dcb930](8dcb930))
* add total col for gross and net profit ([cb9b4fb](cb9b4fb))
* available qty not fetching for raw material in PP ([746a734](746a734))
* balance quantity ([56ba7d6](56ba7d6))
* Billing Address display in buying transactions ([#35451](#35451)) ([33e8d05](33e8d05))
* don't map items twice ([6f0c7cf](6f0c7cf))
* Error while validating budget ([#35487](#35487)) ([5fd00e7](5fd00e7))
* **Gross Profit:** 'company' column is ambiguous in filter ([a59c205](a59c205))
* incorrect `POS Reserved Qty` in `Stock Projected Qty` Report ([71e4f34](71e4f34))
* incorrect available quantity in BIN ([5a9452f](5a9452f))
* incorrect transferred qty in the job card ([#35478](#35478)) ([86801c2](86801c2))
* make DN item reference mandatory for Packing Slip Item ([b4e481a](b4e481a))
* map `Packed Items` while creating `Packing Slip` ([984e32c](984e32c))
* monthly WDV depr schedule for existing assets [v14] ([#35458](#35458)) ([37d437a](37d437a))
* Negative value in Reserved Qty for Production Plan ([6fe42c9](6fe42c9))
* Packing Slip Item Qty ([5345ebe](5345ebe))
* **patch:** add patch to set `packed_qty` in draft DN ([b3da2f7](b3da2f7))
* rate not fetching properly for inter transfer purchase order ([7b75f45](7b75f45))
* remove duplicate items validation ([c7628c9](c7628c9))
* retention stock entry: grab conversion factor from source ([bd75584](bd75584))
* Show future payments in accounts receivable summary ([#35416](#35416)) ([11440cc](11440cc))
* Stock Analytics and Warehouse wise Item Balance Age and Value issue ([2058993](2058993))
* stock onboarding (backport [#35453](#35453)) ([#35480](#35480)) ([d231b19](d231b19))
* tab-uniformity (backport [#35400](#35400)) ([#35402](#35402)) ([989052c](989052c))
* travis ([fe1e2fe](fe1e2fe))
* update `Packed Qty` in DN on submit and cancel of `Packing Slip` ([0bed062](0bed062))
* **ux:** don't show `Create > Packing Slip` button if items are already packed ([9854c84](9854c84))
* **ux:** get items on selecting DN in Packing Slip ([b96aa75](b96aa75))
* **ux:** remove `Get Items` button from `Packing Slip` ([4017342](4017342))
* validate Packing Slip Item Qty with DN Items ([cc7e267](cc7e267))

### Features

* add field `Packed Qty` in `Delivery Note Item` and `Packed Item` ([509b684](509b684))
* add field `pi_detail` in `Packing Slip` ([2b75474](2b75474))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.26.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 Mar 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants