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

Merge pull request #5627 from rohitwaghchaure/fixes_timesheet_on_sales_invoice

Browse Source 
[Fixes] Time sheet dependency removed from sales invoice and patch fixes
This commit is contained in:
Rushabh Mehta 2016-07-04 10:57:44 +05:30 committed by GitHub
commit 3156d596d0
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@ -1068,9 +1068,9 @@
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 1,
"collapsible_depends_on": "", "collapsible_depends_on": "eval:doc.total_billing_amount > 0",
"depends_on": "eval:doc.total_billing_amount > 0", "depends_on": "",
"fieldname": "time_sheet_list", "fieldname": "time_sheet_list",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"hidden": 0, "hidden": 0,
@ -3676,7 +3676,7 @@
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2016-06-27 15:13:36.523798", "modified": "2016-07-02 20:10:14.146763",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",

2
erpnext/patches/v7_0/convert_timelog_to_timesheet.py
View File

@ -14,10 +14,12 @@ def execute():
def get_timesheet_data(data): def get_timesheet_data(data):
return { return {
'billable': data.billable,
'from_time': data.from_time, 'from_time': data.from_time,
'hours': data.hours, 'hours': data.hours,
'to_time': data.to_time, 'to_time': data.to_time,
'project': data.project, 'project': data.project,
'task': data.task,
'activity_type': data.activity_type, 'activity_type': data.activity_type,
'operation': data.operation, 'operation': data.operation,
'operation_id': data.operation_id, 'operation_id': data.operation_id,

2
erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py
View File

@ -21,10 +21,12 @@ def get_timesheet_data(data):
time_log = frappe.get_doc('Time Log', data.time_log) time_log = frappe.get_doc('Time Log', data.time_log)
return { return {
'billable': time_log.billable,
'from_time': time_log.from_time, 'from_time': time_log.from_time,
'hours': time_log.hours, 'hours': time_log.hours,
'to_time': time_log.to_time, 'to_time': time_log.to_time,
'project': time_log.project, 'project': time_log.project,
'task': time_log.task,
'activity_type': time_log.activity_type, 'activity_type': time_log.activity_type,
'operation': time_log.operation, 'operation': time_log.operation,
'operation_id': time_log.operation_id, 'operation_id': time_log.operation_id,