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

[fix] address queries + tests

Browse Source
This commit is contained in:
Rushabh Mehta
2017-01-16 13:06:07 +05:30
parent 120461efef
commit 8d39fd9790
13 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/shopping_cart/cart.py
View File

@@ -375,15 +375,17 @@ def get_address_docs(doctype=None, txt=None, filters=None, limit_start=0, limit_
if not party:
return []
address_docs = frappe.db.sql("""select * from `tabAddress`
where `{0}`=%s order by name limit {1}, {2}""".format(party.doctype.lower(),
limit_start, limit_page_length), party.name,
as_dict=True, update={"doctype": "Address"})
address_names = frappe.db.get_all('Dyanamic Link', fields=('parent'),
filters=dict(parenttype='Address', link_doctype=party.doctype, link_name=party.name))
for address in address_docs:
address.display = get_address_display(address)
out = []
return address_docs
for address_name in address_names:
address = frappe.get_doc('Address', address_name)
address.display = get_address_display(address.as_dict())
out.append(address)
return out
@frappe.whitelist()
def apply_shipping_rule(shipping_rule):