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

(cherry picked from commit 636c013) # Conflicts: # erpnext/accounts/doctype/pricing_rule/pricing_rule.json
frappe · Sep 18, 2024 · 782c9dd · 782c9dd
1 parent dfe4726
commit 782c9dd
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -419,7 +419,8 @@
    "depends_on": "eval:doc.rate_or_discount==\"Rate\"",
    "fieldname": "rate",
    "fieldtype": "Currency",
-   "label": "Rate"
+   "label": "Rate",
+   "options": "currency"
   },
   {
    "default": "0",
@@ -647,7 +648,11 @@
  "icon": "fa fa-gift",
  "idx": 1,
  "links": [],
+<<<<<<< HEAD
  "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",
  "module": "Accounts",
  "name": "Pricing Rule",
@@ -709,4 +714,4 @@
  "sort_order": "DESC",
  "states": [],
  "title_field": "title"
-}
+}