nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-14 23:18:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #56246 from nabinhait/commission-fields-depends-on-sales-partner

Browse Source 
fix(selling): hide commission fields without a sales partner and stop copying them
This commit is contained in:
Nabin Hait
2026-06-23 10:42:16 +05:30
committed by GitHub
parent b0b20edd3e eee1fdf276
commit ca908b69cf
7 changed files with 75 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1425,19 +1425,23 @@
"width": "50%"
},
{
"depends_on": "eval:doc.sales_partner",
"fetch_from": "sales_partner.commission_rate",
"fetch_if_empty": 1,
"fieldname": "commission_rate",
"fieldtype": "Float",
"label": "Commission Rate (%)",
"no_copy": 1,
"oldfieldname": "commission_rate",
"oldfieldtype": "Currency",
"print_hide": 1
},
{
"depends_on": "eval:doc.sales_partner",
"fieldname": "total_commission",
"fieldtype": "Currency",
"label": "Total Commission",
"no_copy": 1,
"oldfieldname": "total_commission",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -1528,9 +1532,11 @@
"print_hide": 1
},
{
"depends_on": "eval:doc.sales_partner",
"fieldname": "amount_eligible_for_commission",
"fieldtype": "Currency",
"label": "Amount Eligible for Commission",
"no_copy": 1,
"options": "Company:company:default_currency",
"read_only": 1
},
@@ -1636,7 +1642,7 @@
"icon": "fa fa-file-text",
"is_submittable": 1,
"links": [],
"modified": "2026-05-28 12:22:50.253090",
"modified": "2026-06-21 12:46:13.250145",
"modified_by": "Administrator",
"module": "Accounts",
"name": "POS Invoice",

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

@@ -1747,6 +1747,7 @@
"width": "50%"
},
{
"depends_on": "eval:doc.sales_partner",
"fetch_from": "sales_partner.commission_rate",
"fetch_if_empty": 1,
"fieldname": "commission_rate",
@@ -1754,16 +1755,19 @@
"hide_days": 1,
"hide_seconds": 1,
"label": "Commission Rate (%)",
"no_copy": 1,
"oldfieldname": "commission_rate",
"oldfieldtype": "Currency",
"print_hide": 1
},
{
"depends_on": "eval:doc.sales_partner",
"fieldname": "total_commission",
"fieldtype": "Currency",
"hide_days": 1,
"hide_seconds": 1,
"label": "Total Commission",
"no_copy": 1,
"oldfieldname": "total_commission",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -1970,9 +1974,11 @@
"read_only": 1
},
{
"depends_on": "eval:doc.sales_partner",
"fieldname": "amount_eligible_for_commission",
"fieldtype": "Currency",
"label": "Amount Eligible for Commission",
"no_copy": 1,
"options": "Company:company:default_currency",
"read_only": 1
},
@@ -2354,7 +2360,7 @@
"link_fieldname": "consolidated_invoice"
}
],
"modified": "2026-05-28 12:15:12.486443",
"modified": "2026-06-21 12:46:13.250145",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice",

9
erpnext/selling/doctype/sales_order/mapper.py
View File

