nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-15 18:01:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2016-12-06 16:16:58 +05:30
parent cc43c2f5aa 5c3564143b
commit 5c18bd9b61
23 changed files with 134 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/projects/doctype/timesheet/timesheet.py
View File

@@ -28,6 +28,7 @@ class Timesheet(Document):
self.update_cost()
self.calculate_total_amounts()
self.calculate_percentage_billed()
self.set_dates()
def set_employee_name(self):
if self.employee and not self.employee_name:
@@ -86,9 +87,6 @@ class Timesheet(Document):
self.start_date = getdate(start_date)
self.end_date = getdate(end_date)
def before_submit(self):
self.set_dates()
def before_cancel(self):
self.set_status()

6
erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.json
View File

@@ -5,12 +5,12 @@
"doctype": "Report",
"idx": 1,
"is_standard": "Yes",
"modified": "2014-06-03 07:18:17.229116",
"modified": "2016-12-01 09:18:17.229116",
"modified_by": "Administrator",
"module": "Projects",
"name": "Project wise Stock Tracking",
"owner": "Administrator",
"ref_doctype": "Project",
"report_name": "Project wise Stock Tracking ",
"report_type": "Report Builder"
}
"report_type": "Script Report"
}