chore: resolve conflicts

frappe · Feb 7, 2025 · 1ecbfe2 · 1ecbfe2
1 parent d84e559
commit 1ecbfe2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 15 deletions.
diff --git a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
@@ -311,16 +311,12 @@ def get_tax_amount(party_type, parties, inv, tax_details, posting_date, pan_no=N
 
 
 def get_invoice_vouchers(parties, tax_details, company, party_type="Supplier"):
-<<<<<<< HEAD
 	doctype = "Purchase Invoice" if party_type == "Supplier" else "Sales Invoice"
 	field = (
 		"base_tax_withholding_net_total as base_net_total" if party_type == "Supplier" else "base_net_total"
 	)
 	voucher_wise_amount = {}
 	vouchers = []
-=======
-	voucher_wise_amount = []
-	vouchers = []
 
 	ldcs = frappe.db.get_all(
 		"Lower Deduction Certificate",
@@ -340,7 +336,6 @@ def get_invoice_vouchers(parties, tax_details, company, party_type="Supplier"):
 		"grand_total",
 		"posting_date",
 	]
->>>>>>> 325c4e3536 (fix: '0' rate LDC's Invoice net totals should be ignored)
 
 	filters = {
 		"company": company,
@@ -358,10 +353,6 @@ def get_invoice_vouchers(parties, tax_details, company, party_type="Supplier"):
 	invoices_details = frappe.get_all(doctype, filters=filters, fields=["name", field])
 
 	for d in invoices_details:
-<<<<<<< HEAD
-		vouchers.append(d.name)
-		voucher_wise_amount.update({d.name: {"amount": d.base_net_total, "voucher_type": doctype}})
-=======
 		d = frappe._dict(
 			{
 				"voucher_name": d.name,
@@ -371,7 +362,6 @@ def get_invoice_vouchers(parties, tax_details, company, party_type="Supplier"):
 				"posting_date": d.posting_date,
 			}
 		)
->>>>>>> 325c4e3536 (fix: '0' rate LDC's Invoice net totals should be ignored)
 
 		if ldc := [x for x in ldcs if d.posting_date >= x.valid_from and d.posting_date <= x.valid_upto]:
 			if ldc[0].supplier in parties and ldc[0].rate == 0:

diff --git a/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py b/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py
@@ -6,13 +6,8 @@
 
 import frappe
 from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
-<<<<<<< HEAD
 from frappe.tests.utils import FrappeTestCase, change_settings
-from frappe.utils import add_days, today
-=======
-from frappe.tests import IntegrationTestCase, UnitTestCase
 from frappe.utils import add_days, add_months, today
->>>>>>> 0cdd346f8f (test: ldc @ 0 rate)
 
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
 from erpnext.accounts.utils import get_fiscal_year