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

Made operation mandatory and removed mandatory from operation desc in Production Order Operation, set operation name as desc in operation master if desc is blank

Browse Source
This commit is contained in:
Neil Trini Lasrado 2016-08-22 13:12:44 +05:30
parent e4fb7b1b2f
commit 20b01873ab
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/manufacturing/doctype/operation/operation.py
View File

@ -2,13 +2,9 @@
# For license information, please see license.txt # For license information, please see license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
from frappe.model.document import Document from frappe.model.document import Document
class Operation(Document): class Operation(Document):
def calculate_op_cost(self): def validate(self):
if self.hour_rate and self.time_in_mins: if not self.description:
self.operating_cost = flt(self.hour_rate) * flt(self.time_in_mins) / 60.0 self.description = self.name
else :
self.operating_cost = 0

6
erpnext/manufacturing/doctype/production_order_operation/production_order_operation.json
View File

@ -58,7 +58,7 @@
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 1, "read_only": 1,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 1,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
@ -85,7 +85,7 @@
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 1, "read_only": 1,
"report_hide": 0, "report_hide": 0,
"reqd": 1, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
@ -539,7 +539,7 @@
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2016-07-11 03:28:04.235889", "modified": "2016-08-22 03:41:42.356833",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Production Order Operation", "name": "Production Order Operation",