Skip to content

Commit

Permalink
fix: changes as per review
Browse files Browse the repository at this point in the history
(cherry picked from commit 589b19c)

# Conflicts:
#	india_compliance/gst_india/doctype/e_invoice_log/e_invoice_log.json
  • Loading branch information
ljain112 authored and mergify[bot] committed Sep 20, 2024
1 parent 8ad9566 commit e92a697
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
{
"fieldname": "reference_doctype",
"fieldtype": "Link",
"in_list_view": 1,
"in_standard_filter": 1,
"label": "Reference Document Type",
"options": "DocType",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion india_compliance/patches.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
india_compliance.patches.v15.make_e_invoice_log_extensible
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -120,6 +121,7 @@ def migrate_e_invoice_fields():
user,
user,
doc.irn,
"Sales Invoice",
doc.name,
doc.irn_cancelled,
doc.ack_no,
Expand Down

0 comments on commit e92a697

Please sign in to comment.