@@ -245,7 +245,12 @@ def make_delivery_note(
sre_details = get_sre_reserved_qty_details_for_voucher("Sales Order", source_name)
mapper = {
"Sales Order": {"doctype": "Delivery Note", "validation": {"docstatus": ["=", 1]}},
"Sales Order": {
"doctype": "Delivery Note",
"validation": {"docstatus": ["=", 1]},
# commission_rate is no_copy (so it isn't carried on Duplicate), map it explicitly here
"field_map": {"commission_rate": "commission_rate"},
},
"Sales Taxes and Charges": {"doctype": "Sales Taxes and Charges", "reset_value": True},
"Sales Team": {"doctype": "Sales Team", "add_if_empty": True},
}
@@ -558,6 +563,8 @@ def make_sales_invoice(
"doctype": "Sales Invoice",
"field_map": {
"party_account_currency": "party_account_currency",
# commission_rate is no_copy (so it isn't carried on Duplicate), map it explicitly here
"commission_rate": "commission_rate",
},
"field_no_map": ["payment_terms_template"],
"validation": {"docstatus": ["=", 1]},

8
erpnext/selling/doctype/sales_order/sales_order.json
View File

@@ -1329,6 +1329,7 @@
"width": "50%"
},
{
"depends_on": "eval:doc.sales_partner",
"fetch_from": "sales_partner.commission_rate",
"fetch_if_empty": 1,
"fieldname": "commission_rate",
@@ -1336,17 +1337,20 @@
"hide_days": 1,
"hide_seconds": 1,
"label": "Commission Rate",
"no_copy": 1,
"oldfieldname": "commission_rate",
"oldfieldtype": "Currency",
"print_hide": 1,
"width": "100px"
},
{
"depends_on": "eval:doc.sales_partner",
"fieldname": "total_commission",
"fieldtype": "Currency",
"hide_days": 1,
"hide_seconds": 1,
"label": "Total Commission",
"no_copy": 1,
"oldfieldname": "total_commission",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -1477,9 +1481,11 @@
},
{
"allow_on_submit": 1,
"depends_on": "eval:doc.sales_partner",
"fieldname": "amount_eligible_for_commission",
"fieldtype": "Currency",
"label": "Amount Eligible for Commission",
"no_copy": 1,
"options": "Company:company:default_currency",
"read_only": 1
},
@@ -1760,7 +1766,7 @@
"idx": 105,
"is_submittable": 1,
"links": [],
"modified": "2026-05-28 11:41:11.823034",
"modified": "2026-06-21 12:46:13.250145",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",

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

@@ -3044,6 +3044,43 @@ class TestSalesOrder(ERPNextTestSuite):
finally:
frappe.db.set_value("Item", "_Test Item", "grant_commission", 1)
def test_commission_fields_not_copied_on_duplicate(self):
"""Commission rate/amount fields are no_copy; only the sales partner carries to a copy."""
frappe.db.set_value("Item", "_Test Item", "grant_commission", 1)
try:
so = make_sales_order(qty=10, rate=100, do_not_save=True)
so.sales_partner = "_Test Sales Partner India - 1"
so.commission_rate = 7
so.save()
self.assertEqual(so.total_commission, 70)
# ignore_no_copy=False mirrors UI "Duplicate"/amend, which honour no_copy
duplicate = frappe.copy_doc(so, ignore_no_copy=False)
self.assertEqual(duplicate.sales_partner, "_Test Sales Partner India - 1")
self.assertFalse(duplicate.commission_rate)
self.assertFalse(duplicate.total_commission)
self.assertFalse(duplicate.amount_eligible_for_commission)
finally:
frappe.db.set_value("Item", "_Test Item", "grant_commission", 1)
def test_commission_rate_carried_through_mapper(self):
"""commission_rate is no_copy, but Make Delivery Note / Sales Invoice still carries it."""
from erpnext.selling.doctype.sales_order.mapper import make_delivery_note, make_sales_invoice
original = frappe.db.get_value("Item", "_Test Item", "grant_commission")
frappe.db.set_value("Item", "_Test Item", "grant_commission", 1)
try:
so = make_sales_order(qty=10, rate=100, do_not_save=True)
so.sales_partner = "_Test Sales Partner India - 1"
so.commission_rate = 7
so.submit()
# carried to the mapped (unsaved) documents even though the field is no_copy
self.assertEqual(make_delivery_note(so.name).commission_rate, 7)
self.assertEqual(make_sales_invoice(so.name).commission_rate, 7)
finally:
frappe.db.set_value("Item", "_Test Item", "grant_commission", original)
def compare_payment_schedules(doc, doc1, doc2):
for index, schedule in enumerate(doc1.get("payment_schedule")):

8
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@@ -1154,11 +1154,13 @@
"width": "50%"
},
{
"depends_on": "eval:doc.sales_partner",
"fetch_from": "sales_partner.commission_rate",
"fetch_if_empty": 1,
"fieldname": "commission_rate",
"fieldtype": "Float",
"label": "Commission Rate (%)",
"no_copy": 1,
"oldfieldname": "commission_rate",
"oldfieldtype": "Currency",
"print_hide": 1,
@@ -1166,9 +1168,11 @@
"width": "100px"
},
{
"depends_on": "eval:doc.sales_partner",
"fieldname": "total_commission",
"fieldtype": "Currency",
"label": "Total Commission",
"no_copy": 1,
"oldfieldname": "total_commission",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -1262,9 +1266,11 @@
"read_only": 1
},
{
"depends_on": "eval:doc.sales_partner",
"fieldname": "amount_eligible_for_commission",
"fieldtype": "Currency",
"label": "Amount Eligible for Commission",
"no_copy": 1,
"options": "Company:company:default_currency",
"read_only": 1
},
@@ -1466,7 +1472,7 @@
"idx": 146,
"is_submittable": 1,
"links": [],
"modified": "2026-05-28 11:44:37.286743",
"modified": "2026-06-21 12:46:13.250145",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",

3
erpnext/stock/doctype/delivery_note/mapper.py
View File

@@ -132,7 +132,8 @@ def make_sales_invoice(
{
"Delivery Note": {
"doctype": "Sales Invoice",
"field_map": {"is_return": "is_return"},
# commission_rate is no_copy (so it isn't carried on Duplicate), map it explicitly here
"field_map": {"is_return": "is_return", "commission_rate": "commission_rate"},
"validation": {"docstatus": ["=", 1]},
},
"Delivery Note Item": {