nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-09 08:02:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
ravibharathi656
2026-02-04 13:08:29 +05:30
parent a6ef178761
commit 0ae0ebc378
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/regional/italy/utils.py
View File

@@ -141,17 +141,6 @@ def download_zip(files, output_filename):
def get_invoice_summary(items, taxes): def get_invoice_summary(items, taxes):
summary_data = frappe._dict() summary_data = frappe._dict()
<<<<<<< HEAD
=======
taxes_wise_tax_details = {}
for d in item_wise_tax_details:
if d.tax_row not in taxes_wise_tax_details:
taxes_wise_tax_details[d.tax_row] = []
taxes_wise_tax_details[d.tax_row].append(d)
>>>>>>> 57bd1facf5 (fix: group item wise tax details by tax row)
for tax in taxes: for tax in taxes:
# Include only VAT charges. # Include only VAT charges.
if tax.charge_type == "Actual": if tax.charge_type == "Actual":