Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: remove check box for batch operation

Browse Source
This commit is contained in:
Govind S Menokee 2019-07-14 22:55:12 +05:30
parent 473a5477b6
commit f3e10a489d
3 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/manufacturing/doctype/bom/bom.py
View File

@ -578,7 +578,7 @@ class BOM(WebsiteGenerator):
for d in self.operations: for d in self.operations:
if not d.description: if not d.description:
d.description = frappe.db.get_value('Operation', d.operation, 'description') d.description = frappe.db.get_value('Operation', d.operation, 'description')
if not d.is_batch_operation: if not d.batch_size > 0:
d.batch_size = 1 d.batch_size = 1
def get_list_context(context): def get_list_context(context):

12
erpnext/manufacturing/doctype/bom_operation/bom_operation.json
View File

@ -11,7 +11,6 @@
"col_break1", "col_break1",
"hour_rate", "hour_rate",
"time_in_mins", "time_in_mins",
"is_batch_operation",
"batch_size", "batch_size",
"operating_cost", "operating_cost",
"base_hour_rate", "base_hour_rate",
@ -100,15 +99,8 @@
"fieldtype": "Attach", "fieldtype": "Attach",
"label": "Image" "label": "Image"
}, },
{
"default": "0",
"fieldname": "is_batch_operation",
"fieldtype": "Check",
"label": "Is Batch Operation"
},
{ {
"default": "1", "default": "1",
"depends_on": "eval:doc.is_batch_operation==1;",
"fieldname": "batch_size", "fieldname": "batch_size",
"fieldtype": "Int", "fieldtype": "Int",
"label": "Batch Size" "label": "Batch Size"
@ -116,8 +108,8 @@
], ],
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"modified": "2019-06-29 03:35:32.213562", "modified": "2019-07-14 22:35:55.374037",
"modified_by": "Administrator", "modified_by": "govindsmenokee@gmail.com",
"module": "Manufacturing", "module": "Manufacturing",
"name": "BOM Operation", "name": "BOM Operation",
"owner": "Administrator", "owner": "Administrator",

3
erpnext/manufacturing/doctype/work_order/work_order.py
View File

@ -350,10 +350,7 @@ class WorkOrder(Document):
bom_qty = frappe.db.get_value("BOM", self.bom_no, "quantity") bom_qty = frappe.db.get_value("BOM", self.bom_no, "quantity")
for d in self.get("operations"): for d in self.get("operations"):
if d.is_batch_operation:
d.time_in_mins = flt(d.time_in_mins) / flt(bom_qty) * math.ceil(flt(self.qty) / flt(d.batch_size)) d.time_in_mins = flt(d.time_in_mins) / flt(bom_qty) * math.ceil(flt(self.qty) / flt(d.batch_size))
else:
d.time_in_mins = flt(d.time_in_mins) / flt(bom_qty) * flt(self.qty)
self.calculate_operating_cost() self.calculate_operating_cost()