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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
mbauskar 2017-09-10 12:32:21 +05:30
commit dfeadf876e
4 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -4,7 +4,7 @@ import inspect
import frappe import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
__version__ = '8.11.0' __version__ = '8.11.1'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

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

@ -13,10 +13,10 @@ frappe.ui.form.on("Request for Quotation",{
} }
frm.fields_dict["suppliers"].grid.get_field("contact").get_query = function(doc, cdt, cdn) { frm.fields_dict["suppliers"].grid.get_field("contact").get_query = function(doc, cdt, cdn) {
var d =locals[cdt][cdn]; let d = locals[cdt][cdn];
return { return {
query: "erpnext.buying.doctype.request_for_quotation.request_for_quotation.get_supplier_contacts", query: "erpnext.buying.doctype.request_for_quotation.request_for_quotation.get_supplier_contacts",
filters: {'supplier': doc.supplier} filters: {'supplier': d.supplier}
} }
} }
}, },

2
erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
View File

@ -206,7 +206,7 @@ def get_list_context(context=None):
def get_supplier_contacts(doctype, txt, searchfield, start, page_len, filters): def get_supplier_contacts(doctype, txt, searchfield, start, page_len, filters):
return frappe.db.sql("""select `tabContact`.name from `tabContact`, `tabDynamic Link` return frappe.db.sql("""select `tabContact`.name from `tabContact`, `tabDynamic Link`
where `tabDynamic Link`.link_doctype = 'Supplier' and (`tabDynamic Link`.link_name=%(name)s where `tabDynamic Link`.link_doctype = 'Supplier' and (`tabDynamic Link`.link_name=%(name)s
or `tabDynamic Link`.link_name like %(txt)s) and `tabContact`.name = `tabDynamic Link`.parent and `tabDynamic Link`.link_name like %(txt)s) and `tabContact`.name = `tabDynamic Link`.parent
limit %(start)s, %(page_len)s""", {"start": start, "page_len":page_len, "txt": "%%%s%%" % txt, "name": filters.get('supplier')}) limit %(start)s, %(page_len)s""", {"start": start, "page_len":page_len, "txt": "%%%s%%" % txt, "name": filters.get('supplier')})
# This method is used to make supplier quotation from material request form. # This method is used to make supplier quotation from material request form.

41
erpnext/controllers/website_list_for_contact.py
View File

@ -5,7 +5,7 @@ from __future__ import unicode_literals
import json import json
import frappe import frappe
from frappe import _ from frappe import _
from frappe.utils import flt from frappe.utils import flt, has_common
from frappe.utils.user import is_website_user from frappe.utils.user import is_website_user
def get_list_context(context=None): def get_list_context(context=None):
@ -55,14 +55,16 @@ def get_transaction_list(doctype, txt=None, filters=None, limit_start=0, limit_p
return post_process(doctype, get_list_for_transactions(doctype, txt, filters, limit_start, limit_page_length, return post_process(doctype, get_list_for_transactions(doctype, txt, filters, limit_start, limit_page_length,
fields="name", order_by="modified desc")) fields="name", order_by="modified desc"))
def get_list_for_transactions(doctype, txt, filters, limit_start, limit_page_length=20, ignore_permissions=False,fields=None, order_by=None): def get_list_for_transactions(doctype, txt, filters, limit_start, limit_page_length=20,
ignore_permissions=False,fields=None, order_by=None):
""" Get List of transactions like Invoices, Orders """
from frappe.www.list import get_list from frappe.www.list import get_list
meta = frappe.get_meta(doctype) meta = frappe.get_meta(doctype)
data = [] data = []
or_filters = [] or_filters = []
for d in get_list(doctype, txt, filters=filters, fields="name", limit_start=limit_start, for d in get_list(doctype, txt, filters=filters, fields="name", limit_start=limit_start,
limit_page_length=limit_page_length, ignore_permissions=True, order_by="modified desc"): limit_page_length=limit_page_length, ignore_permissions=ignore_permissions, order_by="modified desc"):
data.append(d) data.append(d)
if txt: if txt:
@ -74,9 +76,9 @@ def get_list_for_transactions(doctype, txt, filters, limit_start, limit_page_len
or_filters.append([doctype, "name", "=", child.parent]) or_filters.append([doctype, "name", "=", child.parent])
if or_filters: if or_filters:
for r in frappe.get_list(doctype, fields=fields,filters=filters, or_filters=or_filters, limit_start=limit_start, for r in frappe.get_list(doctype, fields=fields,filters=filters, or_filters=or_filters,
limit_page_length=limit_page_length, ignore_permissions=ignore_permissions, limit_start=limit_start, limit_page_length=limit_page_length,
order_by=order_by): ignore_permissions=ignore_permissions, order_by=order_by):
data.append(r) data.append(r)
return data return data
@ -124,13 +126,30 @@ def post_process(doctype, data):
return result return result
def get_customers_suppliers(doctype, user): def get_customers_suppliers(doctype, user):
customers = []
suppliers = []
meta = frappe.get_meta(doctype) meta = frappe.get_meta(doctype)
contacts = frappe.db.sql(""" select `tabContact`.email_id, `tabDynamic Link`.link_doctype, `tabDynamic Link`.link_name
from `tabContact`, `tabDynamic Link` where
`tabContact`.name = `tabDynamic Link`.parent and `tabContact`.email_id =%s """, user, as_dict=1)
customers = [c.link_name for c in contacts if c.link_doctype == 'Customer'] if meta.get_field("customer") else None if has_common(["Supplier", "Customer"], frappe.get_roles(user)):
suppliers = [c.link_name for c in contacts if c.link_doctype == 'Supplier'] if meta.get_field("supplier") else None contacts = frappe.db.sql("""
select
`tabContact`.email_id,
`tabDynamic Link`.link_doctype,
`tabDynamic Link`.link_name
from
`tabContact`, `tabDynamic Link`
where
`tabContact`.name=`tabDynamic Link`.parent and `tabContact`.email_id =%s
""", user, as_dict=1)
customers = [c.link_name for c in contacts if c.link_doctype == 'Customer'] \
if meta.get_field("customer") else None
suppliers = [c.link_name for c in contacts if c.link_doctype == 'Supplier'] \
if meta.get_field("supplier") else None
elif frappe.has_permission(doctype, 'read', user=user):
customers = [customer.name for customer in frappe.get_list("Customer")] \
if meta.get_field("customer") else None
suppliers = [supplier.name for supplier in frappe.get_list("Customer")] \
if meta.get_field("supplier") else None
return customers, suppliers return customers, suppliers