From 782c9dda1a7af57d330294d3b5ef51fd3e3904ef Mon Sep 17 00:00:00 2001
From: krishna <krishna@aerele.in>
Date: Mon, 16 Sep 2024 18:44:58 +0530
Subject: [PATCH 1/2] fix: add currency in options for rate field in pricing
 rule

(cherry picked from commit 636c0131fa7f43a2902e18e68663418e2bf625f5)

# Conflicts:
#	erpnext/accounts/doctype/pricing_rule/pricing_rule.json
---
 erpnext/accounts/doctype/pricing_rule/pricing_rule.json | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
index 6f191c106c9..ae76a7eebe1 100644
--- 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"
-}
+}
\ No newline at end of file

From 82982e25c6758d2fdcf22c62bd61dcd065759fb4 Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Wed, 18 Sep 2024 12:10:42 +0530
Subject: [PATCH 2/2] chore: resolve conflict

---
 erpnext/accounts/doctype/pricing_rule/pricing_rule.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
index ae76a7eebe1..ee9dd2be8c3 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -648,11 +648,7 @@
  "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",