Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] warehouse validation for parent_account

Browse Source
This commit is contained in:
Rushabh Mehta 2016-07-04 17:03:01 +05:30
parent bc10431b7d
commit 1d797f717b
5 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
View File

@ -39,6 +39,7 @@ frappe.ui.form.on("Request for Quotation",{
refresh: function(frm, cdt, cdn) { refresh: function(frm, cdt, cdn) {
if (frm.doc.docstatus === 1) { if (frm.doc.docstatus === 1) {
frm.dashboard.show_dashboard();
frm.add_custom_button(__("Make"), frm.add_custom_button(__("Make"),
function(){ frm.trigger("make_suppplier_quotation") }, __("Supplier Quotation")); function(){ frm.trigger("make_suppplier_quotation") }, __("Supplier Quotation"));

14
erpnext/buying/doctype/request_for_quotation/request_for_quotation_links.py Normal file
View File

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

2
erpnext/stock/doctype/material_request/material_request.js
View File

@ -43,8 +43,6 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten
var me = this; var me = this;
this._super(); this._super();
this.frm.dashboard.reset();
if(doc.docstatus==0) { if(doc.docstatus==0) {
cur_frm.add_custom_button(__("Get Items from BOM"), cur_frm.add_custom_button(__("Get Items from BOM"),
cur_frm.cscript.get_items_from_bom, "icon-sitemap", "btn-default"); cur_frm.cscript.get_items_from_bom, "icon-sitemap", "btn-default");

3
erpnext/stock/doctype/material_request/material_request_links.py
View File

@ -3,12 +3,11 @@ from frappe import _
links = { links = {
'fieldname': 'material_request', 'fieldname': 'material_request',
'non_standard_fieldnames': { 'non_standard_fieldnames': {
'Supplier Quotation': 'prevdoc_detail_docname',
'Purchase Order': 'prevdoc_detail_docname', 'Purchase Order': 'prevdoc_detail_docname',
}, },
'transactions': [ 'transactions': [
{ {
'label': _('Documents'), 'label': _('Related Documents'),
'items': ['Request for Quotation', 'Supplier Quotation', 'Purchase Order'] 'items': ['Request for Quotation', 'Supplier Quotation', 'Purchase Order']
}, },
] ]

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

@ -94,6 +94,11 @@ class Warehouse(NestedSet):
frappe.db.set_value("Warehouse", self.name, "create_account_under", parent_account[0][0]) frappe.db.set_value("Warehouse", self.name, "create_account_under", parent_account[0][0])
self.create_account_under = parent_account[0][0] self.create_account_under = parent_account[0][0]
else: else:
# did not find parent, add it to root Assets
# let the user figure.
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)) 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}")
@ -124,11 +129,11 @@ class Warehouse(NestedSet):
throw(_("Child warehouse exists for this warehouse. You can not delete this warehouse.")) throw(_("Child warehouse exists for this warehouse. You can not delete this warehouse."))
self.update_nsm_model() self.update_nsm_model()
def check_if_sle_exists(self): def check_if_sle_exists(self):
return frappe.db.sql("""select name from `tabStock Ledger Entry` return frappe.db.sql("""select name from `tabStock Ledger Entry`
where warehouse = %s""", self.name) where warehouse = %s""", self.name)
def check_if_child_exists(self): def check_if_child_exists(self):
return frappe.db.sql("""select name from `tabWarehouse` return frappe.db.sql("""select name from `tabWarehouse`
where parent_warehouse = %s""", self.name) where parent_warehouse = %s""", self.name)
@ -202,7 +207,7 @@ class Warehouse(NestedSet):
frappe.db.set_value("Stock Settings", None, "allow_negative_stock", existing_allow_negative_stock) frappe.db.set_value("Stock Settings", None, "allow_negative_stock", existing_allow_negative_stock)
frappe.db.auto_commit_on_many_writes = 0 frappe.db.auto_commit_on_many_writes = 0
def convert_to_group_or_ledger(self): def convert_to_group_or_ledger(self):
if self.is_group: if self.is_group:
self.convert_to_ledger() self.convert_to_ledger()
@ -220,11 +225,11 @@ class Warehouse(NestedSet):
doc = frappe.get_doc("Account", account_name) doc = frappe.get_doc("Account", account_name)
doc.warehouse = self.name doc.warehouse = self.name
doc.convert_group_to_ledger() doc.convert_group_to_ledger()
self.is_group = 0 self.is_group = 0
self.save() self.save()
return 1 return 1
def convert_to_group(self): def convert_to_group(self):
if self.check_if_sle_exists(): if self.check_if_sle_exists():
throw(_("Warehouses with existing transaction can not be converted to group.")) throw(_("Warehouses with existing transaction can not be converted to group."))
@ -255,7 +260,7 @@ def get_children():
is_group as expandable is_group as expandable
from `tab{doctype}` from `tab{doctype}`
where docstatus < 2 where docstatus < 2
and ifnull(`{parent_field}`,'') = %s and ifnull(`{parent_field}`,'') = %s
and (`company` = %s or company is null or company = '') and (`company` = %s or company is null or company = '')
order by name""".format(doctype=frappe.db.escape(doctype), order by name""".format(doctype=frappe.db.escape(doctype),
parent_field=frappe.db.escape(parent_field)), (parent, company), as_dict=1) parent_field=frappe.db.escape(parent_field)), (parent, company), as_dict=1)
@ -292,4 +297,3 @@ def add_node():
def convert_to_group_or_ledger(): def convert_to_group_or_ledger():
args = frappe.form_dict args = frappe.form_dict
return frappe.get_doc("Warehouse", args.docname).convert_to_group_or_ledger() return frappe.get_doc("Warehouse", args.docname).convert_to_group_or_ledger()