Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor

This commit is contained in:
marination
2021-08-24 11:48:13 +05:30
1294 changed files with 3267 additions and 2749 deletions

View File

@@ -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()

View File

@@ -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)

View File

@@ -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"] = ""

View File

@@ -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

View File

@@ -82,4 +82,4 @@
</script>
<style>
</style>
</style>

View File

@@ -34,4 +34,4 @@
</div>
<style>
</style>
</style>