From 61b3be3bc39c70ceaaf3cf5c3bab39b4627d6870 Mon Sep 17 00:00:00 2001
From: l0gesh29 <logeshperiyasamy24@gmail.com>
Date: Tue, 23 Dec 2025 20:10:38 +0530
Subject: [PATCH] feat: modify field properties

(cherry picked from commit 38a46424799bb4dc2481d8aa884c0e051874a93f)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#	erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
#	erpnext/projects/doctype/timesheet/timesheet.json
---
 .../doctype/sales_invoice/sales_invoice.json        | 10 ++++++----
 .../sales_invoice_timesheet.json                    | 12 ++++++++++--
 erpnext/projects/doctype/timesheet/timesheet.json   | 13 +++++++++++--
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 8cc9598d915..84770462434 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -776,8 +776,7 @@
   },
   {
    "collapsible": 1,
-   "collapsible_depends_on": "eval:doc.total_billing_amount > 0",
-   "depends_on": "eval:!doc.is_return",
+   "depends_on": "eval:doc.total_billing_amount > 0",
    "fieldname": "time_sheet_list",
    "fieldtype": "Section Break",
    "hide_border": 1,
@@ -791,7 +790,6 @@
    "hide_days": 1,
    "hide_seconds": 1,
    "label": "Time Sheets",
-   "no_copy": 1,
    "options": "Sales Invoice Timesheet",
    "print_hide": 1
   },
@@ -2111,7 +2109,7 @@
    "fieldtype": "Column Break"
   },
   {
-   "depends_on": "eval:(!doc.is_return && doc.total_billing_amount > 0)",
+   "depends_on": "eval:doc.total_billing_amount > 0",
    "fieldname": "section_break_104",
    "fieldtype": "Section Break"
   },
@@ -2199,7 +2197,11 @@
    "link_fieldname": "consolidated_invoice"
   }
  ],
+<<<<<<< HEAD
  "modified": "2025-09-09 14:48:59.472826",
+=======
+ "modified": "2025-12-23 20:09:14.424656",
+>>>>>>> 38a4642479 (feat: modify field properties)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice",
diff --git a/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json b/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
index 69b7c129f09..031f2026379 100644
--- a/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
+++ b/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
@@ -52,7 +52,6 @@
    "fieldtype": "Data",
    "hidden": 1,
    "label": "Timesheet Detail",
-   "no_copy": 1,
    "print_hide": 1,
    "read_only": 1
   },
@@ -117,14 +116,23 @@
  ],
  "istable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2021-10-02 03:48:44.979777",
+=======
+ "modified": "2025-12-23 13:54:17.677187",
+>>>>>>> 38a4642479 (feat: modify field properties)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice Timesheet",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
+<<<<<<< HEAD
  "sort_field": "modified",
+=======
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+>>>>>>> 38a4642479 (feat: modify field properties)
  "sort_order": "DESC",
  "track_changes": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/projects/doctype/timesheet/timesheet.json b/erpnext/projects/doctype/timesheet/timesheet.json
index ba6262dc3de..55c8e0714b8 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.json
+++ b/erpnext/projects/doctype/timesheet/timesheet.json
@@ -91,7 +91,7 @@
    "in_standard_filter": 1,
    "label": "Status",
    "no_copy": 1,
-   "options": "Draft\nSubmitted\nBilled\nPayslip\nCompleted\nCancelled",
+   "options": "Draft\nSubmitted\nPartially Billed\nBilled\nPayslip\nCompleted\nCancelled",
    "print_hide": 1,
    "read_only": 1
   },
@@ -310,7 +310,11 @@
  "idx": 1,
  "is_submittable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2023-04-20 15:59:11.107831",
+=======
+ "modified": "2025-12-19 13:48:23.453636",
+>>>>>>> 38a4642479 (feat: modify field properties)
  "modified_by": "Administrator",
  "module": "Projects",
  "name": "Timesheet",
@@ -386,8 +390,13 @@
    "write": 1
   }
  ],
+<<<<<<< HEAD
  "sort_field": "modified",
+=======
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+>>>>>>> 38a4642479 (feat: modify field properties)
  "sort_order": "ASC",
  "states": [],
  "title_field": "title"
-}
\ No newline at end of file
+}