From f83e32ab64637f99a39864760904ec52c3c1a1e2 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Sun, 15 May 2022 20:43:47 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/regional/report/gstr_1/gstr_1.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/erpnext/regional/report/gstr_1/gstr_1.py b/erpnext/regional/report/gstr_1/gstr_1.py index becfd291a44..c6c1ff6b67b 100644 --- a/erpnext/regional/report/gstr_1/gstr_1.py +++ b/erpnext/regional/report/gstr_1/gstr_1.py @@ -435,13 +435,8 @@ class Gstr1Report(object): alert=True, ) -<<<<<<< HEAD - # Build itemised tax for export invoices where tax table is blank - for invoice, items in self.invoice_items.items(): -======= # Build itemised tax for export invoices where tax table is blank (Export and SEZ Invoices) - for invoice, items in iteritems(self.invoice_items): ->>>>>>> f2cbb70325 (fix: Multiple fixes in GSTR-1 report) + for invoice, items in self.invoice_items.items(): if ( invoice not in self.items_based_on_tax_rate and invoice not in unidentified_gst_accounts_invoice