From b89be1e1933189570f5451de4bf01a8f8cb82246 Mon Sep 17 00:00:00 2001 From: KanchanChauhan Date: Mon, 16 Jan 2017 12:57:14 +0530 Subject: [PATCH] [Minor] Demo fixes (#7499) --- erpnext/demo/setup/setup_data.py | 5 ++--- .../doctype/production_order/production_order.py | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/erpnext/demo/setup/setup_data.py b/erpnext/demo/setup/setup_data.py index 21ac6484d9..0c6a9b855f 100644 --- a/erpnext/demo/setup/setup_data.py +++ b/erpnext/demo/setup/setup_data.py @@ -163,11 +163,10 @@ def setup_salary_structure(employees, salary_slip_based_on_timesheet=0): ss.append('deductions', { 'salary_component': 'Income Tax', "abbr":'IT', - 'condition': 'base > 1000', - 'amount': random.random() * 1000, + 'condition': 'base > 10000', + 'formula': 'base*.1', "idx": 1 }) - ss.insert() return ss diff --git a/erpnext/manufacturing/doctype/production_order/production_order.py b/erpnext/manufacturing/doctype/production_order/production_order.py index aa693423f3..f69087811b 100644 --- a/erpnext/manufacturing/doctype/production_order/production_order.py +++ b/erpnext/manufacturing/doctype/production_order/production_order.py @@ -304,9 +304,9 @@ class ProductionOrder(Document): def get_operations_data(self, data): return { - 'from_time': data.planned_start_time, + 'from_time': get_datetime(data.planned_start_time), 'hours': data.time_in_mins / 60.0, - 'to_time': data.planned_end_time, + 'to_time': get_datetime(data.planned_end_time), 'project': self.project, 'operation': data.operation, 'operation_id': data.name,