nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 12:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] [patch]

Browse Source
This commit is contained in:
Rushabh Mehta
2016-07-04 17:34:25 +05:30
parent 1d797f717b
commit e38872294a
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/buying/doctype/request_for_quotation/request_for_quotation_links.py
View File

@@ -1,14 +1,14 @@
from frappe import _ from frappe import _
links = { links = {
'fieldname': 'supplier_quotation', 'fieldname': 'request_for_quotation',
# 'non_standard_fieldnames': { # 'non_standard_fieldnames': {
# 'Purchase Order': 'prevdoc_detail_docname', # 'Purchase Order': 'prevdoc_detail_docname',
# }, # },
'transactions': [ 'transactions': [
{ {
'label': _('Related Documents'), 'label': _('Related Documents'),
'items': ['Supplier Quotation', 'Purchase Order'] 'items': ['Supplier Quotation']
}, },
] ]
} }

1
erpnext/stock/doctype/warehouse/warehouse.py
View File

@@ -99,7 +99,6 @@ class Warehouse(NestedSet):
self.create_account_under = frappe.db.get_all('Account', self.create_account_under = frappe.db.get_all('Account',
filters = {'company': self.company, 'is_group': 1, filters = {'company': self.company, 'is_group': 1,
'parent_account': '', 'root_type': 'Asset'}, limit=1)[0].name '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: 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}") frappe.throw(_("Warehouse {0}: Parent account {1} does not bolong to the company {2}")
.format(self.name, self.create_account_under, self.company)) .format(self.name, self.create_account_under, self.company))