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: job card overlap validation (backport #38345) #38347

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 26, 2023

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

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

You are currently cherry-picking commit d8245cef72.
  (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/manufacturing/doctype/job_card/job_card.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 d8245ce)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.py
@mergify mergify bot added the conflicts label Nov 26, 2023
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Nov 26, 2023
@rohitwaghchaure rohitwaghchaure merged commit 9cf8955 into version-14-hotfix Nov 26, 2023
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-38345 branch November 26, 2023 12:14
@VihangT
Copy link
Contributor

VihangT commented Nov 28, 2023

Hello Sir,
I found these following cases where it still fails to detect correct overlap
image

While testing I found following solutions for few cases:

  1. Sorting of these time logs list based on from_time

  2. replacing “and get_datetime(next_row.from_time) <= get_datetime(row.to_time)" with "and get_datetime(next_row.from_time) < get_datetime(row.to_time)"

  3. replacing “get_datetime(next_row.to_time) >= get_datetime(row.from_time)" with "get_datetime(next_row.to_time) > get_datetime(row.from_time)"
    After doing above three steps ,still this fails with last case as last case has 2 sets of overlapping job cards with 2job cards in each

frappe-pr-bot pushed a commit that referenced this pull request Nov 28, 2023
# [14.51.0](v14.50.0...v14.51.0) (2023-11-28)

### Bug Fixes

* Alert message and make sure invoice due dates are different for effective test ([0813f02](0813f02))
* allow on submit for child table fields ([d72fbe9](d72fbe9))
* annual income and expenses in digest ([7dce68b](7dce68b))
* check reposting settings before allowing editable si ([f777d24](f777d24))
* condition in other bundle utils ([e96ef73](e96ef73))
* create contact if existing customer doesn't have contact ([bb2aa90](bb2aa90))
* do not set repost flag without validating voucher ([3ad6d08](3ad6d08))
* filter bundle items based on disabled check ([8a3a068](8a3a068))
* fiscal year using future date ([b0aa4ef](b0aa4ef))
* has_product_bundle util to only check for enabled bundles ([fd19ac5](fd19ac5))
* job card overlap validation (backport [#38345](#38345)) ([#38347](#38347)) ([9cf8955](9cf8955))
* Merge conflicts ([e7183e3](e7183e3))
* Negative Qty and Rates in SO/PO ([#38253](#38253)) ([50f3b01](50f3b01))
* Payment Reco Issue and chart of account importer ([730a3bb](730a3bb))
* Re-add no.of rows split in alert message ([fb19e7f](fb19e7f))
* **regional:** item wise tax calc issue ([0448d56](0448d56))
* Server Error while creating Product Bundle (backport [#38377](#38377)) ([#38379](#38379)) ([ca6a788](ca6a788))
* skip disabled bundles for non-report utils ([445e9c9](445e9c9))
* skip fixed assets in parent ([5dcd806](5dcd806))
* stock availability not showing ([#38382](#38382)) ([3929cc3](3929cc3))
* validation for existing bundles ([ae960e7](ae960e7))

### Features

* add disabled field in product bundle ([8d5efc9](8d5efc9))
* new Report "Lost Quotations" ([#38309](#38309)) ([1773e31](1773e31))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.51.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 2, 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.

3 participants