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

chore: resolve conflicts

Browse Source
This commit is contained in:
ljain112
2025-06-24 15:31:34 +05:30
parent 2bf8dffb60
commit 1ccdb67c55
4 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -836,7 +836,7 @@ class TestSalesInvoice(FrappeTestCase):
w = self.make() w = self.make()
self.assertEqual(w.outstanding_amount, w.base_rounded_total) self.assertEqual(w.outstanding_amount, w.base_rounded_total)
@IntegrationTestCase.change_settings( @change_settings(
"Accounts Settings", "Accounts Settings",
{"add_taxes_from_item_tax_template": 0, "add_taxes_from_taxes_and_charges_template": 0}, {"add_taxes_from_item_tax_template": 0, "add_taxes_from_taxes_and_charges_template": 0},
) )

10
erpnext/controllers/accounts_controller.py
View File

@@ -1134,12 +1134,6 @@ class AccountsController(TransactionBase):
return True return True
def set_taxes_and_charges(self): def set_taxes_and_charges(self):
<<<<<<< HEAD
if frappe.db.get_single_value("Accounts Settings", "add_taxes_from_item_tax_template"):
if hasattr(self, "taxes_and_charges") and not self.get("taxes") and not self.get("is_pos"):
if tax_master_doctype := self.meta.get_field("taxes_and_charges").options:
self.append_taxes_from_master(tax_master_doctype)
=======
if self.get("taxes") or self.get("is_pos"): if self.get("taxes") or self.get("is_pos"):
return return
@@ -1151,7 +1145,6 @@ class AccountsController(TransactionBase):
if frappe.get_single_value("Accounts Settings", "add_taxes_from_item_tax_template"): if frappe.get_single_value("Accounts Settings", "add_taxes_from_item_tax_template"):
self.append_taxes_from_item_tax_template() self.append_taxes_from_item_tax_template()
>>>>>>> 4cb1fa2b6b (fix: auto append_taxes_from_item_tax_template in backend)
def append_taxes_from_master(self, tax_master_doctype=None): def append_taxes_from_master(self, tax_master_doctype=None):
if self.get("taxes_and_charges"): if self.get("taxes_and_charges"):
@@ -1183,12 +1176,9 @@ class AccountsController(TransactionBase):
"account_head": account_head, "account_head": account_head,
"rate": 0, "rate": 0,
"description": account_head, "description": account_head,
<<<<<<< HEAD
=======
"set_by_item_tax_template": 1, "set_by_item_tax_template": 1,
"category": "Total", "category": "Total",
"add_deduct_tax": "Add", "add_deduct_tax": "Add",
>>>>>>> 4cb1fa2b6b (fix: auto append_taxes_from_item_tax_template in backend)
}, },
) )

8
erpnext/controllers/tests/test_accounts_controller.py
View File

@@ -931,14 +931,10 @@ class TestAccountsController(FrappeTestCase):
self.assertEqual(exc_je_for_si, []) self.assertEqual(exc_je_for_si, [])
self.assertEqual(exc_je_for_pe, []) self.assertEqual(exc_je_for_pe, [])
<<<<<<< HEAD @change_settings(
@change_settings("Accounts Settings", {"add_taxes_from_item_tax_template": 1})
=======
@IntegrationTestCase.change_settings(
"Accounts Settings", "Accounts Settings",
{"add_taxes_from_item_tax_template": 0, "add_taxes_from_taxes_and_charges_template": 1}, {"add_taxes_from_item_tax_template": 0, "add_taxes_from_taxes_and_charges_template": 1},
) )
>>>>>>> 4cb1fa2b6b (fix: auto append_taxes_from_item_tax_template in backend)
def test_18_fetch_taxes_based_on_taxes_and_charges_template(self): def test_18_fetch_taxes_based_on_taxes_and_charges_template(self):
# Create a Sales Taxes and Charges Template # Create a Sales Taxes and Charges Template
if not frappe.db.exists("Sales Taxes and Charges Template", "_Test Tax - _TC"): if not frappe.db.exists("Sales Taxes and Charges Template", "_Test Tax - _TC"):
@@ -967,7 +963,7 @@ class TestAccountsController(FrappeTestCase):
self.assertEqual(sinv.total_taxes_and_charges, 4.5) self.assertEqual(sinv.total_taxes_and_charges, 4.5)
@IntegrationTestCase.change_settings( @change_settings(
"Accounts Settings", "Accounts Settings",
{"add_taxes_from_item_tax_template": 1, "add_taxes_from_taxes_and_charges_template": 0}, {"add_taxes_from_item_tax_template": 1, "add_taxes_from_taxes_and_charges_template": 0},
) )

4
erpnext/selling/doctype/quotation/test_quotation.py
View File

@@ -179,7 +179,7 @@ class TestQuotation(FrappeTestCase):
sales_order.delivery_date = nowdate() sales_order.delivery_date = nowdate()
sales_order.insert() sales_order.insert()
@IntegrationTestCase.change_settings( @change_settings(
"Accounts Settings", "Accounts Settings",
{"add_taxes_from_item_tax_template": 0, "add_taxes_from_taxes_and_charges_template": 0}, {"add_taxes_from_item_tax_template": 0, "add_taxes_from_taxes_and_charges_template": 0},
) )
@@ -720,7 +720,7 @@ class TestQuotation(FrappeTestCase):
quotation.items[0].conversion_factor = 2.23 quotation.items[0].conversion_factor = 2.23
self.assertRaises(frappe.ValidationError, quotation.save) self.assertRaises(frappe.ValidationError, quotation.save)
@IntegrationTestCase.change_settings( @change_settings(
"Accounts Settings", "Accounts Settings",
{"add_taxes_from_item_tax_template": 1, "add_taxes_from_taxes_and_charges_template": 0}, {"add_taxes_from_item_tax_template": 1, "add_taxes_from_taxes_and_charges_template": 0},
) )