From 813b9efe285cff494005621e754f26fc55f07426 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 17 Mar 2016 15:36:30 +0530 Subject: [PATCH] [fix] [minor] address.py --- erpnext/utilities/doctype/address/address.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/erpnext/utilities/doctype/address/address.py b/erpnext/utilities/doctype/address/address.py index f601053f46..a94bd56c37 100644 --- a/erpnext/utilities/doctype/address/address.py +++ b/erpnext/utilities/doctype/address/address.py @@ -140,17 +140,17 @@ def has_website_permission(doc, ptype, user, verbose=False): return False def get_address_templates(address): - name, template = frappe.db.get_value("Address Template", \ + result = frappe.db.get_value("Address Template", \ {"country": address.get("country")}, ["name", "template"]) - if not template: - name, template = frappe.db.get_value("Address Template", \ + if not result: + result = frappe.db.get_value("Address Template", \ {"is_default": 1}, ["name", "template"]) - if not template: + if not result: frappe.throw(_("No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.")) else: - return name, template + return result @frappe.whitelist() def get_shipping_address(company):