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

refactor: rename field

Browse Source 
(cherry picked from commit f3d598881c)
This commit is contained in:
Mihir Kandoi
2025-02-17 18:21:22 +05:30
committed by Mergify
parent fc2ec7c495
commit f782900a15
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/pricing_rule/pricing_rule.json
View File

@@ -53,7 +53,7 @@
"column_break_42", "column_break_42",
"free_item_uom", "free_item_uom",
"round_free_qty", "round_free_qty",
"enforce_free_item_qty", "dont_enforce_free_item_qty",
"is_recursive", "is_recursive",
"recurse_for", "recurse_for",
"apply_recursion_over", "apply_recursion_over",
@@ -648,15 +648,15 @@
{ {
"default": "1", "default": "1",
"depends_on": "eval:doc.price_or_product_discount == 'Product'", "depends_on": "eval:doc.price_or_product_discount == 'Product'",
"fieldname": "enforce_free_item_qty", "fieldname": "dont_enforce_free_item_qty",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Enforce Free Item Qty" "label": "Don't Enforce Free Item Qty"
} }
], ],
"icon": "fa fa-gift", "icon": "fa fa-gift",
"idx": 1, "idx": 1,
"links": [], "links": [],
"modified": "2025-02-05 21:03:22.103044", "modified": "2025-02-17 18:15:39.824639",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Pricing Rule", "name": "Pricing Rule",

4
erpnext/accounts/doctype/pricing_rule/pricing_rule.py
View File

@@ -60,7 +60,7 @@ class PricingRule(Document):
disable: DF.Check disable: DF.Check
discount_amount: DF.Currency discount_amount: DF.Currency
discount_percentage: DF.Float discount_percentage: DF.Float
enforce_free_item_qty: DF.Check dont_enforce_free_item_qty: DF.Check
for_price_list: DF.Link | None for_price_list: DF.Link | None
free_item: DF.Link | None free_item: DF.Link | None
free_item_rate: DF.Currency free_item_rate: DF.Currency
@@ -646,7 +646,7 @@ def remove_pricing_rule_for_item(pricing_rules, item_details, item_code=None, ra
if pricing_rule.margin_type in ["Percentage", "Amount"]: if pricing_rule.margin_type in ["Percentage", "Amount"]:
item_details.margin_rate_or_amount = 0.0 item_details.margin_rate_or_amount = 0.0
item_details.margin_type = None item_details.margin_type = None
elif pricing_rule.get("free_item") and pricing_rule.get("enforce_free_item_qty"): elif pricing_rule.get("free_item") and not pricing_rule.get("dont_enforce_free_item_qty"):
item_details.remove_free_item = ( item_details.remove_free_item = (
item_code if pricing_rule.get("same_item") else pricing_rule.get("free_item") item_code if pricing_rule.get("same_item") else pricing_rule.get("free_item")
) )

8
erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
View File

@@ -428,7 +428,7 @@ class TestPricingRule(FrappeTestCase):
self.assertEqual(so.items[1].is_free_item, 1) self.assertEqual(so.items[1].is_free_item, 1)
self.assertEqual(so.items[1].item_code, "_Test Item 2") self.assertEqual(so.items[1].item_code, "_Test Item 2")
def test_enforce_free_item_qty(self): def test_dont_enforce_free_item_qty(self):
# this test is only for testing non-enforcement as all other tests in this file already test with enforcement # this test is only for testing non-enforcement as all other tests in this file already test with enforcement
frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule") frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule")
test_record = { test_record = {
@@ -467,10 +467,10 @@ class TestPricingRule(FrappeTestCase):
self.assertEqual(len(so.items), 2) self.assertEqual(len(so.items), 2)
# Without enforcement # Without enforcement
pricing_rule.enforce_free_item_qty = 0 pricing_rule.dont_enforce_free_item_qty = 1
pricing_rule.save() pricing_rule.save()
# Test 2 : Deleted free item will not be fetched again on save without enfrocement # Test 2 : Deleted free item will not be fetched again on save without enforcement
so.items.pop(1) so.items.pop(1)
so.save() so.save()
so.reload() so.reload()
@@ -1499,7 +1499,7 @@ def make_pricing_rule(**args):
"discount_amount": args.discount_amount or 0.0, "discount_amount": args.discount_amount or 0.0,
"apply_multiple_pricing_rules": args.apply_multiple_pricing_rules or 0, "apply_multiple_pricing_rules": args.apply_multiple_pricing_rules or 0,
"has_priority": args.has_priority or 0, "has_priority": args.has_priority or 0,
"enforce_free_item_qty": args.enforce_free_item_qty or 1, "enforce_free_item_qty": args.dont_enforce_free_item_qty or 0,
} }
) )

4
erpnext/accounts/doctype/pricing_rule/utils.py
View File

@@ -713,8 +713,8 @@ def apply_pricing_rule_for_free_items(doc, pricing_rule_args):
args.pop((item.item_code, item.pricing_rules)) args.pop((item.item_code, item.pricing_rules))
for free_item in args.values(): for free_item in args.values():
if doc.is_new() or frappe.get_value( if doc.is_new() or not frappe.get_value(
"Pricing Rule", free_item["pricing_rules"], "enforce_free_item_qty" "Pricing Rule", free_item["pricing_rules"], "dont_enforce_free_item_qty"
): ):
doc.append("items", free_item) doc.append("items", free_item)

2
erpnext/stock/doctype/pick_list/test_pick_list.py
View File

@@ -1242,7 +1242,7 @@ class TestPickList(FrappeTestCase):
"is_recursive": 1, "is_recursive": 1,
"recurse_for": 2, "recurse_for": 2,
"free_qty": 1, "free_qty": 1,
"enforce_free_item_qty": 1, "dont_enforce_free_item_qty": 0,
"company": "_Test Company", "company": "_Test Company",
"customer": "_Test Customer", "customer": "_Test Customer",
} }