From a8fe0e89a8bff3317d679e85e10d1cf4e6602cbe Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Thu, 18 Jul 2024 15:31:01 +0530
Subject: [PATCH] chore: remove stale 'repost_required' flag from sales invoice

(cherry picked from commit 06c5334f2a6db3114b675dbf393abe94afe9bdb7)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
---
 .../doctype/sales_invoice/sales_invoice.json       | 14 ++++----------
 .../doctype/sales_invoice/sales_invoice.py         |  1 -
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 90b6e768092..ac2047a54fd 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -213,7 +213,6 @@
   "is_internal_customer",
   "is_discounted",
   "remarks",
-  "repost_required",
   "connections_tab"
  ],
  "fields": [
@@ -2125,15 +2124,6 @@
    "label": "Write Off",
    "width": "50%"
   },
-  {
-   "default": "0",
-   "fieldname": "repost_required",
-   "fieldtype": "Check",
-   "hidden": 1,
-   "label": "Repost Required",
-   "no_copy": 1,
-   "read_only": 1
-  },
   {
    "fieldname": "incoterm",
    "fieldtype": "Link",
@@ -2188,7 +2178,11 @@
    "link_fieldname": "consolidated_invoice"
   }
  ],
+<<<<<<< HEAD
  "modified": "2024-06-07 16:49:32.458402",
+=======
+ "modified": "2024-07-18 15:30:39.428519",
+>>>>>>> 06c5334f2a (chore: remove stale 'repost_required' flag from sales invoice)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice",
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 0d48cf229e5..7eb3cccbc72 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -161,7 +161,6 @@ class SalesInvoice(SellingController):
 		project: DF.Link | None
 		redeem_loyalty_points: DF.Check
 		remarks: DF.SmallText | None
-		repost_required: DF.Check
 		represents_company: DF.Link | None
 		return_against: DF.Link | None
 		rounded_total: DF.Currency