Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Minor] Demo fixes (#7499)

Browse Source
This commit is contained in:
KanchanChauhan 2017-01-16 12:57:14 +05:30 committed by Rushabh Mehta
parent 4ad121e1a4
commit b89be1e193
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/demo/setup/setup_data.py
View File

@ -163,11 +163,10 @@ def setup_salary_structure(employees, salary_slip_based_on_timesheet=0):
ss.append('deductions', { ss.append('deductions', {
'salary_component': 'Income Tax', 'salary_component': 'Income Tax',
"abbr":'IT', "abbr":'IT',
'condition': 'base > 1000', 'condition': 'base > 10000',
'amount': random.random() * 1000, 'formula': 'base*.1',
"idx": 1 "idx": 1
}) })
ss.insert() ss.insert()
return ss return ss

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

@ -304,9 +304,9 @@ class ProductionOrder(Document):
def get_operations_data(self, data): def get_operations_data(self, data):
return { return {
'from_time': data.planned_start_time, 'from_time': get_datetime(data.planned_start_time),
'hours': data.time_in_mins / 60.0, 'hours': data.time_in_mins / 60.0,
'to_time': data.planned_end_time, 'to_time': get_datetime(data.planned_end_time),
'project': self.project, 'project': self.project,
'operation': data.operation, 'operation': data.operation,
'operation_id': data.name, 'operation_id': data.name,