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

fix: prevent duplicate shipping charges without cost center

Browse Source 
(cherry picked from commit a4134af30b)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
This commit is contained in:
Mihir Kandoi
2026-08-02 12:01:35 +05:30
committed by Mergify
parent 8bef78afda
commit a6dff3fc47
2 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/doctype/shipping_rule/shipping_rule.py
View File

@@ -161,7 +161,16 @@ class ShippingRule(Document):
) )
shipping_charge["add_deduct_tax"] = "Add" shipping_charge["add_deduct_tax"] = "Add"
existing_shipping_charge = doc.get("taxes", filters=shipping_charge) shipping_charge_filters = shipping_charge.copy()
if not self.cost_center:
# Blank Link values can be None on the server or an empty string from the client.
# Child-table defaults can also resolve a blank value to the company default.
shipping_charge_filters["cost_center"] = (
"in",
(None, "", erpnext.get_default_cost_center(doc.company)),
)
existing_shipping_charge = doc.get("taxes", filters=shipping_charge_filters)
if existing_shipping_charge: if existing_shipping_charge:
# take the last record found # take the last record found
existing_shipping_charge[-1].tax_amount = shipping_amount existing_shipping_charge[-1].tax_amount = shipping_amount

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

@@ -1984,10 +1984,48 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase):
sales_order.save() sales_order.save()
self.assertEqual(sales_order.taxes[0].tax_amount, 0) self.assertEqual(sales_order.taxes[0].tax_amount, 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},
) )
=======
def test_sales_order_with_shipping_rule_without_cost_center(self):
from erpnext import get_default_cost_center
shipping_rule = frappe.get_doc(
{
"doctype": "Shipping Rule",
"label": "Shipping Rule Without Cost Center - Sales Order Test",
"shipping_rule_type": "Selling",
"company": "_Test Company",
"account": "_Test Account Shipping Charges - _TC",
"calculate_based_on": "Fixed",
"shipping_amount": 50,
}
).insert()
sales_order = make_sales_order(do_not_save=True)
sales_order.shipping_rule = shipping_rule.name
company_cost_center = get_default_cost_center(sales_order.company)
shipping_rule.apply(sales_order)
self.assertEqual(len(sales_order.taxes), 1)
self.assertIsNone(sales_order.taxes[0].cost_center)
for cost_center in (None, "", company_cost_center):
sales_order.taxes[0].cost_center = cost_center
shipping_rule.apply(sales_order)
self.assertEqual(len(sales_order.taxes), 1)
self.assertEqual(sales_order.taxes[0].cost_center, cost_center)
sales_order.taxes[0].cost_center = ""
sales_order.save()
sales_order.reload()
shipping_rule.apply(sales_order)
self.assertEqual(len(sales_order.taxes), 1)
self.assertEqual(sales_order.taxes[0].cost_center, "")
>>>>>>> a4134af30b (fix: prevent duplicate shipping charges without cost center)
def test_sales_order_partial_advance_payment(self): def test_sales_order_partial_advance_payment(self):
from erpnext.accounts.doctype.payment_entry.test_payment_entry import ( from erpnext.accounts.doctype.payment_entry.test_payment_entry import (
create_payment_entry, create_payment_entry,