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

removed unnecesssary functions. Production related feilds made mandatory in TIme Log

Browse Source
This commit is contained in:
Neil Trini Lasrado 2015-04-06 12:41:44 +05:30
parent 5ab7d930b6
commit cd1816cc5a
4 changed files with 6 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
erpnext/projects/doctype/time_log/time_log.js
View File

@ -41,45 +41,4 @@ frappe.ui.form.on("Time Log", "to_time", function(frm) {
if(frm._setting_hours) return;
frm.set_value("hours", moment(cur_frm.doc.to_time).diff(moment(cur_frm.doc.from_time),
"hours"));
});
cur_frm.set_query("production_order", function(doc) {
return {
"filters": {
"docstatus": 1
}
};
});
cur_frm.add_fetch('task','project','project');
$.extend(cur_frm.cscript, {
production_order: function(doc) {
if (doc.production_order){
var operations = [];
frappe.model.with_doc("Production Order", doc.production_order, function(pro) {
doc = frappe.get_doc("Production Order",pro);
$.each(doc.operations , function(i, row){
operations[i] = row.operation;
});
frappe.meta.get_docfield("Time Log", "operation", me.frm.doc.name).options = "\n" + operations.join("\n");
refresh_field("operation");
})
}
},
operation: function(doc) {
return frappe.call({
method: "erpnext.projects.doctype.time_log.time_log.get_workstation",
args: {
"production_order": doc.production_order,
"operation": doc.operation
},
callback: function(r) {
if(!r.exc) {
cur_frm.set_value("workstation", r.message)
}
}
});
}
});
});

8
erpnext/projects/doctype/time_log/time_log.json
View File

@ -117,7 +117,7 @@
"options": "Production Order",
"permlevel": 0,
"precision": "",
"read_only": 0
"read_only": 1
},
{
"depends_on": "",
@ -127,7 +127,7 @@
"options": "Operation",
"permlevel": 0,
"precision": "",
"read_only": 0
"read_only": 1
},
{
"depends_on": "",
@ -155,7 +155,7 @@
"options": "Workstation",
"permlevel": 0,
"precision": "",
"read_only": 0
"read_only": 1
},
{
"depends_on": "",
@ -242,7 +242,7 @@
"icon": "icon-time",
"idx": 1,
"is_submittable": 1,
"modified": "2015-03-24 08:10:31.412670",
"modified": "2015-04-06 02:47:16.187046",
"modified_by": "Administrator",
"module": "Projects",
"name": "Time Log",

14
erpnext/projects/doctype/time_log/time_log.py
View File

@ -206,20 +206,6 @@ class TimeLog(Document):
self.operation = None
self.quantity = None
@frappe.whitelist()
def get_workstation(production_order, operation):
"""Returns workstation name from Production Order against an associated Operation.
:param production_order string
:param operation string
"""
if operation:
idx, operation = operation.split('. ',1)
workstation = frappe.db.sql("""select workstation from `tabProduction Order Operation` where idx=%s and
parent=%s and operation = %s""", (idx, production_order, operation))
return workstation[0][0] if workstation else ""
@frappe.whitelist()
def get_events(start, end, filters=None):
"""Returns events for Gantt / Calendar view rendering.

2
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -474,7 +474,7 @@ class StockEntry(StockController):
pro_doc = frappe.get_doc("Production Order", self.production_order)
_validate_production_order(pro_doc)
pro_doc.run_method("update_status")
if self.purpose == "Manufacture":
if self.purpose in ["Manufacture", "Material Transfer for Manufacture"]:
pro_doc.run_method("update_production_order_qty")
self.update_planned_qty(pro_doc)