mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-31 10:49:09 +00:00
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
This commit is contained in:
@@ -65,7 +65,7 @@ def work(domain="Manufacturing"):
|
||||
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 @@ def make_quotation(domain):
|
||||
"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",
|
||||
|
||||
Reference in New Issue
Block a user