[Minor] Demo fixes (#7499)
diff --git a/erpnext/demo/setup/setup_data.py b/erpnext/demo/setup/setup_data.py
index 21ac648..0c6a9b8 100644
--- a/erpnext/demo/setup/setup_data.py
+++ b/erpnext/demo/setup/setup_data.py
@@ -163,11 +163,10 @@
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 aa69342..f690878 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/production_order.py
@@ -304,9 +304,9 @@
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,