From cd0aed993a16a75331c93644d3c598be77a4ff25 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 6 Jun 2014 17:37:31 +0530 Subject: [PATCH] Fixed Address Template Patch --- erpnext/patches/v4_0/new_address_template.py | 10 +++++++--- erpnext/utilities/doctype/address/address.py | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/erpnext/patches/v4_0/new_address_template.py b/erpnext/patches/v4_0/new_address_template.py index cebfa9a536..d0f5ab0b14 100644 --- a/erpnext/patches/v4_0/new_address_template.py +++ b/erpnext/patches/v4_0/new_address_template.py @@ -3,6 +3,10 @@ import frappe def execute(): frappe.reload_doc("utilities", "doctype", "address_template") if not frappe.db.sql("select name from `tabAddress Template`"): - d = frappe.new_doc("Address Template") - d.update({"country":frappe.db.get_default("country")}) - d.insert() + try: + d = frappe.new_doc("Address Template") + d.update({"country":frappe.db.get_default("country")}) + d.insert() + except: + print frappe.get_traceback() + diff --git a/erpnext/utilities/doctype/address/address.py b/erpnext/utilities/doctype/address/address.py index 01b9d9acb5..8fd5cb1dea 100644 --- a/erpnext/utilities/doctype/address/address.py +++ b/erpnext/utilities/doctype/address/address.py @@ -62,7 +62,7 @@ def get_address_display(address_dict): {"is_default": 1}, "template") if not template: - frappe.throw(_("No default Address Template found. Please create a new one")) + frappe.throw(_("No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.")) return frappe.render_template(template, address_dict)