CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-21 03:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: add currency in options for rate field in pricing rule

Browse Source 
(cherry picked from commit 636c0131fa)

# Conflicts:
#	erpnext/accounts/doctype/pricing_rule/pricing_rule.json
This commit is contained in:
krishna
2024-09-16 18:44:58 +05:30
committed by Mergify
parent dfe47261ae
commit 782c9dda1a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -419,7 +419,8 @@
"depends_on": "eval:doc.rate_or_discount==\"Rate\"", "depends_on": "eval:doc.rate_or_discount==\"Rate\"",
"fieldname": "rate", "fieldname": "rate",
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Rate" "label": "Rate",
"options": "currency"
}, },
{ {
"default": "0", "default": "0",
@@ -647,7 +648,11 @@
"icon": "fa fa-gift", "icon": "fa fa-gift",
"idx": 1, "idx": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-05-17 13:16:34.496704", "modified": "2024-05-17 13:16:34.496704",
=======
"modified": "2024-09-16 18:14:51.314765",
>>>>>>> 636c0131fa (fix: add currency in options for rate field in pricing rule)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Pricing Rule", "name": "Pricing Rule",
@@ -709,4 +714,4 @@
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"title_field": "title" "title_field": "title"
} }