From e92a697dec05534acff1e89d953842cb1a2cdc71 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Thu, 19 Sep 2024 19:13:03 +0530 Subject: [PATCH] fix: changes as per review (cherry picked from commit 589b19cd1e6dde9ec6b67bdc160ddccb6920f9bd) # Conflicts: # india_compliance/gst_india/doctype/e_invoice_log/e_invoice_log.json --- .../gst_india/doctype/e_invoice_log/e_invoice_log.json | 5 +++++ india_compliance/patches.txt | 2 +- .../patches/post_install/update_e_invoice_fields_and_logs.py | 4 +++- .../patches/{v14 => v15}/make_e_invoice_log_extensible.py | 0 4 files changed, 9 insertions(+), 2 deletions(-) rename india_compliance/patches/{v14 => v15}/make_e_invoice_log_extensible.py (100%) diff --git a/india_compliance/gst_india/doctype/e_invoice_log/e_invoice_log.json b/india_compliance/gst_india/doctype/e_invoice_log/e_invoice_log.json index 554665656..57c675ec5 100644 --- a/india_compliance/gst_india/doctype/e_invoice_log/e_invoice_log.json +++ b/india_compliance/gst_india/doctype/e_invoice_log/e_invoice_log.json @@ -118,6 +118,7 @@ { "fieldname": "reference_doctype", "fieldtype": "Link", + "in_list_view": 1, "in_standard_filter": 1, "label": "Reference Document Type", "options": "DocType", @@ -139,11 +140,15 @@ "link_fieldname": "irn" } ], +<<<<<<< HEAD <<<<<<< HEAD "modified": "2023-07-27 15:04:26.931722", ======= "modified": "2024-09-17 15:15:35.720311", >>>>>>> 279d5966 (fix: make e-Invoice log extensible) +======= + "modified": "2024-09-19 18:59:01.195753", +>>>>>>> 589b19cd (fix: changes as per review) "modified_by": "Administrator", "module": "GST India", "name": "e-Invoice Log", diff --git a/india_compliance/patches.txt b/india_compliance/patches.txt index dcd349706..a53eb6a5c 100644 --- a/india_compliance/patches.txt +++ b/india_compliance/patches.txt @@ -63,4 +63,4 @@ execute:from india_compliance.gst_india.setup import set_default_print_settings; india_compliance.patches.v15.migrate_gstr1_log_to_returns_log india_compliance.patches.v15.update_action_for_gst_inward_supply india_compliance.patches.v15.set_default_for_new_gst_category_notification -india_compliance.patches.v14.make_e_invoice_log_extensible \ No newline at end of file +india_compliance.patches.v15.make_e_invoice_log_extensible \ No newline at end of file diff --git a/india_compliance/patches/post_install/update_e_invoice_fields_and_logs.py b/india_compliance/patches/post_install/update_e_invoice_fields_and_logs.py index f6f7e27e4..0905f0fb6 100644 --- a/india_compliance/patches/post_install/update_e_invoice_fields_and_logs.py +++ b/india_compliance/patches/post_install/update_e_invoice_fields_and_logs.py @@ -94,7 +94,8 @@ def migrate_e_invoice_fields(): "owner", "modified_by", "irn", - "sales_invoice", + "reference_doctype", + "reference_name", "is_cancelled", "acknowledgement_number", "acknowledged_on", @@ -120,6 +121,7 @@ def migrate_e_invoice_fields(): user, user, doc.irn, + "Sales Invoice", doc.name, doc.irn_cancelled, doc.ack_no, diff --git a/india_compliance/patches/v14/make_e_invoice_log_extensible.py b/india_compliance/patches/v15/make_e_invoice_log_extensible.py similarity index 100% rename from india_compliance/patches/v14/make_e_invoice_log_extensible.py rename to india_compliance/patches/v15/make_e_invoice_log_extensible.py