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: update workstation hour rate when workstation change in job card #34998

Merged
merged 12 commits into from
May 8, 2023
Merged

fix: update workstation hour rate when workstation change in job card #34998

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
194ed18
fix: update workstation hour rate
Vishnu7025 Apr 13, 2023
dc0e64a
Merge branch 'frappe:develop' into develop
Vishnu7025 Apr 22, 2023
cdb05cd
Merge branch 'develop' into develop
Vishnu7025 Apr 25, 2023
25d0119
Merge branch 'develop' into develop
Vishnu7025 Apr 26, 2023
5c94f2c
Update erpnext/manufacturing/doctype/job_card/job_card.py
Vishnu7025 Apr 26, 2023
f68eef8
Update erpnext/manufacturing/doctype/job_card/job_card.py
Vishnu7025 Apr 26, 2023
06e458c
Merge branch 'develop' into develop
Vishnu7025 Apr 27, 2023
489f853
Merge branch 'develop' into develop
Vishnu7025 Apr 27, 2023
bb13c23
Merge branch 'develop' into develop
Vishnu7025 Apr 28, 2023
9fd7a05
Merge branch 'develop' into develop
Vishnu7025 Apr 29, 2023
536473a
Merge branch 'develop' into develop
Vishnu7025 May 2, 2023
530edaf
Merge branch 'develop' into develop
rohitwaghchaure May 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions erpnext/manufacturing/doctype/job_card/job_card.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,7 @@ def validate_produced_quantity(self, for_quantity, wo):
)

def update_work_order_data(self, for_quantity, time_in_mins, wo):
workstation_hour_rate = frappe.get_value("Workstation", self.workstation, "hour_rate")
jc = frappe.qb.DocType("Job Card")
jctl = frappe.qb.DocType("Job Card Time Log")

Expand All @@ -587,6 +588,7 @@ def update_work_order_data(self, for_quantity, time_in_mins, wo):
if data.get("workstation") != self.workstation:
# workstations can change in a job card
data.workstation = self.workstation
data.hour_rate = flt(workstation_hour_rate)

wo.flags.ignore_validate_update_after_submit = True
wo.update_operation_status()
Expand Down