nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 02:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2017-02-22 15:31:31 +05:30
parent 79dd816359 10ec553859
commit 5079c9ef47
18 changed files with 141 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/projects/doctype/timesheet/test_timesheet.py
View File

@@ -7,7 +7,7 @@ import frappe
import unittest
import datetime
from frappe.utils.make_random import get_random
from frappe.utils import now_datetime, nowdate, add_days
from frappe.utils import now_datetime, nowdate, add_days, add_months
from erpnext.projects.doctype.timesheet.timesheet import OverlapError
from erpnext.projects.doctype.timesheet.timesheet import make_salary_slip, make_sales_invoice
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
@@ -88,7 +88,8 @@ def make_salary_structure(employee):
es = salary_structure.append('employees', {
"employee": employee,
"base": 1200
"base": 1200,
"from_date": add_months(nowdate(),-1)
})