fix: Missing commits from hotfix branch (#17997)
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
diff --git a/erpnext/demo/user/sales.py b/erpnext/demo/user/sales.py
index d4b55e8..457e976 100644
--- a/erpnext/demo/user/sales.py
+++ b/erpnext/demo/user/sales.py
@@ -65,7 +65,7 @@
def make_opportunity(domain):
b = frappe.get_doc({
"doctype": "Opportunity",
- "enquiry_from": "Customer",
+ "opportunity_from": "Customer",
"customer": get_random("Customer"),
"opportunity_type": "Sales",
"with_items": 1,
@@ -108,7 +108,7 @@
"creation": frappe.flags.current_date,
"doctype": "Quotation",
"quotation_to": "Customer",
- "customer": customer,
+ "party_name": customer,
"currency": party_account_currency or company_currency,
"conversion_rate": exchange_rate,
"order_type": "Sales",