diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation_links.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation_links.py index 809b38cc26c..279d1570f81 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation_links.py +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation_links.py @@ -1,14 +1,14 @@ from frappe import _ links = { - 'fieldname': 'supplier_quotation', + 'fieldname': 'request_for_quotation', # 'non_standard_fieldnames': { # 'Purchase Order': 'prevdoc_detail_docname', # }, 'transactions': [ { 'label': _('Related Documents'), - 'items': ['Supplier Quotation', 'Purchase Order'] + 'items': ['Supplier Quotation'] }, ] } \ No newline at end of file diff --git a/erpnext/stock/doctype/warehouse/warehouse.py b/erpnext/stock/doctype/warehouse/warehouse.py index efb59515514..c0a385a2ef8 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.py +++ b/erpnext/stock/doctype/warehouse/warehouse.py @@ -99,7 +99,6 @@ class Warehouse(NestedSet): self.create_account_under = frappe.db.get_all('Account', filters = {'company': self.company, 'is_group': 1, 'parent_account': '', 'root_type': 'Asset'}, limit=1)[0].name - frappe.throw(_("Please enter parent account group for warehouse {0}").format(self.name)) elif frappe.db.get_value("Account", self.create_account_under, "company") != self.company: frappe.throw(_("Warehouse {0}: Parent account {1} does not bolong to the company {2}") .format(self.name, self.create_account_under, self.company))