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: required by date in the reorder material request (backport #44497) #44508

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 4, 2024

Issue

The lead time days in the item master are not considered when automatically calculating the 'Required By' date in the material request created based on the reorder level.

Lead time days = 25 (in the item master)
Today's date = 04-12-2024
Expected Required By Date = 29-12-2024
Actual Required By Date = 04-12-2024 (Wrong)

Screenshot 2024-12-04 at 12 27 35 PM

After Fix

Screenshot 2024-12-04 at 12 25 42 PM
This is an automatic backport of pull request #44497 done by [Mergify](https://mergify.com).

(cherry picked from commit 4001166)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/test_stock_entry.py
Copy link
Contributor Author

mergify bot commented Dec 4, 2024

Cherry-pick of 4001166 has failed:

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

You are currently cherry-picking commit 4001166ecc.
  (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/reorder_item.py

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

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 stock label Dec 4, 2024
@rohitwaghchaure rohitwaghchaure merged commit 15e3663 into version-14-hotfix Dec 4, 2024
10 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-14-hotfix/pr-44497 branch December 4, 2024 13:33
@rohitwaghchaure
Copy link
Collaborator

@Mergifyio backport version-14

Copy link
Contributor Author

mergify bot commented Dec 5, 2024

backport version-14

✅ Backports have been created

mergify bot added a commit that referenced this pull request Dec 5, 2024
… (#44508)

* fix: required by date in the reorder material request (#44497)

(cherry picked from commit 4001166)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/test_stock_entry.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <[email protected]>
(cherry picked from commit 15e3663)
rohitwaghchaure added a commit that referenced this pull request Dec 5, 2024
fix: required by date in the reorder material request (backport #44497) (backport #44508)
frappe-pr-bot pushed a commit that referenced this pull request Dec 5, 2024
## [14.78.1](v14.78.0...v14.78.1) (2024-12-05)

### Bug Fixes

* required by date in the reorder material request (backport [#44497](#44497)) ([#44508](#44508)) ([e0b8c27](e0b8c27))
frappe-pr-bot pushed a commit that referenced this pull request Dec 12, 2024
## [14.78.2](v14.78.1...v14.78.2) (2024-12-12)

### Bug Fixes

* add docstatus for translation ([0a4090a](0a4090a))
* add label strings for translation in pos_controller.js ([8233e22](8233e22))
* add labels for translation in production_analytics.py ([1a7f195](1a7f195))
* add labels for translation in purchase_order_analysis.py ([f9974f9](f9974f9))
* add labels for translation in quality_inspection_summary.py ([9986c26](9986c26))
* add labels for translation in sales_order_analysis.py ([bad1b2a](bad1b2a))
* add labels for translation in sales_order.js ([3620dda](3620dda))
* add string for translation in delayed_tasks_summary.py ([ce04f6d](ce04f6d))
* add strings for translation in pos_item_cart.js ([1f0f31a](1f0f31a))
* add strings for translation payment_terms_status_for_sales_order.py ([17dad01](17dad01))
* add title for translation in  asset.js ([aed90f7](aed90f7))
* **Bank Transaction:** error in party matching should not block submitting (backport [#44416](#44416)) ([#44573](#44573)) ([ebc8bed](ebc8bed))
* description overwrite on qty change (backport [#44606](#44606)) ([#44608](#44608)) ([a460bf9](a460bf9))
* incorrect stock UOM for BOM raw materials (backport [#44528](#44528)) ([#44530](#44530)) ([ecc756b](ecc756b))
* inv dimensions fields not creating for standard doctype (backport [#44504](#44504)) ([#44514](#44514)) ([c502b56](c502b56))
* prevent set_payment_schedule on return documents ([3c8b637](3c8b637))
* required by date in the reorder material request (backport [#44497](#44497)) ([#44508](#44508)) ([15e3663](15e3663))
* strings for translation in pos_past_order_summary.js ([dfbb227](dfbb227))
* variant qty while making work order from BOM (backport [#44548](#44548)) ([#44550](#44550)) ([e2aedc8](e2aedc8))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.78.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants