nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-19 14:55:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Payment Terms auto-fetched in Sales Invoice even when automatically_fetch_payment_terms is disabled

Browse Source 
(cherry picked from commit cf1d892d60)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
This commit is contained in:
dharanidharan2813
2025-10-17 13:16:02 +05:30
committed by ruthra kumar
parent eedb93b2d6
commit 78a3701f4c
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/selling/doctype/sales_order/sales_order.py
View File

@@ -1203,7 +1203,6 @@ def make_sales_invoice(source_name, target_doc=None, ignore_permissions=False, a
"doctype": "Sales Invoice", "doctype": "Sales Invoice",
"field_map": { "field_map": {
"party_account_currency": "party_account_currency", "party_account_currency": "party_account_currency",
"payment_terms_template": "payment_terms_template",
}, },
"field_no_map": ["payment_terms_template"], "field_no_map": ["payment_terms_template"],
"validation": {"docstatus": ["=", 1]}, "validation": {"docstatus": ["=", 1]},

38
erpnext/selling/doctype/sales_order/test_sales_order.py
View File

@@ -200,10 +200,16 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase):
so.load_from_db() so.load_from_db()
self.assertEqual(so.per_billed, 0) self.assertEqual(so.per_billed, 0)
<<<<<<< HEAD
@change_settings( @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},
) )
=======
@IntegrationTestCase.change_settings(
"Accounts Settings", {"automatically_fetch_payment_terms": 1}
) # Enable auto fetch
>>>>>>> cf1d892d60 (fix: Payment Terms auto-fetched in Sales Invoice even when automatically_fetch_payment_terms is disabled)
def test_make_sales_invoice_with_terms(self): def test_make_sales_invoice_with_terms(self):
so = make_sales_order(do_not_submit=True) so = make_sales_order(do_not_submit=True)
@@ -232,6 +238,38 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase):
si1 = make_sales_invoice(so.name) si1 = make_sales_invoice(so.name)
self.assertEqual(len(si1.get("items")), 0) self.assertEqual(len(si1.get("items")), 0)
@IntegrationTestCase.change_settings(
"Accounts Settings", {"automatically_fetch_payment_terms": 1}
) # Enable auto fetch
def test_auto_fetch_terms_enable(self):
so = make_sales_order(do_not_submit=True)
so.payment_terms_template = "_Test Payment Term Template"
so.save()
so.submit()
si = make_sales_invoice(so.name)
# Check if payment terms are copied from sales order to sales invoice
self.assertTrue(si.payment_terms_template)
si.insert()
si.submit()
@IntegrationTestCase.change_settings(
"Accounts Settings", {"automatically_fetch_payment_terms": 0}
) # Disable auto fetch
def test_auto_fetch_terms_disable(self):
so = make_sales_order(do_not_submit=True)
so.payment_terms_template = "_Test Payment Term Template"
so.save()
so.submit()
si = make_sales_invoice(so.name)
# Check if payment terms are not copied from sales order to sales invoice
self.assertFalse(si.payment_terms_template)
si.insert()
si.submit()
def test_update_qty(self): def test_update_qty(self):
so = make_sales_order() so = make_sales_order()