CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-26 22:52:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "feat(Sales Invoice): allow linking to project without adding timesheets (backport #44295)" (#45531)

Browse Source 
Revert "feat(Sales Invoice): allow linking to project without adding timeshee…"

This reverts commit 2c2a25ab16.
This commit is contained in:
Nabin Hait
2025-01-27 14:31:44 +05:30
committed by GitHub
parent 2c2a25ab16
commit b004855e7c
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@@ -1083,16 +1083,13 @@ class SalesInvoice(SellingController):
timesheet.billing_amount = ts_doc.total_billable_amount timesheet.billing_amount = ts_doc.total_billable_amount
def update_timesheet_billing_for_project(self): def update_timesheet_billing_for_project(self):
if self.timesheets: if not self.timesheets and self.project:
self.add_timesheet_data()
else:
self.calculate_billing_amount_for_timesheet() self.calculate_billing_amount_for_timesheet()
@frappe.whitelist(methods=["PUT"]) @frappe.whitelist()
def add_timesheet_data(self): def add_timesheet_data(self):
if not self.timesheets and self.project:
self._add_timesheet_data()
self.save()
def _add_timesheet_data(self):
self.set("timesheets", []) self.set("timesheets", [])
if self.project: if self.project:
for data in get_projectwise_timesheet_data(self.project): for data in get_projectwise_timesheet_data(self.project):

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

@@ -62,7 +62,6 @@ 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
sales_invoice._add_timesheet_data()
sales_invoice.submit() sales_invoice.submit()
ts = frappe.get_doc("Timesheet", timesheet.name) ts = frappe.get_doc("Timesheet", timesheet.name)