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

time log activity type made mandatory, new activity type manufacturing created

Browse Source
This commit is contained in:
Neil Trini Lasrado 2015-02-04 12:31:11 +05:30
parent 07a0d250ed
commit 11cd4f6c30
5 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/manufacturing/doctype/production_order/production_order.py
View File

@ -291,6 +291,7 @@ def make_time_log(name, operation, from_time, to_time, qty=None, project=None,
time_log.project = project
time_log.operation= operation
time_log.workstation= workstation
time_log.activity_type= "Manufacturing"
time_log.completed_qty = flt(qty)
if from_time and to_time :
time_log.calculate_total_hours()

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

@ -68,5 +68,11 @@ $.extend(cur_frm.cscript, {
}
}
});
},
time_log_for: function(doc) {
if (doc.time_log_for == 'Manufacturing') {
cur_frm.set_value("activity_type", "Manufacturing")
}
}
});

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

@ -68,7 +68,7 @@
"reqd": 0
},
{
"depends_on": "eval:doc.time_log_for != 'Manufacturing'",
"depends_on": "",
"fieldname": "activity_type",
"fieldtype": "Link",
"in_list_view": 0,
@ -76,7 +76,7 @@
"options": "Activity Type",
"permlevel": 0,
"read_only": 0,
"reqd": 0
"reqd": 1
},
{
"depends_on": "eval:doc.time_log_for != 'Manufacturing'",
@ -116,7 +116,6 @@
"read_only": 1
},
{
"depends_on": "eval:doc.time_log_for == 'Manufacturing'",
"description": "Operation completed for how many finished goods?",
"fieldname": "completed_qty",
"fieldtype": "Float",
@ -237,5 +236,5 @@
"write": 1
}
],
"title_field": ""
"title_field": "activity_type"
}

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

@ -24,7 +24,6 @@ class TimeLog(Document):
self.check_workstation_timings()
self.validate_production_order()
self.validate_project()
self.validate_activity()
self.validate_manufacturing()
def on_submit(self):
@ -136,15 +135,7 @@ class TimeLog(Document):
if not self.project:
frappe.throw(_("Project is Mandatory."))
if self.time_log_for == "":
self.project = None
def validate_activity(self):
if self.time_log_for != 'Manufacturing':
if not self.activity_type:
frappe.throw(_("Activity is Mandatory."))
self.production_order = None
self.operation = None
self.quantity = None
self.project = None
def validate_manufacturing(self):
if self.time_log_for == 'Manufacturing':
@ -154,7 +145,10 @@ class TimeLog(Document):
frappe.throw(_("Operation is Mandatory"))
if not self.completed_qty:
self.completed_qty=0
self.activity_type = None
else:
self.production_order = None
self.operation = None
self.quantity = None
@frappe.whitelist()
def get_workstation(production_order, operation):

3
erpnext/setup/page/setup_wizard/install_fixtures.py
View File

@ -135,7 +135,8 @@ def install(country=None):
{'doctype': 'Activity Type', 'activity_type': _('Proposal Writing')},
{'doctype': 'Activity Type', 'activity_type': _('Execution')},
{'doctype': 'Activity Type', 'activity_type': _('Communication')},
{'doctype': 'Activity Type', 'activity_type': _('Manufacturing')},
# Industry Type
{'doctype': 'Industry Type', 'industry': _('Accounting')},
{'doctype': 'Industry Type', 'industry': _('Advertising')},