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: job card overlap unknown column jc.employee #27403

Merged
merged 3 commits into from
Sep 9, 2021
Merged

fix: job card overlap unknown column jc.employee #27403

merged 3 commits into from
Sep 9, 2021

Conversation

ankush
Copy link
Member

@ankush ankush commented Sep 9, 2021 •
edited
Loading

Steps to reproduce:

  1. Trim tables on job card table / fresh install.
  2. Create two job cards somehow (Work order with operations > submit)
  3. In two separate job cards add same employee in overlapping time.

Observed: SQL error.
Expected: overlap error.

closes #27399
closes #27064

@ankush ankush added backport version-13-hotfix squash Meant to tell reviewers that this PR should be squashed into a single commit while merging. labels Sep 9, 2021
@ankush
Copy link
Member Author

ankush commented Sep 9, 2021

unrelated HR test failing.

@ankush ankush merged commit 678335f into frappe:develop Sep 9, 2021
@frappe-pr-bot frappe-pr-bot mentioned this pull request Sep 9, 2021
Merged
frappe-pr-bot pushed a commit to frappe-pr-bot/erpnext that referenced this pull request Sep 9, 2021
@ankush @frappe-bot
fix: job card overlap unknown column jc.employee (frappe#27403)
7e401b3 
* fix: incorrect query for job card overlap

* test: employee overlap in job cards

* test: simplify/refactor job card tests

(cherry picked from commit 678335f)
@ankush ankush deleted the job_card_overlap branch September 9, 2021 07:00
ankush added a commit that referenced this pull request Sep 9, 2021
@frappe-pr-bot @ankush
fix: job card overlap unknown column jc.employee (#27403) (#27405)
5126b3f 
* fix: incorrect query for job card overlap

* test: employee overlap in job cards

* test: simplify/refactor job card tests

(cherry picked from commit 678335f)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
@rohitwaghchaure rohitwaghchaure mentioned this pull request Sep 15, 2021
Merged
asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
@ankush
fix: job card overlap unknown column jc.employee (frappe#27403)
45f96c2 
* fix: incorrect query for job card overlap

* test: employee overlap in job cards

* test: simplify/refactor job card tests
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 24, 2025
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

Assignees
No one assigned
Labels
backport version-13-hotfix squash Meant to tell reviewers that this PR should be squashed into a single commit while merging.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Possible Error in job_card.py Error on selecting the employees while creating the time logs for the Job card
1 participant
@ankush