nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 03:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3467 from anandpdoshi/anand-june-12

Browse Source 
Fixes
This commit is contained in:
Nabin Hait
2015-06-15 10:03:20 +05:30
parent 13bd538aca 63e4d31aa6
commit e3d13bee36
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,12 +217,14 @@ class ProductionOrder(Document):
for i, d in enumerate(self.operations): for i, d in enumerate(self.operations):
self.set_operation_start_end_time(i, d) self.set_operation_start_end_time(i, d)
if not d.workstation:
continue
time_log = make_time_log(self.name, d.operation, d.planned_start_time, d.planned_end_time, time_log = make_time_log(self.name, d.operation, d.planned_start_time, d.planned_end_time,
flt(self.qty) - flt(d.completed_qty), self.project_name, d.workstation, operation_id=d.name) flt(self.qty) - flt(d.completed_qty), self.project_name, d.workstation, operation_id=d.name)
if d.workstation: # validate operating hours if workstation [not mandatory] is specified
# validate operating hours if workstation [not mandatory] is specified self.check_operation_fits_in_working_hours(d)
self.check_operation_fits_in_working_hours(d)
original_start_time = time_log.from_time original_start_time = time_log.from_time
while True: while True:

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

@@ -128,7 +128,7 @@ class TimeLog(Document):
def update_production_order(self): def update_production_order(self):
"""Updates `start_date`, `end_date`, `status` for operation in Production Order.""" """Updates `start_date`, `end_date`, `status` for operation in Production Order."""
if self.production_order and self.for_manufacturing: if self.production_order and self.for_manufacturing:
if not self.operation_id: if not self.operation_id:
frappe.throw(_("Operation ID not set")) frappe.throw(_("Operation ID not set"))
@@ -208,22 +208,23 @@ class TimeLog(Document):
self.production_order = None self.production_order = None
self.operation = None self.operation = None
self.quantity = None self.quantity = None
def update_cost(self): def update_cost(self):
rate = get_activity_cost(self.employee, self.activity_type) rate = get_activity_cost(self.employee, self.activity_type)
if rate: if rate:
self.costing_rate = rate.get('costing_rate') self.costing_rate = rate.get('costing_rate')
self.billing_rate = rate.get('billing_rate') self.billing_rate = rate.get('billing_rate')
self.costing_amount = self.costing_rate * self.hours self.costing_amount = self.costing_rate * self.hours
if self.billable: if self.billable:
self.billing_amount = self.billing_rate * self.hours self.billing_amount = self.billing_rate * self.hours
else: else:
self.billing_amount = 0 self.billing_amount = 0
def validate_task(self): def validate_task(self):
if self.project and not self.task: # if a time log is being created against a project without production order
if (self.project and not self.production_order) and not self.task:
frappe.throw(_("Task is Mandatory if Time Log is against a project")) frappe.throw(_("Task is Mandatory if Time Log is against a project"))
def update_task(self): def update_task(self):
if self.task and frappe.db.exists("Task", self.task): if self.task and frappe.db.exists("Task", self.task):
task = frappe.get_doc("Task", self.task) task = frappe.get_doc("Task", self.task)
@@ -266,7 +267,7 @@ def get_events(start, end, filters=None):
d.title += " for Project: " + d.project d.title += " for Project: " + d.project
return data return data
@frappe.whitelist() @frappe.whitelist()
def get_activity_cost(employee=None, activity_type=None): def get_activity_cost(employee=None, activity_type=None):
rate = frappe.db.sql("""select costing_rate, billing_rate from `tabActivity Cost` where employee= %s rate = frappe.db.sql("""select costing_rate, billing_rate from `tabActivity Cost` where employee= %s