nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-18 20:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #46142 from frappe/mergify/bp/version-15-hotfix/pr-45908

Browse Source 
fix(projects settings): add checkbox to auto fetch timesheet in sales invoice (backport #45908)
This commit is contained in:
ruthra kumar
2025-02-26 06:23:58 +05:30
committed by GitHub
parent 0ae2d61974 feec16b682
commit 8bb085a055
5 changed files with 72 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -897,8 +897,12 @@ frappe.ui.form.on("Sales Invoice", {
project: function (frm) { project: function (frm) {
if (frm.doc.project) { if (frm.doc.project) {
frm.events.add_timesheet_data(frm, { frappe.db.get_value("Projects Settings", {}, "fetch_timesheet_in_sales_invoice", (r) => {
project: frm.doc.project, if (cint(r.fetch_timesheet_in_sales_invoice)) {
frm.events.add_timesheet_data(frm, {
project: frm.doc.project,
});
}
}); });
} }
}, },

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

@@ -1090,7 +1090,11 @@ 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 not self.timesheets and self.project: if (
not self.timesheets
and self.project
and frappe.db.get_single_value("Projects Settings", "fetch_timesheet_in_sales_invoice")
):
self.add_timesheet_data() self.add_timesheet_data()
else: else:
self.calculate_billing_amount_for_timesheet() self.calculate_billing_amount_for_timesheet()

234
erpnext/projects/doctype/projects_settings/projects_settings.json
View File

@@ -1,189 +1,69 @@
{ {
"allow_copy": 0, "actions": [],
"allow_guest_to_view": 0, "creation": "2018-02-21 16:42:13.882879",
"allow_import": 0, "doctype": "DocType",
"allow_rename": 0, "editable_grid": 1,
"beta": 0, "engine": "InnoDB",
"creation": "2018-02-21 16:42:13.882879", "field_order": [
"custom": 0, "timesheet_sb",
"docstatus": 0, "ignore_workstation_time_overlap",
"doctype": "DocType", "ignore_user_time_overlap",
"document_type": "", "ignore_employee_time_overlap",
"editable_grid": 1, "fetch_timesheet_in_sales_invoice"
"engine": "InnoDB", ],
"fields": [ "fields": [
{ {
"allow_bulk_edit": 0, "fieldname": "timesheet_sb",
"allow_on_submit": 0, "fieldtype": "Section Break",
"bold": 0, "label": "Timesheets"
"collapsible": 0, },
"columns": 0,
"fieldname": "timesheet_sb",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Timesheets",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{ {
"allow_bulk_edit": 0, "default": "0",
"allow_on_submit": 0, "fieldname": "ignore_workstation_time_overlap",
"bold": 0, "fieldtype": "Check",
"collapsible": 0, "label": "Ignore Workstation Time Overlap"
"columns": 0, },
"default": "0",
"fieldname": "ignore_workstation_time_overlap",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Ignore Workstation Time Overlap",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{ {
"allow_bulk_edit": 0, "default": "0",
"allow_on_submit": 0, "fieldname": "ignore_user_time_overlap",
"bold": 0, "fieldtype": "Check",
"collapsible": 0, "label": "Ignore User Time Overlap"
"columns": 0, },
"default": "0",
"fieldname": "ignore_user_time_overlap",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Ignore User Time Overlap",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{ {
"allow_bulk_edit": 0, "default": "0",
"allow_on_submit": 0, "fieldname": "ignore_employee_time_overlap",
"bold": 0, "fieldtype": "Check",
"collapsible": 0, "label": "Ignore Employee Time Overlap"
"columns": 0, },
"default": "0", {
"fieldname": "ignore_employee_time_overlap", "default": "0",
"fieldtype": "Check", "fieldname": "fetch_timesheet_in_sales_invoice",
"hidden": 0, "fieldtype": "Check",
"ignore_user_permissions": 0, "label": "Fetch Timesheet in Sales Invoice"
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Ignore Employee Time Overlap",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
} }
], ],
"has_web_view": 0, "issingle": 1,
"hide_heading": 0, "links": [],
"hide_toolbar": 0, "modified": "2025-02-25 22:48:03.164862",
"idx": 0, "modified_by": "Administrator",
"image_view": 0, "module": "Projects",
"in_create": 0, "name": "Projects Settings",
"is_submittable": 0, "owner": "Administrator",
"issingle": 1,
"istable": 0,
"max_attachments": 0,
"modified": "2018-02-21 16:42:42.357209",
"modified_by": "Administrator",
"module": "Projects",
"name": "Projects Settings",
"name_case": "",
"owner": "Administrator",
"permissions": [ "permissions": [
{ {
"amend": 0, "create": 1,
"apply_user_permissions": 0, "delete": 1,
"cancel": 0, "email": 1,
"create": 1, "print": 1,
"delete": 1, "read": 1,
"email": 1, "role": "System Manager",
"export": 0, "share": 1,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 0,
"role": "System Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1 "write": 1
} }
], ],
"quick_entry": 1, "quick_entry": 1,
"read_only": 0, "sort_field": "modified",
"read_only_onload": 0, "sort_order": "DESC",
"show_name_in_global_search": 0, "states": [],
"sort_field": "modified", "track_changes": 1
"sort_order": "DESC",
"track_changes": 1,
"track_seen": 0
} }

1
erpnext/projects/doctype/projects_settings/projects_settings.py
View File

@@ -14,6 +14,7 @@ class ProjectsSettings(Document):
if TYPE_CHECKING: if TYPE_CHECKING:
from frappe.types import DF from frappe.types import DF
fetch_timesheet_in_sales_invoice: DF.Check
ignore_employee_time_overlap: DF.Check ignore_employee_time_overlap: DF.Check
ignore_user_time_overlap: DF.Check ignore_user_time_overlap: DF.Check
ignore_workstation_time_overlap: DF.Check ignore_workstation_time_overlap: DF.Check

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

@@ -5,6 +5,7 @@ import datetime
import unittest import unittest
import frappe import frappe
from frappe.tests.utils import change_settings
from frappe.utils import add_to_date, now_datetime, nowdate from frappe.utils import add_to_date, now_datetime, nowdate
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
@@ -53,6 +54,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)
@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 +64,7 @@ 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)