From 3b4d39766f78492bd2ba92dc6c6c5b91263d3e6d Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 18:18:58 +0530 Subject: [PATCH] fix: this.frm.events.update_cost is not a function (backport #41960) (#41965) * fix: this.frm.events.update_cost is not a function (#41960) (cherry picked from commit d5ed4582c360784863caa223ac74b1bed769032a) # Conflicts: # erpnext/manufacturing/doctype/workstation/workstation.json # erpnext/manufacturing/doctype/workstation/workstation.py * chore: fix conflicts * chore: fix conflicts --------- Co-authored-by: rohitwaghchaure --- .../doctype/bom_creator/bom_creator.js | 1 - .../doctype/workstation/workstation.json | 16 ++-------------- .../doctype/workstation/workstation.py | 3 +++ 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/erpnext/manufacturing/doctype/bom_creator/bom_creator.js b/erpnext/manufacturing/doctype/bom_creator/bom_creator.js index 32231aa4949..34d0fc7131b 100644 --- a/erpnext/manufacturing/doctype/bom_creator/bom_creator.js +++ b/erpnext/manufacturing/doctype/bom_creator/bom_creator.js @@ -212,7 +212,6 @@ erpnext.bom.BomConfigurator = class BomConfigurator extends erpnext.TransactionC item.stock_qty = flt(item.qty * item.conversion_factor, precision("stock_qty", item)); refresh_field("stock_qty", item.name, item.parentfield); this.toggle_conversion_factor(item); - this.frm.events.update_cost(this.frm); } } }; diff --git a/erpnext/manufacturing/doctype/workstation/workstation.json b/erpnext/manufacturing/doctype/workstation/workstation.json index 5912714052b..4758e5d3588 100644 --- a/erpnext/manufacturing/doctype/workstation/workstation.json +++ b/erpnext/manufacturing/doctype/workstation/workstation.json @@ -17,8 +17,6 @@ "column_break_3", "production_capacity", "warehouse", - "production_capacity_section", - "parts_per_hour", "workstation_status_tab", "status", "column_break_glcv", @@ -210,16 +208,6 @@ "label": "Warehouse", "options": "Warehouse" }, - { - "fieldname": "production_capacity_section", - "fieldtype": "Section Break", - "label": "Production Capacity" - }, - { - "fieldname": "parts_per_hour", - "fieldtype": "Float", - "label": "Parts Per Hour" - }, { "fieldname": "total_working_hours", "fieldtype": "Float", @@ -252,7 +240,7 @@ "idx": 1, "image_field": "on_status_image", "links": [], - "modified": "2023-11-30 12:43:35.808845", + "modified": "2024-06-20 14:17:13.806609", "modified_by": "Administrator", "module": "Manufacturing", "name": "Workstation", @@ -277,4 +265,4 @@ "sort_order": "ASC", "states": [], "track_changes": 1 -} \ No newline at end of file +} diff --git a/erpnext/manufacturing/doctype/workstation/workstation.py b/erpnext/manufacturing/doctype/workstation/workstation.py index 0966d26b781..326a8b37efc 100644 --- a/erpnext/manufacturing/doctype/workstation/workstation.py +++ b/erpnext/manufacturing/doctype/workstation/workstation.py @@ -55,6 +55,9 @@ class Workstation(Document): hour_rate_electricity: DF.Currency hour_rate_labour: DF.Currency hour_rate_rent: DF.Currency + off_status_image: DF.AttachImage | None + on_status_image: DF.AttachImage | None + plant_floor: DF.Link | None production_capacity: DF.Int working_hours: DF.Table[WorkstationWorkingHour] workstation_name: DF.Data