mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-25 06:02:09 +01:00
fix: enable fetch_timesheet_in_sales_invoice in test
(cherry picked from commit 5880f1d5c6)
# Conflicts:
# erpnext/projects/doctype/timesheet/test_timesheet.py
This commit is contained in:
@@ -53,6 +53,7 @@ class TestTimesheet(unittest.TestCase):
|
|||||||
self.assertEqual(item.qty, 2.00)
|
self.assertEqual(item.qty, 2.00)
|
||||||
self.assertEqual(item.rate, 50.00)
|
self.assertEqual(item.rate, 50.00)
|
||||||
|
|
||||||
|
@IntegrationTestCase.change_settings("Projects Settings", {"fetch_timesheet_in_sales_invoice": 1})
|
||||||
def test_timesheet_billing_based_on_project(self):
|
def test_timesheet_billing_based_on_project(self):
|
||||||
emp = make_employee("test_employee_6@salary.com")
|
emp = make_employee("test_employee_6@salary.com")
|
||||||
project = frappe.get_value("Project", {"project_name": "_Test Project"})
|
project = frappe.get_value("Project", {"project_name": "_Test Project"})
|
||||||
@@ -62,6 +63,10 @@ class TestTimesheet(unittest.TestCase):
|
|||||||
)
|
)
|
||||||
sales_invoice = create_sales_invoice(do_not_save=True)
|
sales_invoice = create_sales_invoice(do_not_save=True)
|
||||||
sales_invoice.project = project
|
sales_invoice.project = project
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
sales_invoice.add_timesheet_data()
|
||||||
|
>>>>>>> 5880f1d5c6 (fix: enable fetch_timesheet_in_sales_invoice in test)
|
||||||
sales_invoice.submit()
|
sales_invoice.submit()
|
||||||
|
|
||||||
ts = frappe.get_doc("Timesheet", timesheet.name)
|
ts = frappe.get_doc("Timesheet", timesheet.name)
|
||||||
|
|||||||
Reference in New Issue
Block a user