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

fix: add validation for return against

Browse Source 
(cherry picked from commit ff9b936634)
This commit is contained in:
l0gesh29
2026-01-09 19:08:23 +05:30
committed by Mergify
parent ce421bb1d4
commit 6dade11d8f
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -823,6 +823,7 @@ class SalesInvoice(SellingController):
self.is_return self.is_return
and self.return_against and self.return_against
and data.sales_invoice and data.sales_invoice
and data.sales_invoice == self.return_against
and not sales_invoice and not sales_invoice
and args.timesheet_detail == data.name and args.timesheet_detail == data.name
) )
@@ -865,12 +866,10 @@ class SalesInvoice(SellingController):
payment.account = get_bank_cash_account(payment.mode_of_payment, self.company).get("account") payment.account = get_bank_cash_account(payment.mode_of_payment, self.company).get("account")
def validate_time_sheets_are_submitted(self): def validate_time_sheets_are_submitted(self):
# Note: This validation is skipped for return invoices
# to allow returns to reference already-billed timesheet details
for data in self.timesheets: for data in self.timesheets:
if data.time_sheet: # Handle invoice duplication
status = frappe.db.get_value("Timesheet", data.time_sheet, "status")
if status not in ["Submitted", "Payslip", "Partially Billed"]:
frappe.throw(_("Timesheet {0} is already completed or cancelled").format(data.time_sheet))
if data.time_sheet and data.timesheet_detail: if data.time_sheet and data.timesheet_detail:
if sales_invoice := frappe.db.get_value( if sales_invoice := frappe.db.get_value(
"Timesheet Detail", data.timesheet_detail, "sales_invoice" "Timesheet Detail", data.timesheet_detail, "sales_invoice"
@@ -881,6 +880,11 @@ class SalesInvoice(SellingController):
) )
) )
if data.time_sheet:
status = frappe.db.get_value("Timesheet", data.time_sheet, "status")
if status not in ["Submitted", "Payslip", "Partially Billed"]:
frappe.throw(_("Timesheet {0} is already completed or cancelled").format(data.time_sheet))
def set_pos_fields(self, for_validate=False): def set_pos_fields(self, for_validate=False):
"""Set retail related fields from POS Profiles""" """Set retail related fields from POS Profiles"""
if cint(self.is_pos) != 1: if cint(self.is_pos) != 1: