mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-12 17:51:20 +00:00
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor
This commit is contained in:
@@ -124,4 +124,4 @@ def remove_document_from_index(path):
|
||||
|
||||
def build_index_for_all_routes():
|
||||
search = ProductSearch(INDEX_NAME)
|
||||
return search.build()
|
||||
return search.build()
|
||||
|
||||
@@ -316,7 +316,7 @@ def update_party(fullname, company_name=None, mobile_no=None, phone=None):
|
||||
party = get_party()
|
||||
|
||||
party.customer_name = company_name or fullname
|
||||
party.customer_type == "Company" if company_name else "Individual"
|
||||
party.customer_type = "Company" if company_name else "Individual"
|
||||
|
||||
contact_name = frappe.db.get_value("Contact", {"email_id": frappe.session.user})
|
||||
contact = frappe.get_doc("Contact", contact_name)
|
||||
|
||||
@@ -76,4 +76,4 @@ def set_product_info_for_website(item):
|
||||
item["price_sales_uom"] = product_info.get("price").get("formatted_price_sales_uom")
|
||||
else:
|
||||
item["price_stock_uom"] = ""
|
||||
item["price_sales_uom"] = ""
|
||||
item["price_sales_uom"] = ""
|
||||
|
||||
@@ -38,4 +38,4 @@ def check_customer_or_supplier():
|
||||
if link.link_doctype in ('Customer', 'Supplier'):
|
||||
return link.link_doctype, link.link_name
|
||||
|
||||
return 'Customer', None
|
||||
return 'Customer', None
|
||||
|
||||
@@ -82,4 +82,4 @@
|
||||
</script>
|
||||
|
||||
<style>
|
||||
</style>
|
||||
</style>
|
||||
|
||||
@@ -34,4 +34,4 @@
|
||||
</div>
|
||||
|
||||
<style>
|
||||
</style>
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user