diff --git a/erpnext/projects/doctype/project/project_links.py b/erpnext/projects/doctype/project/project_links.py
index 6c163784d6..17f74923ae 100644
--- a/erpnext/projects/doctype/project/project_links.py
+++ b/erpnext/projects/doctype/project/project_links.py
@@ -5,7 +5,7 @@ links = {
'transactions': [
{
'label': _('Project'),
- 'items': ['Task', 'Time Log', 'Expense Claim', 'Issue']
+ 'items': ['Task', 'Time Sheet', 'Expense Claim', 'Issue']
},
{
'label': _('Material'),
diff --git a/erpnext/projects/doctype/task/task.js b/erpnext/projects/doctype/task/task.js
index 605ed8d860..1d708c4154 100644
--- a/erpnext/projects/doctype/task/task.js
+++ b/erpnext/projects/doctype/task/task.js
@@ -16,10 +16,10 @@ frappe.ui.form.on("Task", {
if(!doc.__islocal) {
- if(frappe.model.can_read("Time Log")) {
- frm.add_custom_button(__("Time Logs"), function() {
+ if(frappe.model.can_read("Time Sheet")) {
+ frm.add_custom_button(__("Time Sheet"), function() {
frappe.route_options = {"project": doc.project, "task": doc.name}
- frappe.set_route("List", "Time Log");
+ frappe.set_route("List", "Time Sheet");
}, __("View"), true);
}
if(frappe.model.can_read("Expense Claim")) {
diff --git a/erpnext/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json
index 31d6538208..94ec8a1315 100644
--- a/erpnext/projects/doctype/task/task.json
+++ b/erpnext/projects/doctype/task/task.json
@@ -3,6 +3,7 @@
"allow_import": 1,
"allow_rename": 0,
"autoname": "TASK.#####",
+ "beta": 0,
"creation": "2013-01-29 19:25:50",
"custom": 0,
"docstatus": 0,
@@ -413,7 +414,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "Actual Start Date (via Time Logs)",
+ "label": "Actual Start Date (via Time Sheet)",
"length": 0,
"no_copy": 0,
"oldfieldname": "act_start_date",
@@ -491,7 +492,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "Actual End Date (via Time Logs)",
+ "label": "Actual End Date (via Time Sheet)",
"length": 0,
"no_copy": 0,
"oldfieldname": "act_end_date",
@@ -541,7 +542,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "Total Costing Amount (via Time Logs)",
+ "label": "Total Costing Amount (via Time Sheet)",
"length": 0,
"no_copy": 0,
"oldfieldname": "actual_budget",
@@ -618,7 +619,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "Total Billing Amount (via Time Logs)",
+ "label": "Total Billing Amount (via Time Sheet)",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -763,6 +764,7 @@
"hide_toolbar": 0,
"icon": "icon-check",
"idx": 1,
+ "image_view": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
@@ -770,7 +772,7 @@
"istable": 0,
"max_attachments": 5,
"menu_index": 0,
- "modified": "2016-03-29 01:01:50.074252",
+ "modified": "2016-06-20 17:31:00.798534",
"modified_by": "Administrator",
"module": "Projects",
"name": "Task",
@@ -797,6 +799,7 @@
"write": 1
}
],
+ "quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
"search_fields": "subject",
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index 392f1406c4..cc45a42b20 100644
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -58,7 +58,7 @@ class Task(Document):
def update_time_and_costing(self):
tl = frappe.db.sql("""select min(from_time) as start_date, max(to_time) as end_date,
sum(billing_amount) as total_billing_amount, sum(costing_amount) as total_costing_amount,
- sum(hours) as time from `tabTime Log` where task = %s and docstatus=1"""
+ sum(hours) as time from `tabTime Sheet Detail` where task = %s and docstatus=1"""
,self.name, as_dict=1)[0]
if self.status == "Open":
self.status = "Working"
diff --git a/erpnext/projects/doctype/task/test_task.py b/erpnext/projects/doctype/task/test_task.py
index 7007269e4e..45bcd8214f 100644
--- a/erpnext/projects/doctype/task/test_task.py
+++ b/erpnext/projects/doctype/task/test_task.py
@@ -124,29 +124,6 @@ class TestTask(unittest.TestCase):
self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_start_date"), getdate('2015-1-26'))
self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_end_date"), getdate('2015-1-28'))
- time_log = frappe.new_doc('Time Log')
- time_log.update({
- "from_time": "2015-1-1",
- "to_time": "2015-1-20",
- "task": task1.name
- })
- time_log.submit()
-
- self.assertEqual(frappe.db.get_value("Task", task2.name, "exp_start_date"), getdate('2015-1-21'))
- self.assertEqual(frappe.db.get_value("Task", task2.name, "exp_end_date"), getdate('2015-1-25'))
-
- self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_start_date"), getdate('2015-1-26'))
- self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_end_date"), getdate('2015-1-28'))
-
- time_log.cancel()
-
- self.assertEqual(frappe.db.get_value("Task", task2.name, "exp_start_date"), getdate('2015-1-21'))
- self.assertEqual(frappe.db.get_value("Task", task2.name, "exp_end_date"), getdate('2015-1-25'))
-
- self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_start_date"), getdate('2015-1-26'))
- self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_end_date"), getdate('2015-1-28'))
-
-
def test_close_assignment(self):
task = frappe.new_doc("Task")
task.subject = "Test Close Assignment"
diff --git a/erpnext/projects/doctype/time_log/README.md b/erpnext/projects/doctype/time_log/README.md
deleted file mode 100644
index bab52e7e98..0000000000
--- a/erpnext/projects/doctype/time_log/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Log of activity done by a user in a particular period.
\ No newline at end of file
diff --git a/erpnext/projects/doctype/time_log/test_records.json b/erpnext/projects/doctype/time_log/test_records.json
deleted file mode 100644
index 0637a088a0..0000000000
--- a/erpnext/projects/doctype/time_log/test_records.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/erpnext/projects/doctype/time_log/test_time_log.py b/erpnext/projects/doctype/time_log/test_time_log.py
deleted file mode 100644
index 591316bfe7..0000000000
--- a/erpnext/projects/doctype/time_log/test_time_log.py
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-import unittest
-
-import datetime
-from frappe.utils import now_datetime, now
-from erpnext.projects.doctype.time_log.time_log import OverlapError, NotSubmittedError, NegativeHoursError
-from erpnext.manufacturing.doctype.workstation.workstation import WorkstationHolidayError, NotInWorkingHoursError
-from erpnext.manufacturing.doctype.production_order.test_production_order import make_prod_order_test_record
-
-
-class TestTimeLog(unittest.TestCase):
- def test_duplication(self):
- tl1 = make_time_log_test_record(user= "test@example.com", employee= "_T-Employee-0002", simulate= True)
-
- tl2 = make_time_log_test_record(user= "test@example.com", employee= "_T-Employee-0002",
- from_time= tl1.from_time, to_time= tl1.to_time, do_not_save= 1)
-
- self.assertRaises(OverlapError, tl2.insert)
-
- tl3 = make_time_log_test_record(user= "test@example.com", employee= "_T-Employee-0002",
- from_time= tl1.from_time - datetime.timedelta(hours=1),
- to_time= tl1.to_time + datetime.timedelta(hours=1), do_not_save= 1)
-
- self.assertRaises(OverlapError, tl3.insert)
-
- tl4 = make_time_log_test_record(user= "test@example.com", employee= "_T-Employee-0002",
- from_time= tl1.from_time + datetime.timedelta(minutes=20),
- to_time= tl1.to_time + datetime.timedelta(minutes=30), do_not_save= 1)
-
- self.assertRaises(OverlapError, tl4.insert)
-
- make_time_log_test_record(user= "test@example.com", employee= "_T-Employee-0002",
- from_time= tl1.to_time,
- to_time= tl1.to_time + datetime.timedelta(hours=1))
-
- def test_production_order_status(self):
- prod_order = make_prod_order_test_record(item= "_Test FG Item 2", qty= 1, do_not_submit= True)
- prod_order.set_production_order_operations()
- prod_order.save()
-
- time_log = make_time_log_test_record(for_manufacturing= 1, production_order= prod_order.name, qty= 1,
- employee= "_T-Employee-0003", do_not_save= True, simulate=1)
-
- self.assertRaises(NotSubmittedError, time_log.save)
-
- def test_time_log_on_holiday(self):
- prod_order = make_prod_order_test_record(item= "_Test FG Item 2", qty= 1,
- planned_start_date= now(), do_not_save= True)
- prod_order.set_production_order_operations()
- prod_order.save()
- prod_order.submit()
-
- time_log = make_time_log_test_record(from_time= "2013-02-01 10:00:00", to_time= "2013-02-01 20:00:00",
- for_manufacturing= 1, production_order= prod_order.name, qty= 1,
- operation= prod_order.operations[0].operation, operation_id= prod_order.operations[0].name,
- workstation= "_Test Workstation 1", do_not_save= True)
-
- self.assertRaises(WorkstationHolidayError , time_log.save)
-
- time_log.update({
- "from_time": "2013-02-02 09:00:00",
- "to_time": "2013-02-02 20:00:00"
- })
- self.assertRaises(NotInWorkingHoursError , time_log.save)
-
- time_log.from_time= "2013-02-02 10:30:00"
- time_log.save()
- time_log.submit()
- time_log.cancel()
-
- def test_negative_hours(self):
- time_log = make_time_log_test_record(to_time= now_datetime() + datetime.timedelta(minutes=-1),
- employee="_T-Employee-0006",do_not_save= True)
- self.assertRaises(NegativeHoursError, time_log.save)
-
- def test_default_activity_cost(self):
- activity_type = frappe.get_doc("Activity Type", "_Test Activity Type")
- activity_type.billing_rate = 20
- activity_type.costing_rate = 15
- activity_type.save()
-
- project = "_Test Project for Activity Type"
-
- frappe.db.sql("delete from `tabTime Log` where project=%s or employee='_T-Employee-0002'", project)
- frappe.delete_doc("Project", project)
- project = frappe.get_doc({"doctype": "Project", "project_name": project}).insert()
-
- make_time_log_test_record(employee="_T-Employee-0002", hours=2,
- activity_type = "_Test Activity Type", project = project.name)
-
- project = frappe.get_doc("Project", project.name)
- self.assertTrue(project.total_costing_amount, 30)
- self.assertTrue(project.total_billing_amount, 40)
-
- def test_total_activity_cost_for_project(self):
- frappe.db.sql("""delete from `tabTask` where project = "_Test Project 1" """)
- frappe.db.sql("""delete from `tabProject` where name = "_Test Project 1" """)
- frappe.db.sql("""delete from `tabTime Log` where name = "_Test Project 1" """)
-
- if not frappe.db.exists('Activity Cost', {"activity_type": "_Test Activity Type"}):
- activity_cost = frappe.get_doc({
- "doctype": "Activity Cost",
- "employee": "_T-Employee-0002",
- "activity_type": "_Test Activity Type",
- "billing_rate": 100,
- "costing_rate": 50
- })
- activity_cost.insert()
-
- frappe.get_doc({
- "project_name": "_Test Project 1",
- "doctype": "Project",
- "tasks" :
- [{ "title": "_Test Project Task 1", "status": "Open" }]
- }).save()
-
- task_name = frappe.db.get_value("Task",{"project": "_Test Project 1"})
-
- time_log = make_time_log_test_record(employee="_T-Employee-0002", hours=2,
- task=task_name, simulate=1)
- self.assertEqual(time_log.costing_rate, 50)
- self.assertEqual(time_log.costing_amount, 100)
- self.assertEqual(time_log.billing_rate, 100)
- self.assertEqual(time_log.billing_amount, 200)
-
- self.assertEqual(frappe.db.get_value("Task", task_name, "total_billing_amount"), 200)
- self.assertEqual(frappe.db.get_value("Project", "_Test Project 1", "total_billing_amount"), 200)
-
- time_log2 = make_time_log_test_record(employee="_T-Employee-0002",
- hours=2, task= task_name, from_time = now_datetime() + datetime.timedelta(hours= 3), simulate=1)
- self.assertEqual(frappe.db.get_value("Task", task_name, "total_billing_amount"), 400)
- self.assertEqual(frappe.db.get_value("Project", "_Test Project 1", "total_billing_amount"), 400)
-
- time_log2.cancel()
-
- self.assertEqual(frappe.db.get_value("Task", task_name, "total_billing_amount"), 200)
- self.assertEqual(frappe.db.get_value("Project", "_Test Project 1", "total_billing_amount"), 200)
- time_log.cancel()
-
-test_ignore = ["Time Log Batch", "Sales Invoice"]
-
-def make_time_log_test_record(**args):
- args = frappe._dict(args)
-
- time_log = frappe.new_doc("Time Log")
-
- time_log.from_time = args.from_time or now_datetime()
- time_log.hours = args.hours or 1
- time_log.to_time = args.to_time or time_log.from_time + datetime.timedelta(hours= time_log.hours)
-
- time_log.project = args.project
- time_log.task = args.task
- time_log.for_manufacturing = args.for_manufacturing
- time_log.production_order = args.production_order
- time_log.operation = args.operation
- time_log.operation_id = args.operation_id
- time_log.workstation = args.workstation
- time_log.completed_qty = args.completed_qty
- time_log.activity_type = args.activity_type or "_Test Activity Type"
- time_log.billable = args.billable or 1
- time_log.employee = args.employee
- time_log.user = args.user
-
- if not args.do_not_save:
- if args.simulate:
- while True:
- try:
- time_log.save()
- break
- except OverlapError:
- time_log.from_time = time_log.from_time + datetime.timedelta(minutes=10)
- time_log.to_time = time_log.from_time + datetime.timedelta(hours= time_log.hours)
- else:
- time_log.save()
- if not args.do_not_submit:
- time_log.submit()
-
- return time_log
diff --git a/erpnext/projects/doctype/time_log/time_log.js b/erpnext/projects/doctype/time_log/time_log.js
deleted file mode 100644
index 10e3bc7763..0000000000
--- a/erpnext/projects/doctype/time_log/time_log.js
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-frappe.ui.form.on("Time Log", {
- onload: function(frm) {
- if (frm.doc.__islocal) {
- if (frm.doc.for_manufacturing) {
- frappe.ui.form.trigger("Time Log", "production_order");
- }
- if (frm.doc.from_time && frm.doc.to_time) {
- frappe.ui.form.trigger("Time Log", "to_time");
- }
- }
- frm.set_query('task', function() {
- return {
- filters:{
- 'project': frm.doc.project
- }
- }
- });
- },
- refresh: function(frm) {
- // set default user if created
- if (frm.doc.__islocal && !frm.doc.user) {
- frm.set_value("user", user);
- }
- if (frm.doc.status==='In Progress' && !frm.is_new()) {
- frm.add_custom_button(__('Finish'), function() {
- frappe.prompt({
- fieldtype: 'Datetime',
- fieldname: 'to_time',
- label: __('End Time'),
- 'default': dateutil.now_datetime()
- }, function(value) {
- frm.set_value('to_time', value.to_time);
- frm.save();
- });
- }).addClass('btn-primary');
- }
-
-
- frm.toggle_reqd("activity_type", !frm.doc.for_manufacturing);
- },
- hours: function(frm) {
- if(!frm.doc.from_time) {
- frm.set_value("from_time", frappe.datetime.now_datetime());
- }
- var d = moment(frm.doc.from_time);
- d.add(frm.doc.hours, "hours");
- frm._setting_hours = true;
- frm.set_value("to_time", d.format(moment.defaultDatetimeFormat));
- frm._setting_hours = false;
-
- frm.trigger('calculate_cost');
- },
- before_save: function(frm) {
- frm.doc.production_order && frappe.model.remove_from_locals("Production Order",
- frm.doc.production_order);
- },
- 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),
- "seconds") / 3600);
- },
- calculate_cost: function(frm) {
- frm.set_value("costing_amount", frm.doc.costing_rate * frm.doc.hours);
- if (frm.doc.billable==1){
- frm.set_value("billing_amount", (frm.doc.billing_rate * frm.doc.hours) + frm.doc.additional_cost);
- }
- },
- additional_cost: function(frm) {
- frm.trigger('calculate_cost');
- },
- activity_type: function(frm) {
- if (frm.doc.activity_type){
- return frappe.call({
- method: "erpnext.projects.doctype.time_log.time_log.get_activity_cost",
- args: {
- "employee": frm.doc.employee,
- "activity_type": frm.doc.activity_type
- },
- callback: function(r) {
- if(!r.exc && r.message) {
- frm.set_value("costing_rate", r.message.costing_rate);
- frm.set_value("billing_rate", r.message.billing_rate);
- frm.trigger('calculate_cost');
- }
- }
- });
- }
- },
- employee: function(frm) {
- frm.trigger('activity_type');
- },
- billable: function(frm) {
- if (frm.doc.billable==1) {
- frm.trigger('calculate_cost');
- }
- else {
- frm.set_value("billing_amount", 0);
- frm.set_value("additional_cost", 0);
- }
- }
-
-});
diff --git a/erpnext/projects/doctype/time_log/time_log.py b/erpnext/projects/doctype/time_log/time_log.py
deleted file mode 100644
index 9545bd7fab..0000000000
--- a/erpnext/projects/doctype/time_log/time_log.py
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-from frappe.utils import flt, get_datetime, get_time, getdate
-from dateutil.relativedelta import relativedelta
-from erpnext.manufacturing.doctype.manufacturing_settings.manufacturing_settings import get_mins_between_operations
-
-class OverlapError(frappe.ValidationError): pass
-class OverProductionLoggedError(frappe.ValidationError): pass
-class NotSubmittedError(frappe.ValidationError): pass
-class NegativeHoursError(frappe.ValidationError): pass
-
-from frappe.model.document import Document
-
-class TimeLog(Document):
- def validate(self):
- self.set_status()
- self.set_title()
- self.validate_overlap()
- self.validate_timings()
- self.calculate_total_hours()
- self.validate_time_log_for()
- self.check_workstation_timings()
- self.validate_production_order()
- self.validate_manufacturing()
- self.set_project_if_missing()
- self.update_cost()
-
- def on_submit(self):
- self.update_production_order()
- self.update_task_and_project()
-
- def on_cancel(self):
- self.update_production_order()
- self.update_task_and_project()
-
- def before_update_after_submit(self):
- self.set_status()
-
- def before_cancel(self):
- self.set_status()
-
- def set_status(self):
- self.status = {
- 0: "To Submit",
- 1: "Submitted",
- 2: "Cancelled"
- }[self.docstatus or 0]
-
- if not self.to_time:
- self.status = 'In Progress'
-
- if self.time_log_batch:
- self.status= "Batched for Billing"
-
- if self.sales_invoice:
- self.status= "Billed"
-
- def set_title(self):
- """Set default title for the Time Log"""
- if self.title:
- return
-
- from frappe.utils import get_fullname
- if self.production_order:
- self.title = _("{0} for {1}").format(self.operation, self.production_order)
- elif self.activity_type and (self.task or self.project):
- self.title = _("{0} for {1}").format(self.activity_type, self.task or self.project)
- else:
- self.title = self.task or self.project or get_fullname(frappe.session.user)
-
- def validate_overlap(self):
- """Checks if 'Time Log' entries overlap for a user, workstation. """
- self.validate_overlap_for("user")
- self.validate_overlap_for("employee")
- self.validate_overlap_for("workstation")
-
- def validate_overlap_for(self, fieldname):
- existing = self.get_overlap_for(fieldname)
- if existing:
- frappe.throw(_("This Time Log conflicts with {0} for {1} {2}").format(existing.name,
- self.meta.get_label(fieldname), self.get(fieldname)), OverlapError)
-
- def get_overlap_for(self, fieldname):
- if not self.get(fieldname):
- return
-
- existing = frappe.db.sql("""select name, from_time, to_time from `tabTime Log`
- where `{0}`=%(val)s and
- (
- (%(from_time)s > from_time and %(from_time)s < to_time) or
- (%(to_time)s > from_time and %(to_time)s < to_time) or
- (%(from_time)s <= from_time and %(to_time)s >= to_time))
- and name!=%(name)s
- and docstatus < 2""".format(fieldname),
- {
- "val": self.get(fieldname),
- "from_time": self.from_time,
- "to_time": self.to_time,
- "name": self.name or "No Name"
- }, as_dict=True)
-
- return existing[0] if existing else None
-
- def validate_timings(self):
- if self.to_time and self.from_time and get_datetime(self.to_time) <= get_datetime(self.from_time):
- frappe.throw(_("To Time must be greater than From Time"), NegativeHoursError)
-
- def calculate_total_hours(self):
- if self.to_time and self.from_time:
- from frappe.utils import time_diff_in_seconds
- self.hours = flt(time_diff_in_seconds(self.to_time, self.from_time)) / 3600
-
- def set_project_if_missing(self):
- """Set project if task is set"""
- if self.task and not self.project:
- self.project = frappe.db.get_value("Task", self.task, "project")
-
- def validate_time_log_for(self):
- if not self.for_manufacturing:
- for fld in ["production_order", "operation", "workstation", "completed_qty"]:
- self.set(fld, None)
- else:
- self.activity_type=None
-
- def check_workstation_timings(self):
- """Checks if **Time Log** is between operating hours of the **Workstation**."""
- if self.workstation and self.from_time and self.to_time:
- from erpnext.manufacturing.doctype.workstation.workstation import check_if_within_operating_hours
- check_if_within_operating_hours(self.workstation, self.operation, self.from_time, self.to_time)
-
- def validate_production_order(self):
- """Throws 'NotSubmittedError' if **production order** is not submitted. """
- if self.production_order:
- if frappe.db.get_value("Production Order", self.production_order, "docstatus") != 1 :
- frappe.throw(_("You can make a time log only against a submitted production order"), NotSubmittedError)
-
- def update_production_order(self):
- """Updates `start_date`, `end_date`, `status` for operation in Production Order."""
-
- if self.production_order and self.for_manufacturing:
- if not self.operation_id:
- frappe.throw(_("Operation ID not set"))
-
- dates = self.get_operation_start_end_time()
- summary = self.get_time_log_summary()
-
- pro = frappe.get_doc("Production Order", self.production_order)
- for o in pro.operations:
- if o.name == self.operation_id:
- o.actual_start_time = dates.start_date
- o.actual_end_time = dates.end_date
- o.completed_qty = summary.completed_qty
- o.actual_operation_time = summary.mins
- break
-
-
- pro.flags.ignore_validate_update_after_submit = True
- pro.update_operation_status()
- pro.calculate_operating_cost()
- pro.set_actual_dates()
- pro.save()
-
- def get_operation_start_end_time(self):
- """Returns Min From and Max To Dates of Time Logs against a specific Operation. """
- return frappe.db.sql("""select min(from_time) as start_date, max(to_time) as end_date from `tabTime Log`
- where production_order = %s and operation = %s and docstatus=1""",
- (self.production_order, self.operation), as_dict=1)[0]
-
- def move_to_next_day(self):
- """Move start and end time one day forward"""
- self.from_time = get_datetime(self.from_time) + relativedelta(day=1)
-
- def move_to_next_working_slot(self):
- """Move to next working slot from workstation"""
- workstation = frappe.get_doc("Workstation", self.workstation)
- slot_found = False
- for working_hour in workstation.working_hours:
- if get_datetime(self.from_time).time() < get_time(working_hour.start_time):
- self.from_time = getdate(self.from_time).strftime("%Y-%m-%d") + " " + working_hour.start_time
- slot_found = True
- break
-
- if not slot_found:
- # later than last time
- self.from_time = getdate(self.from_time).strftime("%Y-%m-%d") + " " + workstation.working_hours[0].start_time
- self.move_to_next_day()
-
- def move_to_next_non_overlapping_slot(self):
- """If in overlap, set start as the end point of the overlapping time log"""
- overlapping = self.get_overlap_for("workstation") \
- or self.get_overlap_for("employee") \
- or self.get_overlap_for("user")
-
- if not overlapping:
- frappe.throw(_("Logical error: Must find overlapping"))
-
- self.from_time = get_datetime(overlapping.to_time) + get_mins_between_operations()
-
- def get_time_log_summary(self):
- """Returns 'Actual Operating Time'. """
- return frappe.db.sql("""select
- sum(hours*60) as mins, sum(completed_qty) as completed_qty
- from `tabTime Log`
- where production_order = %s and operation_id = %s and docstatus=1""",
- (self.production_order, self.operation_id), as_dict=1)[0]
-
- def validate_manufacturing(self):
- if self.for_manufacturing:
- if not self.production_order:
- frappe.throw(_("Production Order is Mandatory"))
- if not self.completed_qty:
- self.completed_qty = 0
-
- production_order = frappe.get_doc("Production Order", self.production_order)
- pending_qty = flt(production_order.qty) - flt(production_order.produced_qty)
- if flt(self.completed_qty) > pending_qty:
- frappe.throw(_("Completed Qty cannot be more than {0} for operation {1}").format(pending_qty, self.operation),
- OverProductionLoggedError)
-
- else:
- self.production_order = None
- self.operation = None
- self.quantity = None
-
- def update_cost(self):
- rate = get_activity_cost(self.employee, self.activity_type)
- if rate:
- self.costing_rate = flt(rate.get('costing_rate'))
- self.billing_rate = flt(rate.get('billing_rate'))
- self.costing_amount = self.costing_rate * self.hours
- if self.billable:
- self.billing_amount = self.billing_rate * self.hours
- else:
- self.billing_amount = 0
-
- if self.additional_cost and self.billable:
- self.billing_amount += self.additional_cost
-
- def update_task_and_project(self):
- """Update costing rate in Task or Project if either is set"""
-
- if self.task:
- task = frappe.get_doc("Task", self.task)
- task.update_time_and_costing()
- task.save()
-
- elif self.project:
- frappe.get_doc("Project", self.project).update_project()
-
- def has_webform_permission(doc):
- project_user = frappe.db.get_value("Project User", {"parent": doc.project, "user":frappe.session.user} , "user")
- if project_user:
- return True
-
-
-@frappe.whitelist()
-def get_events(start, end, filters=None):
- """Returns events for Gantt / Calendar view rendering.
-
- :param start: Start date-time.
- :param end: End date-time.
- :param filters: Filters like workstation, project etc.
- """
- from frappe.desk.calendar import get_event_conditions
- conditions = get_event_conditions("Time Log", filters)
-
- data = frappe.db.sql("""select name, from_time, to_time,
- activity_type, task, project, production_order, workstation from `tabTime Log`
- where docstatus < 2 and ( from_time between %(start)s and %(end)s or to_time between %(start)s and %(end)s )
- {conditions}""".format(conditions=conditions), {
- "start": start,
- "end": end
- }, as_dict=True, update={"allDay": 0})
-
- for d in data:
- d.title = d.name + ": " + (d.activity_type or d.production_order or "")
- if d.task:
- d.title += " for Task: " + d.task
- if d.project:
- d.title += " for Project: " + d.project
-
- return data
-
-@frappe.whitelist()
-def get_activity_cost(employee=None, activity_type=None):
- rate = frappe.db.get_values("Activity Cost", {"employee": employee,
- "activity_type": activity_type}, ["costing_rate", "billing_rate"], as_dict=True)
- if not rate:
- rate = frappe.db.get_values("Activity Type", {"activity_type": activity_type},
- ["costing_rate", "billing_rate"], as_dict=True)
-
- return rate[0] if rate else {}
diff --git a/erpnext/projects/doctype/time_log/time_log_calendar.js b/erpnext/projects/doctype/time_log/time_log_calendar.js
deleted file mode 100644
index 132355f38c..0000000000
--- a/erpnext/projects/doctype/time_log/time_log_calendar.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-frappe.views.calendar["Time Log"] = {
- field_map: {
- "start": "from_time",
- "end": "to_time",
- "id": "name",
- "title": "title",
- "allDay": "allDay"
- },
- gantt: true,
- gantt_scale: "hours",
- filters: [
- {
- "fieldtype": "Link",
- "fieldname": "workstation",
- "options": "Workstation",
- "label": __("Workstation")
- },
- {
- "fieldtype": "Link",
- "fieldname": "employee",
- "options": "Employee",
- "label": __("Employee")
- },
- ],
- get_events_method: "erpnext.projects.doctype.time_log.time_log.get_events"
-}
diff --git a/erpnext/projects/doctype/time_log/time_log_list.js b/erpnext/projects/doctype/time_log/time_log_list.js
deleted file mode 100644
index 4428bf6141..0000000000
--- a/erpnext/projects/doctype/time_log/time_log_list.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-// render
-frappe.listview_settings['Time Log'] = {
- add_fields: ["status", "billable", "activity_type", "task", "project", "hours", "for_manufacturing", "billing_amount"],
-
- has_indicator_for_draft: true,
-
- get_indicator: function(doc) {
- if (doc.status== "Draft") {
- return [__("Draft"), "red", "status,=,Draft"]
- } else if (doc.status== "In Progress") {
- return [__("In Progress"), "orange", "status,=,In Progress"]
- } else if (doc.status== "Batched for Billing") {
- return [__("Batched for Billing"), "darkgrey", "status,=,Batched for Billing"]
- } else if (doc.status== "Billed") {
- return [__("Billed"), "green", "status,=,Billed"]
- } else if (doc.status== "Submitted" && doc.billable) {
- return [__("Billable"), "orange", "billable,=,1"]
- }
- },
-
- selectable: true,
- onload: function(me) {
- me.page.add_menu_item(__("Make Time Log Batch"), function() {
- var selected = me.get_checked_items() || [];
-
- if(!selected.length) {
- msgprint(__("Please select Time Logs."));
- return;
- }
-
- // select only billable time logs
- for(var i in selected) {
- var d = selected[i];
- if(d.status=="Batched for Billing") {
- msgprint(__("Time Log has been Batched for Billing") + ": " + d.name + " - " + d.title);
- return;
- }
- if(d.status=="Billed") {
- msgprint(__("Time Log has been Billed") + ": " + d.name + " - " + d.title);
- return;
- }
- if(d.status!="Submitted") {
- msgprint(__("Time Log Status must be Submitted.") + ": " + d.name + " - " + d.title);
- return;
- }
- }
-
- // make batch
- frappe.model.with_doctype("Time Log Batch", function() {
- var tlb = frappe.model.get_new_doc("Time Log Batch");
- $.each(selected, function(i, d) {
- var detail = frappe.model.get_new_doc("Time Log Batch Detail", tlb,
- "time_logs");
-
- $.extend(detail, {
- "time_log": d.name,
- "activity_type": d.activity_type,
- "billing_amount": d.billing_amount,
- "hours": d.hours
- });
- })
- frappe.set_route("Form", "Time Log Batch", tlb.name);
- })
-
- }, "icon-file-alt");
- }
-};
diff --git a/erpnext/projects/doctype/time_log_batch/README.md b/erpnext/projects/doctype/time_log_batch/README.md
deleted file mode 100644
index c27521ad96..0000000000
--- a/erpnext/projects/doctype/time_log_batch/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Group of Time Logs that can be batched for billing.
\ No newline at end of file
diff --git a/erpnext/projects/doctype/time_log_batch/test_time_log_batch.py b/erpnext/projects/doctype/time_log_batch/test_time_log_batch.py
deleted file mode 100644
index 9f3591d761..0000000000
--- a/erpnext/projects/doctype/time_log_batch/test_time_log_batch.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-from __future__ import unicode_literals
-
-import frappe, unittest
-from erpnext.projects.doctype.time_log.test_time_log import make_time_log_test_record
-
-class TimeLogBatchTest(unittest.TestCase):
- def test_time_log_status(self):
- time_log = make_time_log_test_record(simulate=True)
-
- self.assertEquals(frappe.db.get_value("Time Log", time_log.name, "status"), "Submitted")
-
- tlb = create_time_log_batch(time_log.name)
-
- self.assertEquals(frappe.db.get_value("Time Log", time_log.name, "status"), "Batched for Billing")
- tlb.cancel()
- self.assertEquals(frappe.db.get_value("Time Log", time_log.name, "status"), "Submitted")
-
-def create_time_log_batch(time_log):
- tlb = frappe.get_doc({
- "doctype": "Time Log Batch",
- "time_logs": [
- {
- "doctype": "Time Log Batch Detail",
- "parentfield": "time_logs",
- "parenttype": "Time Log Batch",
- "time_log": time_log
- }
- ]
- })
-
- tlb.insert()
- tlb.submit()
- return tlb
-
-test_ignore = ["Sales Invoice"]
diff --git a/erpnext/projects/doctype/time_log_batch/time_log_batch.js b/erpnext/projects/doctype/time_log_batch/time_log_batch.js
deleted file mode 100644
index b1c431c1a5..0000000000
--- a/erpnext/projects/doctype/time_log_batch/time_log_batch.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-cur_frm.add_fetch("time_log", "activity_type", "activity_type");
-cur_frm.add_fetch("time_log", "billing_amount", "billing_amount");
-cur_frm.add_fetch("time_log", "hours", "hours");
-
-cur_frm.set_query("time_log", "time_logs", function(doc) {
- return {
- query: "erpnext.projects.utils.get_time_log_list",
- filters: {
- "billable": 1,
- "status": "Submitted"
- }
- }
-});
-
-$.extend(cur_frm.cscript, {
- refresh: function(doc) {
- cur_frm.set_intro({
- "Draft": __("Select Time Logs and Submit to create a new Sales Invoice."),
- "Submitted": __("Click on 'Make Sales Invoice' button to create a new Sales Invoice."),
- "Billed": __("This Time Log Batch has been billed."),
- "Cancelled": __("This Time Log Batch has been cancelled.")
- }[doc.status]);
-
- if(doc.status=="Submitted") {
- cur_frm.add_custom_button(__("Make Sales Invoice"), function() { cur_frm.cscript.make_invoice() },
- "icon-file-alt");
- }
- },
- make_invoice: function() {
- frappe.model.open_mapped_doc({
- method: "erpnext.projects.doctype.time_log_batch.time_log_batch.make_sales_invoice",
- frm: cur_frm
- });
- }
-});
-
-frappe.ui.form.on("Time Log Batch Detail", "time_log", function(frm) {
- calculate_time_and_amount(frm);
-});
-
-frappe.ui.form.on("Time Log Batch Detail", "time_logs_remove", function(frm) {
- calculate_time_and_amount(frm);
-});
-
-frappe.ui.form.on("Time Log Batch", "onload", function(frm) {
- if (frm.doc.__islocal && frm.doc.time_logs) {
- calculate_time_and_amount(frm);
- }
-});
-
-var calculate_time_and_amount = function(frm) {
- var tl = frm.doc.time_logs || [];
- total_hr = 0;
- total_amt = 0;
- for(var i=0; i 0
+ && frm.doc.employee){
+ frm.add_custom_button(__("Make Sales Invoice"), function() { frm.trigger("make_invoice") },
+ "icon-file-alt");
+ }
+
+ if(!frm.doc.salary_slip && frm.doc.employee){
+ frm.add_custom_button(__("Make Salary Slip"), function() { frm.trigger("make_salary_slip") },
+ "icon-file-alt");
+ }
+ }
+ },
+
+ make_invoice: function(frm) {
+ frappe.model.open_mapped_doc({
+ method: "erpnext.projects.doctype.time_sheet.time_sheet.make_sales_invoice",
+ frm: frm
+ });
+ },
+
+ make_salary_slip: function(frm) {
+ frappe.model.open_mapped_doc({
+ method: "erpnext.projects.doctype.time_sheet.time_sheet.make_salary_slip",
+ frm: frm
+ });
+ },
+})
+
+frappe.ui.form.on("Time Sheet Detail", {
+ timesheets_remove: function(frm) {
+ calculate_time_and_amount(frm);
+ },
+
+ from_time: function(frm, cdt, cdn) {
+ calculate_end_time(frm, cdt, cdn)
+ },
+
+ to_time: function(frm, cdt, cdn) {
+ var child = locals[cdt][cdn];
+
+ if(frm._setting_hours) return;
+
+ if(flt(child.hours) == 0.0){
+ frappe.model.set_value(cdt, cdn, "hours", moment(child.to_time).diff(moment(child.from_time),
+ "seconds") / 3600);
+ }else{
+ var d = moment(child.to_time);
+ d.add(child.hours, "hours");
+ frappe.model.set_value(cdt, cdn, "from_time", d.format(moment.defaultDatetimeFormat));
+ }
+ },
+
+ hours: function(frm, cdt, cdn) {
+ calculate_end_time(frm, cdt, cdn)
+ },
+
+ billing_rate: function(frm, cdt, cdn) {
+ var child = locals[cdt][cdn]
+ if(child.hours && child.billing_rate){
+ frappe.mode.set_value(cdt, cdn, 'total_billing_amount', flt(child.billing_rate * child.hours))
+ }
+ calculate_billing_amount(frm, cdt, cdn)
+ },
+
+ costing_rate: function(frm, cdt, cdn) {
+ var child = locals[cdt][cdn]
+ frappe.mode.set_value(cdt, cdn, 'total_costing_amount', flt(child.costing_rate * child.hours))
+ calculate_billing_amount(frm, cdt, cdn)
+ },
+
+ billable: function(frm, cdt, cdn) {
+ calculate_billing_amount(frm, cdt, cdn)
+ }
+});
+
+calculate_end_time = function(frm, cdt, cdn){
+ var child = locals[cdt][cdn];
+
+ if(!child.from_time) {
+ frappe.model.set_value(cdt, cdn, "from_time", frappe.datetime.now_datetime());
+ }
+
+ var d = moment(child.from_time);
+ d.add(child.hours, "hours");
+ frm._setting_hours = true;
+ frappe.model.set_value(cdt, cdn, "to_time", d.format(moment.defaultDatetimeFormat));
+ frm._setting_hours = false;
+
+ calculate_billing_amount(frm, cdt, cdn)
+}
+
+var calculate_billing_amount = function(frm, cdt, cdn){
+ child = locals[cdt][cdn]
+ billing_amount = 0.0
+
+ if(child.hours && child.billable){
+ billing_amount = (child.hours * child.billing_rate)
+ }
+
+ frappe.model.set_value(cdt, cdn, 'billing_amount', billing_amount)
+ calculate_time_and_amount(frm)
+}
+
+var calculate_time_and_amount = function(frm) {
+ var tl = frm.doc.timesheets || [];
+ total_hr = 0;
+ total_billing_amount = 0;
+ for(var i=0; i tsd.from_time and %(from_time)s < tsd.to_time) or
+ (%(to_time)s > tsd.from_time and %(to_time)s < tsd.to_time) or
+ (%(from_time)s <= tsd.from_time and %(to_time)s >= tsd.to_time))
+ and tsd.name!=%(name)s
+ and ts.docstatus < 2""".format(fieldname),
+ {
+ "val": args.get(fieldname),
+ "from_time": args.from_time,
+ "to_time": args.to_time,
+ "name": args.name or "No Name"
+ }, as_dict=True)
+
+ return existing[0] if existing else None
+
+ def check_workstation_timings(self, args):
+ """Checks if **Time Log** is between operating hours of the **Workstation**."""
+ if args.workstation and args.from_time and args.to_time:
+ from erpnext.manufacturing.doctype.workstation.workstation import check_if_within_operating_hours
+ check_if_within_operating_hours(args.workstation, args.operation, args.from_time, args.to_time)
+
+ def move_to_next_non_overlapping_slot(self, index):
+ from datetime import timedelta
+ if self.timesheets:
+ for data in self.timesheets:
+ if data.idx == index:
+ overlapping = self.get_overlap_for("workstation", data)
+ if not overlapping:
+ frappe.throw(_("Logical error: Must find overlapping"))
+
+ if overlapping:
+ time_sheet = self.get_last_working_slot(overlapping.name, data.workstation)
+ data.from_time = get_datetime(time_sheet.to_time) + get_mins_between_operations()
+ data.to_time = get_datetime(data.from_time) + timedelta(hours=data.hours)
+ break
+
+ def get_last_working_slot(self, time_sheet, workstation):
+ return frappe.db.sql(""" select max(from_time) as from_time, max(to_time) as to_time
+ from `tabTime Sheet Detail` where workstation = %(workstation)s""",
+ {'workstation': workstation}, as_dict=True)[0]
+
+ def update_cost(self):
+ for data in self.timesheets:
+ if data.activity_type and not data.billing_amount:
+ rate = get_activity_cost(self.employee, data.activity_type)
+ hours = data.hours or 0
+ if rate:
+ data.billing_rate = flt(rate.get('billing_rate'))
+ data.costing_rate = flt(rate.get('costing_rate'))
+ data.billing_amount = data.billing_rate * hours
+ data.costing_amount = data.costing_rate * hours
+
+@frappe.whitelist()
+def make_sales_invoice(source_name, target=None):
+ target = frappe.new_doc("Sales Invoice")
+
+ target.append("timesheets", get_mapped_doc("Time Sheet", source_name, {
+ "Time Sheet": {
+ "doctype": "Sales Invoice Timesheet",
+ "field_map": {
+ "total_billing_amount": "billing_amount",
+ "name": "time_sheet"
+ },
+ }
+ }))
+
+ target.run_method("calculate_billing_amount_from_timesheet")
+
+ return target
+
+@frappe.whitelist()
+def make_salary_slip(source_name, target_doc=None):
+ target = frappe.new_doc("Salary Slip")
+ set_missing_values(source_name, target)
+
+ target.append("timesheets", get_mapped_doc("Time Sheet", source_name, {
+ "Time Sheet": {
+ "doctype": "Salary Slip Timesheet",
+ "field_map": {
+ "total_hours": "working_hours",
+ "name": "time_sheet"
+ },
+ }
+ }))
+
+ target.run_method("get_emp_and_leave_details")
+
+ return target
+
+def set_missing_values(time_sheet, target):
+ doc = frappe.get_doc('Time Sheet', time_sheet)
+ target.employee = doc.employee
+ target.employee_name = doc.employee_name
+ target.salary_slip_based_on_timesheet = 1
+ target.start_date = doc.start_date
+ target.end_date = doc.end_date
+
+@frappe.whitelist()
+def get_activity_cost(employee=None, activity_type=None):
+ rate = frappe.db.get_values("Activity Cost", {"employee": employee,
+ "activity_type": activity_type}, ["costing_rate", "billing_rate"], as_dict=True)
+ if not rate:
+ rate = frappe.db.get_values("Activity Type", {"activity_type": activity_type},
+ ["costing_rate", "billing_rate"], as_dict=True)
+
+ return rate[0] if rate else {}
+
+@frappe.whitelist()
+def get_employee_list(doctype, txt, searchfield, start, page_len, filters):
+ return frappe.db.sql("""select distinct(employee) as employee
+ from `tabSalary Structure` where salary_slip_based_on_timesheet=1
+ and employee like %(txt)s limit %(start)s, %(page_len)s""",
+ {'txt': "%%%s%%"%(txt), 'start': start, 'page_len': page_len})
diff --git a/erpnext/projects/doctype/time_sheet/time_sheet_list.js b/erpnext/projects/doctype/time_sheet/time_sheet_list.js
new file mode 100644
index 0000000000..ad8b3b584f
--- /dev/null
+++ b/erpnext/projects/doctype/time_sheet/time_sheet_list.js
@@ -0,0 +1,16 @@
+frappe.listview_settings['Time Sheet'] = {
+ add_fields: ["status", "total_hours"],
+ get_indicator: function(doc) {
+ if (doc.status== "Billed") {
+ return [__("Billed"), "green", "status,=," + "Billed"]
+ }
+
+ if (doc.status== "Payslip") {
+ return [__("Payslip"), "green", "status,=," + "Payslip"]
+ }
+
+ if (doc.status== "Completed") {
+ return [__("Completed"), "green", "status,=," + "Completed"]
+ }
+ }
+};
\ No newline at end of file
diff --git a/erpnext/projects/report/daily_time_log_summary/__init__.py b/erpnext/projects/doctype/time_sheet_detail/__init__.py
similarity index 100%
rename from erpnext/projects/report/daily_time_log_summary/__init__.py
rename to erpnext/projects/doctype/time_sheet_detail/__init__.py
diff --git a/erpnext/projects/doctype/time_sheet_detail/time_sheet_detail.json b/erpnext/projects/doctype/time_sheet_detail/time_sheet_detail.json
new file mode 100644
index 0000000000..4a0787def2
--- /dev/null
+++ b/erpnext/projects/doctype/time_sheet_detail/time_sheet_detail.json
@@ -0,0 +1,493 @@
+{
+ "allow_copy": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2013-03-05 09:11:06",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Document",
+ "fields": [
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "depends_on": "",
+ "fieldname": "billable",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Billable",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "activity_type",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "label": "Activity Type",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Activity Type",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "from_time",
+ "fieldtype": "Datetime",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "label": "From Time",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "hours",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Hours",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "to_time",
+ "fieldtype": "Datetime",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "label": "To Time",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "section_break_3",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "project",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Project",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Project",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "depends_on": "project",
+ "fieldname": "task",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Task",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Task",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "depends_on": "eval:parent.production_order",
+ "fieldname": "workstation",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Workstation",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Workstation",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "depends_on": "eval:parent.production_order",
+ "fieldname": "operation",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Operation",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Operation",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "depends_on": "eval:parent.production_order",
+ "fieldname": "operation_id",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Operation Id",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "completed_qty",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Completed Qty",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "2",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "section_break_11",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "depends_on": "",
+ "fieldname": "billing_rate",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Billing Rate",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "2",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "costing_rate",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Costing Rate",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "column_break_14",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "default": "0",
+ "depends_on": "",
+ "fieldname": "billing_amount",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "label": "Billing Amount",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "2",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "default": "0",
+ "fieldname": "costing_amount",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Costing Amount",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 1,
+ "image_view": 0,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "max_attachments": 0,
+ "modified": "2016-06-24 15:55:30.746870",
+ "modified_by": "Administrator",
+ "module": "Projects",
+ "name": "Time Sheet Detail",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "sort_order": "ASC",
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/projects/doctype/time_sheet_detail/time_sheet_detail.py b/erpnext/projects/doctype/time_sheet_detail/time_sheet_detail.py
new file mode 100644
index 0000000000..bbb68e811b
--- /dev/null
+++ b/erpnext/projects/doctype/time_sheet_detail/time_sheet_detail.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class TimeSheetDetail(Document):
+ pass
diff --git a/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.json b/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.json
deleted file mode 100644
index 2cdaf6bf60..0000000000
--- a/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "apply_user_permissions": 1,
- "creation": "2013-04-03 11:27:52",
- "docstatus": 0,
- "doctype": "Report",
- "idx": 1,
- "is_standard": "Yes",
- "modified": "2014-06-03 07:18:17.019543",
- "modified_by": "Administrator",
- "module": "Projects",
- "name": "Daily Time Log Summary",
- "owner": "Administrator",
- "ref_doctype": "Time Log",
- "report_name": "Daily Time Log Summary",
- "report_type": "Script Report"
-}
\ No newline at end of file
diff --git a/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py b/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py
deleted file mode 100644
index 028fd7749e..0000000000
--- a/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-from frappe.utils import flt
-
-def execute(filters=None):
- if not filters:
- filters = {}
- elif filters.get("from_date") or filters.get("to_date"):
- filters["from_time"] = "00:00:00"
- filters["to_time"] = "24:00:00"
-
- columns = [_("Time Log") + ":Link/Time Log:120", _("Employee") + "::150", _("From Datetime") + "::140",
- _("To Datetime") + "::140", _("Hours") + "::70", _("Activity Type") + "::120", _("Task") + ":Link/Task:150",
- _("Task Subject") + "::180", _("Project") + ":Link/Project:120", _("Status") + "::70"]
-
- user_map = get_user_map()
- employee_map = get_employee_map()
- task_map = get_task_map()
-
- conditions = build_conditions(filters)
- time_logs = frappe.db.sql("""select * from `tabTime Log`
- where docstatus < 2 %s order by owner asc""" % (conditions, ), filters, as_dict=1)
-
- if time_logs:
- users = [time_logs[0].owner]
-
- data = []
- total_hours = total_employee_hours = count = 0
- for tl in time_logs:
- if tl.employee:
- employee=employee_map[tl.employee]
- else:
- employee=user_map[tl.owner]
- if tl.owner not in users:
- users.append(tl.owner)
- data.append(["", "", "", "Total", total_employee_hours, "", "", "", "", ""])
- total_employee_hours = 0
-
- data.append([tl.name, employee, tl.from_time, tl.to_time, tl.hours,
- tl.activity_type, tl.task, task_map.get(tl.task), tl.project, tl.status])
-
- count += 1
- total_hours += flt(tl.hours)
- total_employee_hours += flt(tl.hours)
-
- if count == len(time_logs):
- data.append(["", "", "", "Total Hours", total_employee_hours, "", "", "", "", ""])
-
- if total_hours:
- data.append(["", "", "", "Grand Total", total_hours, "", "", "", "", ""])
-
- return columns, data
-
-def get_user_map():
- users = frappe.db.sql("""select name,
- concat(first_name, if(last_name, (' ' + last_name), '')) as fullname
- from tabUser""", as_dict=1)
- user_map = {}
- for p in users:
- user_map.setdefault(p.name, []).append(p.fullname)
-
- return user_map
-
-def get_employee_map():
- employees = frappe.db.sql("""select name,
- employee_name as fullname
- from tabEmployee""", as_dict=1)
- employee_map = {}
- for p in employees:
- employee_map.setdefault(p.name, []).append(p.fullname)
-
- return employee_map
-
-def get_task_map():
- tasks = frappe.db.sql("""select name, subject from tabTask""", as_dict=1)
- task_map = {}
- for t in tasks:
- task_map.setdefault(t.name, []).append(t.subject)
-
- return task_map
-
-def build_conditions(filters):
- conditions = ""
- if filters.get("from_date"):
- conditions += " and from_time >= timestamp(%(from_date)s, %(from_time)s)"
- if filters.get("to_date"):
- conditions += " and to_time <= timestamp(%(to_date)s, %(to_time)s)"
-
- from frappe.desk.reportview import build_match_conditions
- match_conditions = build_match_conditions("Time Log")
- if match_conditions:
- conditions += " and %s" % match_conditions
-
- return conditions
diff --git a/erpnext/projects/report/daily_time_sheet_summary/__init__.py b/erpnext/projects/report/daily_time_sheet_summary/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.js b/erpnext/projects/report/daily_time_sheet_summary/daily_time_sheet_summary.js
similarity index 62%
rename from erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.js
rename to erpnext/projects/report/daily_time_sheet_summary/daily_time_sheet_summary.js
index a1baed7498..4798697666 100644
--- a/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.js
+++ b/erpnext/projects/report/daily_time_sheet_summary/daily_time_sheet_summary.js
@@ -1,7 +1,7 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
-frappe.query_reports["Daily Time Log Summary"] = {
+frappe.query_reports["Daily Time Sheet Summary"] = {
"filters": [
{
"fieldname":"from_date",
diff --git a/erpnext/projects/report/daily_time_sheet_summary/daily_time_sheet_summary.json b/erpnext/projects/report/daily_time_sheet_summary/daily_time_sheet_summary.json
new file mode 100644
index 0000000000..cf5a8cb5b2
--- /dev/null
+++ b/erpnext/projects/report/daily_time_sheet_summary/daily_time_sheet_summary.json
@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0,
+ "apply_user_permissions": 1,
+ "creation": "2016-06-25 01:52:25.911238",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 0,
+ "is_standard": "Yes",
+ "modified": "2016-06-25 01:52:31.214122",
+ "modified_by": "Administrator",
+ "module": "Projects",
+ "name": "Daily Time Sheet Summary",
+ "owner": "Administrator",
+ "ref_doctype": "Time Sheet",
+ "report_name": "Daily Time Sheet Summary",
+ "report_type": "Script Report"
+}
\ No newline at end of file
diff --git a/erpnext/projects/report/daily_time_sheet_summary/daily_time_sheet_summary.py b/erpnext/projects/report/daily_time_sheet_summary/daily_time_sheet_summary.py
new file mode 100644
index 0000000000..ed835aa52d
--- /dev/null
+++ b/erpnext/projects/report/daily_time_sheet_summary/daily_time_sheet_summary.py
@@ -0,0 +1,34 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+
+def execute(filters=None):
+ if not filters:
+ filters = {}
+ elif filters.get("from_date") or filters.get("to_date"):
+ filters["from_time"] = "00:00:00"
+ filters["to_time"] = "24:00:00"
+
+ columns = [_("Time Sheet") + ":Link/Time Sheet:120", _("Employee") + "::150", _("From Datetime") + "::140",
+ _("To Datetime") + "::140", _("Hours") + "::70", _("Activity Type") + "::120", _("Task") + ":Link/Task:150",
+ _("Project") + ":Link/Project:120", _("Status") + "::70"]
+
+ conditions = "ts.docstatus = 1"
+ if filters.get("from_date"):
+ conditions += " and tsd.from_time >= timestamp(%(from_date)s, %(from_time)s)"
+ if filters.get("to_date"):
+ conditions += " and tsd.to_time <= timestamp(%(to_date)s, %(to_time)s)"
+
+ data = get_data(conditions, filters)
+
+ return columns, data
+
+def get_data(conditions, filters):
+ time_sheet = frappe.db.sql(""" select ts.name, ts.employee, tsd.from_time, tsd.to_time, tsd.hours,
+ tsd.activity_type, tsd.task, tsd.project, ts.status from `tabTime Sheet Detail` tsd,
+ `tabTime Sheet` ts where ts.name = tsd.parent and %s order by ts.name"""%(conditions), filters, as_list=1)
+
+ return time_sheet
diff --git a/erpnext/projects/utils.py b/erpnext/projects/utils.py
index 1f6e2b3eaa..d663ad0aa7 100644
--- a/erpnext/projects/utils.py
+++ b/erpnext/projects/utils.py
@@ -6,10 +6,6 @@
from __future__ import unicode_literals
import frappe
-@frappe.whitelist()
-def get_time_log_list(doctype, txt, searchfield, start, page_len, filters):
- return frappe.db.get_values("Time Log", filters, ["name", "activity_type", "owner"])
-
@frappe.whitelist()
def query_task(doctype, txt, searchfield, start, page_len, filters):
from frappe.desk.reportview import build_match_conditions
diff --git a/erpnext/setup/doctype/company/delete_company_transactions.py b/erpnext/setup/doctype/company/delete_company_transactions.py
index a78898f29b..7b3326bdaa 100644
--- a/erpnext/setup/doctype/company/delete_company_transactions.py
+++ b/erpnext/setup/doctype/company/delete_company_transactions.py
@@ -18,7 +18,7 @@ def delete_company_transactions(company_name):
frappe.PermissionError)
delete_bins(company_name)
- delete_time_logs(company_name)
+ delete_time_sheets(company_name)
delete_lead_addresses(company_name)
for doctype in frappe.db.sql_list("""select parent from
@@ -70,21 +70,12 @@ def delete_bins(company_name):
frappe.db.sql("""delete from tabBin where warehouse in
(select name from tabWarehouse where company=%s)""", company_name)
-def delete_time_logs(company_name):
+def delete_time_sheets(company_name):
# Delete Time Logs as it is linked to Production Order / Project / Task, which are linked to company
frappe.db.sql("""
- delete from `tabTime Log`
+ delete from `tabTime Sheet`
where
- (ifnull(project, '') != ''
- and exists(select name from `tabProject` where name=`tabTime Log`.project and company=%(company)s))
- or (ifnull(task, '') != ''
- and exists(select name from `tabTask` where name=`tabTime Log`.task and company=%(company)s))
- or (ifnull(production_order, '') != ''
- and exists(select name from `tabProduction Order`
- where name=`tabTime Log`.production_order and company=%(company)s))
- or (ifnull(sales_invoice, '') != ''
- and exists(select name from `tabSales Invoice`
- where name=`tabTime Log`.sales_invoice and company=%(company)s))
+ company=%(company)s
""", {"company": company_name})
def delete_lead_addresses(company_name):
diff --git a/erpnext/setup/setup_wizard/domainify.py b/erpnext/setup/setup_wizard/domainify.py
index f77b05d034..f4cc35a68b 100644
--- a/erpnext/setup/setup_wizard/domainify.py
+++ b/erpnext/setup/setup_wizard/domainify.py
@@ -43,7 +43,7 @@ domains = {
},
'Services': {
- 'desktop_icons': ['Project', 'Time Log', 'Customer', 'Sales Order', 'Sales Invoice', 'Lead', 'Opportunity',
+ 'desktop_icons': ['Project', 'Time Sheet', 'Customer', 'Sales Order', 'Sales Invoice', 'Lead', 'Opportunity',
'Expense Claim', 'Employee', 'HR', 'ToDo'],
'remove_roles': ['Manufacturing User', 'Manufacturing Manager'],
'properties': [
diff --git a/erpnext/startup/notifications.py b/erpnext/startup/notifications.py
index 335efbb912..ac503c2201 100644
--- a/erpnext/startup/notifications.py
+++ b/erpnext/startup/notifications.py
@@ -43,8 +43,6 @@ def get_notification_config():
"Purchase Receipt": {"docstatus": 0},
"Production Order": { "status": ("in", ("Draft", "Not Started", "In Process")) },
"BOM": {"docstatus": 0},
- "Timesheet": {"docstatus": 0},
- "Time Log": {"status": "Draft"},
- "Time Log Batch": {"status": "Draft"}
+ "Time Sheet": {"status": "Draft"}
}
}
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 2fe3bb70e3..05435f4ae2 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -178,7 +178,7 @@ class StockEntry(StockController):
self.production_order = None
def check_if_operations_completed(self):
- """Check if Time Logs are completed against before manufacturing to capture operating costs."""
+ """Check if Time Sheets are completed against before manufacturing to capture operating costs."""
prod_order = frappe.get_doc("Production Order", self.production_order)
for d in prod_order.get("operations"):
diff --git a/erpnext/templates/pages/projects.py b/erpnext/templates/pages/projects.py
index 0f021a6d32..25b3a672ce 100644
--- a/erpnext/templates/pages/projects.py
+++ b/erpnext/templates/pages/projects.py
@@ -20,8 +20,9 @@ def get_context(context):
project.tasks = get_tasks(project.name, start=0, item_status='open',
search=frappe.form_dict.get("search"))
- project.timelogs = get_timelogs(project.name, start=0,
- search=frappe.form_dict.get("search"))
+ project.timelogs = []
+ # project.timelogs = get_timelogs(project.name, start=0,
+ # search=frappe.form_dict.get("search"))
context.doc = project
+
### Ausgangsrechnungen erstellen
* Sobald Sie einen Zeitprotokollstapel übertragen haben, sollte die Schaltfläche "Rechnung erstellen" erscheinen.
-
+
* Klicken Sie auf diese Schaltfläche und erstellen Sie eine Ausgangsrechnung zu einem Zeitprotokollstapel.
-
+
* Wenn Sie die Ausgangsrechnung "übertragen", wird die Nummer der Ausgangsrechnung in den Zeitprotokollen und im Zeitprotokollstapel aktualisiert und ihr Status wird auf "abgerechnet" geändert.
diff --git a/erpnext/docs/user/manual/en/projects/time-log-batch.md b/erpnext/docs/user/manual/en/projects/time-log-batch.md
index d48633ad07..f4f76dc16b 100644
--- a/erpnext/docs/user/manual/en/projects/time-log-batch.md
+++ b/erpnext/docs/user/manual/en/projects/time-log-batch.md
@@ -1,23 +1,23 @@
-You can bill Time Logs by batching them together. This gives you the flexiblity to manage your customer billing in the way you want. To create a new Time Log Batch, go to
+You can bill Time Logs by batching them together. This gives you the flexiblity to manage your customer billing in the way you want. To create a new Time Sheet, go to
-> Projects > Time Log Batch > New Time Log Batch
+> Projects > Time Sheet > New Time Sheet
OR
-Just open your Time Log list and check the Items to you want to add to the Time Log. Then click on "Make Time Log Batch" button and these Time Logs will be selected.
+Just open your Time Log list and check the Items to you want to add to the Time Log. Then click on "Make Time Sheet" button and these Time Logs will be selected.
-