Fixed Address Template

erpnext/patches.txt

@@ -48,6 +48,7 @@ execute:frappe.delete_doc("Report", "Purchase In Transit")
 erpnext.patches.v4_0.new_address_template
 execute:frappe.delete_doc("DocType", "SMS Control")
 erpnext.patches.v4_0.fix_case_of_hr_module_def
+erpnext.patches.v4_0.fix_address_template
 
 # WATCHOUT: This patch reload's documents
 erpnext.patches.v4_0.reset_permissions_for_masters

erpnext/patches/v4_0/fix_address_template.py

@@ -0,0 +1,12 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	missing_line = """{{ address_line1 }}<br>"""
+	for name, template in frappe.db.sql("select name, template from `tabAddress Template`"):
+		if missing_line not in template:
+			d = frappe.get_doc("Address Template", name)
+			d.template = missing_line + d.template
+			d.save()

erpnext/patches/v4_0/fix_case_of_hr_module_def.py

@@ -1,5 +1,4 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt
 
 from __future__ import unicode_literals
 import frappe

erpnext/patches/v4_0/new_address_template.py

@@ -2,9 +2,7 @@ import frappe
 
 def execute():
 	frappe.reload_doc("utilities", "doctype", "address_template")
-	d = frappe.new_doc("Address Template")
+	if not frappe.db.sql("select name from `tabAddress Template`"):
-	d.update({"country":frappe.db.get_default("country")})
+		d = frappe.new_doc("Address Template")
-	try:
+		d.update({"country":frappe.db.get_default("country")})
 		d.insert()
-	except Exception:
-		pass

erpnext/utilities/doctype/address_template/address_template.json

@@ -12,7 +12,7 @@
    "label": "Country",
    "options": "Country",
    "permlevel": 0,
-   "reqd": 0, 
+   "reqd": 1,
    "search_index": 1
   },
   {
@@ -24,7 +24,7 @@
    "permlevel": 0
   },
   {
-   "default": "{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}\n{{ city }}<br>\n{% if state %}{{ state }}<br>{% endif -%}\n{% if pincode %} PIN:  {{ pincode }}<br>{% endif -%}\n{{ country }}<br>\n{% if phone %}Phone: {{ phone }}<br>{% endif -%}\n{% if fax %}Fax: {{ fax }}<br>{% endif -%}\n{% if email_id %}Email: {{ email_id }}<br>{% endif -%}\n", 
+   "default": "{{ address_line1 }}<br>{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}\n{{ city }}<br>\n{% if state %}{{ state }}<br>{% endif -%}\n{% if pincode %}PIN:  {{ pincode }}<br>{% endif -%}\n{{ country }}<br>\n{% if phone %}Phone: {{ phone }}<br>{% endif -%}\n{% if fax %}Fax: {{ fax }}<br>{% endif -%}\n{% if email_id %}Email: {{ email_id }}<br>{% endif -%}\n",
    "description": "<h4>Default Template</h4>\n<p>Uses <a href=\"http://jinja.pocoo.org/docs/templates/\">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>\n<pre><code>{{ address_line1 }}&lt;br&gt;\n{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}\n{{ city }}&lt;br&gt;\n{% if state %}{{ state }}&lt;br&gt;{% endif -%}\n{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}\n{{ country }}&lt;br&gt;\n{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}\n{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}\n{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}\n</code></pre>",
    "fieldname": "template",
    "fieldtype": "Code",
@@ -33,7 +33,7 @@
   }
  ],
  "icon": "icon-map-marker",
- "modified": "2014-06-05 06:14:13.200689", 
+ "modified": "2014-06-05 06:14:15.200689",
  "modified_by": "Administrator",
  "module": "Utilities",
  "name": "Address Template",