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

chore: resolve conflicts

Browse Source
This commit is contained in:
ljain112
2026-01-19 13:45:11 +05:30
parent cf49c32b94
commit b4dc1be5ed
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
View File

@@ -2828,9 +2828,6 @@ class TestSalesInvoice(FrappeTestCase):
self.assertEqual(sales_invoice.items[0].item_tax_template, "_Test Account Excise Duty @ 10 - _TC") self.assertEqual(sales_invoice.items[0].item_tax_template, "_Test Account Excise Duty @ 10 - _TC")
self.assertEqual(sales_invoice.items[0].item_tax_rate, item_tax_map) self.assertEqual(sales_invoice.items[0].item_tax_rate, item_tax_map)
<<<<<<< HEAD
@change_settings("Selling Settings", {"enable_discount_accounting": 1})
=======
def test_item_tax_template_change_with_grand_total_discount(self): def test_item_tax_template_change_with_grand_total_discount(self):
""" """
Test that when item tax template changes due to discount on Grand Total, Test that when item tax template changes due to discount on Grand Total,
@@ -2885,8 +2882,7 @@ class TestSalesInvoice(FrappeTestCase):
si.submit() si.submit()
@IntegrationTestCase.change_settings("Selling Settings", {"enable_discount_accounting": 1}) @change_settings("Selling Settings", {"enable_discount_accounting": 1})
>>>>>>> f00aeec9b4 (Merge pull request #51787 from ljain112/fix-taxes-disc)
def test_sales_invoice_with_discount_accounting_enabled(self): def test_sales_invoice_with_discount_accounting_enabled(self):
discount_account = create_account( discount_account = create_account(
account_name="Discount Account", account_name="Discount Account",

7
erpnext/controllers/taxes_and_totals.py
View File

@@ -42,13 +42,8 @@ class calculate_taxes_and_totals:
items = list(filter(lambda item: not item.get("is_alternative"), self.doc.get("items"))) items = list(filter(lambda item: not item.get("is_alternative"), self.doc.get("items")))
return items return items
<<<<<<< HEAD
def calculate(self):
if not len(self._items):
=======
def calculate(self, ignore_tax_template_validation=False): def calculate(self, ignore_tax_template_validation=False):
if not len(self.doc.items): if not len(self._items):
>>>>>>> f00aeec9b4 (Merge pull request #51787 from ljain112/fix-taxes-disc)
return return
self.discount_amount_applied = False self.discount_amount_applied = False