Merge pull request #5775 from revant/patch-1
Issue #5774
diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py
index b96ea18..51c258b 100644
--- a/erpnext/config/hr.py
+++ b/erpnext/config/hr.py
@@ -206,7 +206,7 @@
{
"type": "report",
"is_query_report": True,
- "name": "Employee Holiday Attendance",
+ "name": "Employees working on a holiday",
"doctype": "Employee"
},
{
diff --git a/erpnext/demo/data/bom.json b/erpnext/demo/data/bom.json
index 1c3f7a9..3085435 100644
--- a/erpnext/demo/data/bom.json
+++ b/erpnext/demo/data/bom.json
@@ -100,7 +100,7 @@
]
},
{
- "item": "Wind Turbine",
+ "item": "Wind Turbine-S",
"with_operations": 1,
"operations": [
{
diff --git a/erpnext/demo/demo.py b/erpnext/demo/demo.py
index 6642e7b..4188432 100644
--- a/erpnext/demo/demo.py
+++ b/erpnext/demo/demo.py
@@ -4,7 +4,7 @@
import erpnext
import frappe.utils
from erpnext.demo.setup_data import setup_data
-from erpnext.demo.user import hr, sales, purchase, manufacturing, stock, accounts
+from erpnext.demo.user import hr, sales, purchase, manufacturing, stock, accounts, projects
"""
Make a demo
@@ -69,6 +69,9 @@
manufacturing.work()
stock.work()
accounts.work()
+ projects.run_projects(current_date)
+ # run_stock()
+ # run_accounts()
# run_projects()
# run_messages()
diff --git a/erpnext/demo/setup_data.py b/erpnext/demo/setup_data.py
index 6f1fb0a..5245063 100644
--- a/erpnext/demo/setup_data.py
+++ b/erpnext/demo/setup_data.py
@@ -3,7 +3,7 @@
import random, json
from erpnext.demo.domains import data
import frappe, erpnext
-import frappe.utils
+from frappe.utils import cint, flt
def setup_data():
domain = frappe.flags.domain
@@ -27,6 +27,7 @@
setup_user()
setup_employee()
setup_salary_structure()
+ setup_salary_structure_for_timesheet()
setup_user_roles()
frappe.db.commit()
frappe.clear_cache()
@@ -286,6 +287,14 @@
})
ss.insert()
+
+def setup_salary_structure_for_timesheet():
+ for e in frappe.get_all('Salary Structure', fields=['name'], filters={'is_active': 'Yes'}, limit=2):
+ ss_doc = frappe.get_doc("Salary Structure", e.name)
+ ss_doc.salary_slip_based_on_timesheet = 1
+ ss_doc.salary_component = 'Basic'
+ ss_doc.hour_rate = flt(random.random() * 10, 2)
+ ss_doc.save(ignore_permissions=True)
def setup_account():
frappe.flags.in_import = True
@@ -332,4 +341,9 @@
user = frappe.get_doc('User', 'LeonAbdulov@example.com')
user.add_roles('Accounts User', 'Accounts Manager', 'Sales User', 'Purchase User')
frappe.db.set_global('demo_accounts_user', user.name)
+
+ if not frappe.db.get_global('demo_projects_user'):
+ user = frappe.get_doc('User', 'panca@example.com')
+ user.add_roles('HR User', 'Projects User')
+ frappe.db.set_global('demo_projects_user', user.name)
diff --git a/erpnext/demo/user/hr.py b/erpnext/demo/user/hr.py
index 8196701..86fb526 100644
--- a/erpnext/demo/user/hr.py
+++ b/erpnext/demo/user/hr.py
@@ -1,10 +1,13 @@
from __future__ import unicode_literals
import frappe
+import random
from frappe.utils import random_string
+from erpnext.projects.doctype.timesheet.test_timesheet import make_timesheet
+from erpnext.projects.doctype.timesheet.timesheet import make_salary_slip, make_sales_invoice
+from frappe.utils.make_random import how_many, get_random
def work():
frappe.set_user(frappe.db.get_global('demo_hr_user'))
-
year, month = frappe.flags.current_date.strftime("%Y-%m").split("-")
# process payroll
@@ -24,3 +27,45 @@
journal_entry.posting_date = frappe.flags.current_date
journal_entry.insert()
journal_entry.submit()
+
+ if frappe.db.get_global('demo_hr_user'):
+ make_timesheet_records()
+
+def get_timesheet_based_salary_slip_employee():
+ return frappe.get_all('Salary Structure', fields = ["distinct employee as name"],
+ filters = {'salary_slip_based_on_timesheet': 1})
+
+def make_timesheet_records():
+ employees = get_timesheet_based_salary_slip_employee()
+ for employee in employees:
+ ts = make_timesheet(employee.name, simulate = True, billable = 1, activity_type=get_random("Activity Type"))
+
+ rand = random.random()
+ if rand >= 0.3:
+ make_salary_slip_for_timesheet(ts.name)
+
+ rand = random.random()
+ if rand >= 0.2:
+ make_sales_invoice_for_timesheet(ts.name)
+
+def make_salary_slip_for_timesheet(name):
+ salary_slip = make_salary_slip(name)
+ salary_slip.insert()
+ salary_slip.submit()
+
+def make_sales_invoice_for_timesheet(name):
+ sales_invoice = make_sales_invoice(name)
+ sales_invoice.customer = get_random("Customer")
+ sales_invoice.append('items', {
+ 'item_code': get_random_item(),
+ 'qty': 1,
+ 'rate': 1000
+ })
+ sales_invoice.set_missing_values()
+ sales_invoice.calculate_taxes_and_totals()
+ sales_invoice.insert()
+ sales_invoice.submit()
+
+def get_random_item():
+ return frappe.db.sql_list(""" select name from `tabItem` where
+ has_variants = 0 order by rand() limit 1""")[0]
diff --git a/erpnext/demo/user/manufacturing.py b/erpnext/demo/user/manufacturing.py
index c91570c..80d140a 100644
--- a/erpnext/demo/user/manufacturing.py
+++ b/erpnext/demo/user/manufacturing.py
@@ -6,6 +6,8 @@
import frappe, random, erpnext
from frappe.utils.make_random import how_many
from frappe.desk import query_report
+from erpnext.manufacturing.doctype.workstation.workstation import WorkstationHolidayError
+from erpnext.manufacturing.doctype.production_order.test_production_order import make_prod_order_test_record
def work():
frappe.set_user(frappe.db.get_global('demo_manufacturing_user'))
@@ -46,6 +48,13 @@
for pro in query_report.run("Production Orders in Progress")["result"][:how_many("Stock Entry for FG")]:
make_stock_entry_from_pro(pro[0], "Manufacture")
+ for bom in frappe.get_all('BOM', fields=['item'], filters = {'with_operations': 1}):
+ pro_order = make_prod_order_test_record(item=bom.item, qty=2,
+ source_warehouse="Stores - WPL", wip_warehouse = "Work in Progress - WPL",
+ fg_warehouse = "Stores - WPL", company = erpnext.get_default_company(),
+ stock_uom = frappe.db.get_value('Item', bom.item, 'stock_uom'),
+ planned_start_date = frappe.flags.current_date)
+
# submit time logs
for timesheet in frappe.get_all("Timesheet", ["name"], {"docstatus": 0,
"production_order": ("!=", ""), "to_time": ("<", frappe.flags.current_date)}):
@@ -55,6 +64,8 @@
frappe.db.commit()
except OverlapError:
pass
+ except WorkstationHolidayError:
+ pass
def make_stock_entry_from_pro(pro_id, purpose):
from erpnext.manufacturing.doctype.production_order.production_order import make_stock_entry
diff --git a/erpnext/demo/user/projects.py b/erpnext/demo/user/projects.py
new file mode 100644
index 0000000..12fad29
--- /dev/null
+++ b/erpnext/demo/user/projects.py
@@ -0,0 +1,95 @@
+# 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.utils.make_random import can_make
+from frappe.utils.make_random import how_many, get_random
+from erpnext.projects.doctype.timesheet.test_timesheet import make_timesheet
+
+def run_projects(current_date):
+ frappe.set_user(frappe.db.get_global('demo_projects_user'))
+ if frappe.db.get_global('demo_projects_user'):
+ make_project(current_date)
+ make_timesheet_for_projects(current_date)
+ close_tasks(current_date)
+
+def make_timesheet_for_projects(current_date ):
+ for data in frappe.get_all("Task", ["name", "project"], {"status": "Open", "exp_end_date": ("<", current_date)}):
+ employee = get_random("Employee")
+ if frappe.db.get_value('Salary Structure', {'employee': employee}, 'salary_slip_based_on_timesheet'):
+ make_timesheet(employee, simulate = True, billable = 1,
+ activity_type=get_random("Activity Type"), project=data.project, task =data.name)
+
+def close_tasks(current_date):
+ for task in frappe.get_all("Task", ["name"], {"status": "Open", "exp_end_date": ("<", current_date)}):
+ task = frappe.get_doc("Task", task.name)
+ task.status = "Closed"
+ task.save()
+
+def make_project(current_date):
+ if not frappe.db.exists('Project',
+ "New Product Development " + current_date.strftime("%Y-%m-%d")):
+ project = frappe.get_doc({
+ "doctype": "Project",
+ "project_name": "New Product Development " + current_date.strftime("%Y-%m-%d"),
+ })
+ project.set("tasks", [
+ {
+ "title": "Review Requirements",
+ "start_date": frappe.utils.add_days(current_date, 10),
+ "end_date": frappe.utils.add_days(current_date, 11)
+ },
+ {
+ "title": "Design Options",
+ "start_date": frappe.utils.add_days(current_date, 11),
+ "end_date": frappe.utils.add_days(current_date, 20)
+ },
+ {
+ "title": "Make Prototypes",
+ "start_date": frappe.utils.add_days(current_date, 20),
+ "end_date": frappe.utils.add_days(current_date, 30)
+ },
+ {
+ "title": "Customer Feedback on Prototypes",
+ "start_date": frappe.utils.add_days(current_date, 30),
+ "end_date": frappe.utils.add_days(current_date, 40)
+ },
+ {
+ "title": "Freeze Feature Set",
+ "start_date": frappe.utils.add_days(current_date, 40),
+ "end_date": frappe.utils.add_days(current_date, 45)
+ },
+ {
+ "title": "Testing",
+ "start_date": frappe.utils.add_days(current_date, 45),
+ "end_date": frappe.utils.add_days(current_date, 60)
+ },
+ {
+ "title": "Product Engineering",
+ "start_date": frappe.utils.add_days(current_date, 45),
+ "end_date": frappe.utils.add_days(current_date, 55)
+ },
+ {
+ "title": "Supplier Contracts",
+ "start_date": frappe.utils.add_days(current_date, 55),
+ "end_date": frappe.utils.add_days(current_date, 70)
+ },
+ {
+ "title": "Design and Build Fixtures",
+ "start_date": frappe.utils.add_days(current_date, 45),
+ "end_date": frappe.utils.add_days(current_date, 65)
+ },
+ {
+ "title": "Test Run",
+ "start_date": frappe.utils.add_days(current_date, 70),
+ "end_date": frappe.utils.add_days(current_date, 80)
+ },
+ {
+ "title": "Launch",
+ "start_date": frappe.utils.add_days(current_date, 80),
+ "end_date": frappe.utils.add_days(current_date, 90)
+ },
+ ])
+ project.insert()
diff --git a/erpnext/hr/report/employee_holiday_attendance/__init__.py b/erpnext/hr/report/employees_working_on_a_holiday/__init__.py
similarity index 100%
rename from erpnext/hr/report/employee_holiday_attendance/__init__.py
rename to erpnext/hr/report/employees_working_on_a_holiday/__init__.py
diff --git a/erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.js b/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.js
similarity index 79%
rename from erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.js
rename to erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.js
index 1345433..97108e8 100644
--- a/erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.js
+++ b/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.js
@@ -1,7 +1,7 @@
-// Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.query_reports["Employee Holiday Attendance"] = {
+frappe.query_reports["Employees working on a holiday"] = {
"filters": [
{
"fieldname":"from_date",
diff --git a/erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.json b/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.json
similarity index 61%
rename from erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.json
rename to erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.json
index f538d30..a379fd2 100644
--- a/erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.json
+++ b/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.json
@@ -1,18 +1,18 @@
{
"add_total_row": 0,
"apply_user_permissions": 1,
- "creation": "2016-01-27 11:12:14.972452",
+ "creation": "2016-07-14 12:03:56.967739",
"disabled": 0,
"docstatus": 0,
"doctype": "Report",
"idx": 0,
"is_standard": "Yes",
- "modified": "2016-01-27 11:12:14.972452",
+ "modified": "2016-07-14 12:03:56.967739",
"modified_by": "Administrator",
"module": "HR",
- "name": "Employee Holiday Attendance",
+ "name": "Employees working on a holiday",
"owner": "Administrator",
"ref_doctype": "Attendance",
- "report_name": "Employee Holiday Attendance",
+ "report_name": "Employees working on a holiday",
"report_type": "Script Report"
}
\ No newline at end of file
diff --git a/erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.py b/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.py
similarity index 100%
rename from erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.py
rename to erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.py
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.py b/erpnext/manufacturing/doctype/production_order/production_order.py
index b949dfc..cd24f9b 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/production_order.py
@@ -7,6 +7,7 @@
import json
from frappe.utils import flt, get_datetime, getdate, date_diff, cint, nowdate
from frappe import _
+from frappe.utils import time_diff_in_seconds
from frappe.model.document import Document
from frappe.model.mapper import get_mapped_doc
from erpnext.manufacturing.doctype.bom.bom import validate_bom_no
@@ -262,12 +263,14 @@
original_start_time = d.planned_start_time
# validate operating hours if workstation [not mandatory] is specified
- self.check_operation_fits_in_working_hours(d)
try:
timesheet.validate_time_logs()
except OverlapError:
if frappe.message_log: frappe.message_log.pop()
- timesheet.move_to_next_non_overlapping_slot(d.idx)
+ timesheet.schedule_for_production_order(d.idx)
+ except WorkstationHolidayError:
+ if frappe.message_log: frappe.message_log.pop()
+ timesheet.schedule_for_production_order(d.idx)
from_time, to_time = self.get_start_end_time(timesheet, d.name)
@@ -294,7 +297,7 @@
def get_operations_data(self, data):
return {
'from_time': data.planned_start_time,
- 'hours': data.time_in_mins / 60,
+ 'hours': data.time_in_mins / 60.0,
'to_time': data.planned_end_time,
'project': self.project,
'operation': data.operation,
diff --git a/erpnext/manufacturing/doctype/production_order/test_production_order.py b/erpnext/manufacturing/doctype/production_order/test_production_order.py
index 9013c15..d29544b 100644
--- a/erpnext/manufacturing/doctype/production_order/test_production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/test_production_order.py
@@ -220,7 +220,8 @@
pro_order.wip_warehouse = args.wip_warehouse or "_Test Warehouse - _TC"
pro_order.fg_warehouse = args.fg_warehouse or "_Test Warehouse 1 - _TC"
pro_order.company = args.company or "_Test Company"
- pro_order.stock_uom = "_Test UOM"
+ pro_order.stock_uom = args.stock_uom or "_Test UOM"
+ pro_order.set_production_order_operations()
if args.source_warehouse:
pro_order.source_warehouse = args.source_warehouse
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index a7155f2..d7b50b8 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -295,3 +295,5 @@
execute:frappe.delete_doc_if_exists("Report", "Customers Not Buying Since Long Time")
erpnext.patches.v7_0.make_is_group_fieldtype_as_check
execute:frappe.reload_doc('projects', 'doctype', 'timesheet', force=True)
+execute:frappe.delete_doc_if_exists("Report", "Employee Holiday Attendance")
+
diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py
index 686f7c2..6881e0b 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -6,9 +6,12 @@
import frappe
from frappe import _
+from datetime import timedelta
from frappe.utils import flt, time_diff_in_hours, get_datetime, getdate, cint, get_datetime_str
from frappe.model.document import Document
from frappe.model.mapper import get_mapped_doc
+from erpnext.manufacturing.doctype.workstation.workstation import (check_if_within_operating_hours,
+ WorkstationHolidayError)
from erpnext.manufacturing.doctype.manufacturing_settings.manufacturing_settings import get_mins_between_operations
class OverlapError(frappe.ValidationError): pass
@@ -136,8 +139,8 @@
def validate_time_logs(self):
for data in self.get('time_logs'):
- self.validate_overlap(data)
self.check_workstation_timings(data)
+ self.validate_overlap(data)
def validate_overlap(self, data):
if self.production_order:
@@ -179,29 +182,45 @@
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.time_logs:
- for data in self.time_logs:
- if data.idx == index:
- overlapping = self.get_overlap_for("workstation", data, data.workstation)
- 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 schedule_for_production_order(self, index):
+ for data in self.time_logs:
+ if data.idx == index:
+ self.move_to_next_day(data) #check for workstation holiday
+ self.move_to_next_non_overlapping_slot(data) #check for overlap
+ break
+
+ def move_to_next_non_overlapping_slot(self, data):
+ overlapping = self.get_overlap_for("workstation", data, data.workstation)
+ 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 = self.get_to_time(data)
+ self.check_workstation_working_day(data)
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 `tabTimesheet Detail` where workstation = %(workstation)s""",
{'workstation': workstation}, as_dict=True)[0]
+ def move_to_next_day(self, data):
+ """Move start and end time one day forward"""
+ self.check_workstation_working_day(data)
+
+ def check_workstation_working_day(self, data):
+ while True:
+ try:
+ self.check_workstation_timings(data)
+ break
+ except WorkstationHolidayError:
+ if frappe.message_log: frappe.message_log.pop()
+ data.from_time = get_datetime(data.from_time) + timedelta(hours=24)
+ data.to_time = self.get_to_time(data)
+
+ def get_to_time(self, data):
+ return get_datetime(data.from_time) + timedelta(hours=data.hours)
+
def update_cost(self):
for data in self.time_logs:
if data.activity_type and not data.billing_amount: