mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-20 07:22:13 +00:00
* fix: this.frm.events.update_cost is not a function (#41960)
(cherry picked from commit d5ed4582c3)
# Conflicts:
# erpnext/manufacturing/doctype/workstation/workstation.json
# erpnext/manufacturing/doctype/workstation/workstation.py
* chore: fix conflicts
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This commit is contained in:
@@ -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));
|
item.stock_qty = flt(item.qty * item.conversion_factor, precision("stock_qty", item));
|
||||||
refresh_field("stock_qty", item.name, item.parentfield);
|
refresh_field("stock_qty", item.name, item.parentfield);
|
||||||
this.toggle_conversion_factor(item);
|
this.toggle_conversion_factor(item);
|
||||||
this.frm.events.update_cost(this.frm);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -17,8 +17,6 @@
|
|||||||
"column_break_3",
|
"column_break_3",
|
||||||
"production_capacity",
|
"production_capacity",
|
||||||
"warehouse",
|
"warehouse",
|
||||||
"production_capacity_section",
|
|
||||||
"parts_per_hour",
|
|
||||||
"workstation_status_tab",
|
"workstation_status_tab",
|
||||||
"status",
|
"status",
|
||||||
"column_break_glcv",
|
"column_break_glcv",
|
||||||
@@ -210,16 +208,6 @@
|
|||||||
"label": "Warehouse",
|
"label": "Warehouse",
|
||||||
"options": "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",
|
"fieldname": "total_working_hours",
|
||||||
"fieldtype": "Float",
|
"fieldtype": "Float",
|
||||||
@@ -252,7 +240,7 @@
|
|||||||
"idx": 1,
|
"idx": 1,
|
||||||
"image_field": "on_status_image",
|
"image_field": "on_status_image",
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2023-11-30 12:43:35.808845",
|
"modified": "2024-06-20 14:17:13.806609",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Manufacturing",
|
"module": "Manufacturing",
|
||||||
"name": "Workstation",
|
"name": "Workstation",
|
||||||
@@ -277,4 +265,4 @@
|
|||||||
"sort_order": "ASC",
|
"sort_order": "ASC",
|
||||||
"states": [],
|
"states": [],
|
||||||
"track_changes": 1
|
"track_changes": 1
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,6 +55,9 @@ class Workstation(Document):
|
|||||||
hour_rate_electricity: DF.Currency
|
hour_rate_electricity: DF.Currency
|
||||||
hour_rate_labour: DF.Currency
|
hour_rate_labour: DF.Currency
|
||||||
hour_rate_rent: 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
|
production_capacity: DF.Int
|
||||||
working_hours: DF.Table[WorkstationWorkingHour]
|
working_hours: DF.Table[WorkstationWorkingHour]
|
||||||
workstation_name: DF.Data
|
workstation_name: DF.Data
|
||||||
|
|||||||
Reference in New Issue
Block a user