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

fix: skip timesheet link on return time

Browse Source
This commit is contained in:
Nihantra Patel
2024-02-29 15:31:53 +05:30
parent ac2b53bf15
commit dd70fb5f7e
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -486,7 +486,7 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
currency() { currency() {
var me = this; var me = this;
super.currency(); super.currency();
if (this.frm.doc.timesheets) { if (!this.frm.doc.is_return && this.frm.doc.timesheets) {
this.frm.doc.timesheets.forEach((d) => { this.frm.doc.timesheets.forEach((d) => {
let row = frappe.get_doc(d.doctype, d.name) let row = frappe.get_doc(d.doctype, d.name)
set_timesheet_detail_rate(row.doctype, row.name, me.frm.doc.currency, row.timesheet_detail) set_timesheet_detail_rate(row.doctype, row.name, me.frm.doc.currency, row.timesheet_detail)

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

@@ -757,6 +757,8 @@ class SalesInvoice(SellingController):
def validate_time_sheets_are_submitted(self): def validate_time_sheets_are_submitted(self):
for data in self.timesheets: for data in self.timesheets:
if data.time_sheet: if data.time_sheet:
if self.is_return:
continue
status = frappe.db.get_value("Timesheet", data.time_sheet, "status") status = frappe.db.get_value("Timesheet", data.time_sheet, "status")
if status not in ["Submitted", "Payslip"]: if status not in ["Submitted", "Payslip"]:
frappe.throw(_("Timesheet {0} is already completed or cancelled").format(data.time_sheet)) frappe.throw(_("Timesheet {0} is already completed or cancelled").format(data.time_sheet))