Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg 2022-05-15 20:43:47 +05:30 committed by GitHub
parent 9b6197ec4a
commit f83e32ab64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/regional/report/gstr_1/gstr_1.py
View File

@ -435,13 +435,8 @@ class Gstr1Report(object):
alert=True, 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) # Build itemised tax for export invoices where tax table is blank (Export and SEZ Invoices)
for invoice, items in iteritems(self.invoice_items): for invoice, items in self.invoice_items.items():
>>>>>>> f2cbb70325 (fix: Multiple fixes in GSTR-1 report)
if ( if (
invoice not in self.items_based_on_tax_rate invoice not in self.items_based_on_tax_rate
and invoice not in unidentified_gst_accounts_invoice and invoice not in unidentified_gst_accounts_invoice