From 74c21a0119ddbe4c0d32a5f78c6db478f4144b0e Mon Sep 17 00:00:00 2001
From: Smit Vora <smitvora203@gmail.com>
Date: Sat, 24 Aug 2024 10:40:19 +0530
Subject: [PATCH] fix: Remove unused "reason_for_issuing_document" field

(cherry picked from commit 09e96236d4465299f796bd479e9df1f0d6fdc8e2)

# Conflicts:
#	india_compliance/patches.txt
---
 .../gst_india/constants/custom_fields.py          | 15 ---------------
 .../overrides/test_advance_payment_entry.py       |  1 -
 .../gst_india/report/gstr_1/gstr_1.py             |  1 -
 india_compliance/patches.txt                      |  7 +++++++
 .../patches/post_install/remove_old_fields.py     |  1 +
 5 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/india_compliance/gst_india/constants/custom_fields.py b/india_compliance/gst_india/constants/custom_fields.py
index 31e897524d..0ca29afe45 100644
--- a/india_compliance/gst_india/constants/custom_fields.py
+++ b/india_compliance/gst_india/constants/custom_fields.py
@@ -543,21 +543,6 @@
             ),
             "translatable": 0,
         },
-        {
-            "fieldname": "reason_for_issuing_document",
-            "label": "Reason For Issuing Document",
-            "fieldtype": "Select",
-            "insert_after": "return_against",
-            "print_hide": 1,
-            "depends_on": "eval:doc.is_return == 1",
-            "length": 45,
-            "options": (
-                "\n01-Sales Return\n02-Post Sale Discount\n03-Deficiency in"
-                " services\n04-Correction in Invoice\n05-Change in POS\n06-Finalization"
-                " of Provisional assessment\n07-Others"
-            ),
-            "translatable": 0,
-        },
     ],
     (
         "Sales Taxes and Charges",
diff --git a/india_compliance/gst_india/overrides/test_advance_payment_entry.py b/india_compliance/gst_india/overrides/test_advance_payment_entry.py
index 96ff33c921..c9d6e73f54 100644
--- a/india_compliance/gst_india/overrides/test_advance_payment_entry.py
+++ b/india_compliance/gst_india/overrides/test_advance_payment_entry.py
@@ -79,7 +79,6 @@ def test_advance_payment_entry_with_returns(self):
             is_in_state=1,
             is_return=1,
             qty=-1,
-            reason_for_issuing_document="01-Sales Return",
             return_against=invoice_doc.name,
         )
 
diff --git a/india_compliance/gst_india/report/gstr_1/gstr_1.py b/india_compliance/gst_india/report/gstr_1/gstr_1.py
index 879025f9ea..9110b50bcc 100644
--- a/india_compliance/gst_india/report/gstr_1/gstr_1.py
+++ b/india_compliance/gst_india/report/gstr_1/gstr_1.py
@@ -78,7 +78,6 @@ def __init__(self, filters=None):
             port_code,
             shipping_bill_number,
             shipping_bill_date,
-            reason_for_issuing_document,
             company_gstin,
             (
                 CASE
diff --git a/india_compliance/patches.txt b/india_compliance/patches.txt
index 2063a052fe..f35bfc76b3 100644
--- a/india_compliance/patches.txt
+++ b/india_compliance/patches.txt
@@ -3,10 +3,17 @@ execute:import frappe; frappe.delete_doc_if_exists("DocType", "GSTIN")
 
 [post_model_sync]
 india_compliance.patches.v14.set_default_for_overridden_accounts_setting
+<<<<<<< HEAD
 execute:from india_compliance.gst_india.setup import create_custom_fields; create_custom_fields() #51
 execute:from india_compliance.gst_india.setup import create_property_setters; create_property_setters() #7
 execute:from india_compliance.income_tax_india.setup import create_custom_fields; create_custom_fields() #1
 india_compliance.patches.post_install.remove_old_fields #1
+=======
+execute:from india_compliance.gst_india.setup import create_custom_fields; create_custom_fields() #54
+execute:from india_compliance.gst_india.setup import create_property_setters; create_property_setters() #8
+execute:from india_compliance.income_tax_india.setup import create_custom_fields; create_custom_fields() #2
+india_compliance.patches.post_install.remove_old_fields #2
+>>>>>>> 09e96236 (fix: Remove unused "reason_for_issuing_document" field)
 india_compliance.patches.post_install.set_gst_tax_type
 india_compliance.patches.post_install.set_gst_tax_type_in_journal_entry
 india_compliance.patches.post_install.update_company_gstin
diff --git a/india_compliance/patches/post_install/remove_old_fields.py b/india_compliance/patches/post_install/remove_old_fields.py
index 1a4a007ac9..f92830d9a9 100644
--- a/india_compliance/patches/post_install/remove_old_fields.py
+++ b/india_compliance/patches/post_install/remove_old_fields.py
@@ -19,6 +19,7 @@ def execute():
     delete_old_fields("pan_details", "Company")
     delete_old_fields("export_type", ("Customer", "Supplier"))
     delete_old_fields("company_address", "Journal Entry")
+    delete_old_fields("reason_for_issuing_document", "Sales Invoice")
 
     # Field renamed post release
     delete_old_fields(