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

Merge pull request #1763 from anandpdoshi/hotfix

Browse Source 
Fixed address template and changed case
This commit is contained in:
Anand Doshi 2014-06-06 17:20:57 +05:30
commit f56656f6b4
6 changed files with 82 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
erpnext/modules.txt
View File

@ -1,12 +1,12 @@
accounts
buying
home
hr
manufacturing
projects
selling
setup
stock
support
utilities
contacts
Accounts
Buying
Home
HR
Manufacturing
Projects
Selling
Setup
Stock
Support
Utilities
Contacts

2
erpnext/patches.txt
View File

@ -47,6 +47,8 @@ erpnext.patches.v4_0.update_account_root_type
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

12
erpnext/patches/v4_0/fix_address_template.py Normal file
View File

@ -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()

10
erpnext/patches/v4_0/fix_case_of_hr_module_def.py Normal file
View File

@ -0,0 +1,10 @@
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
from __future__ import unicode_literals
import frappe
def execute():
hr = frappe.db.get_value("Module Def", "HR")
if hr == "Hr":
frappe.rename_doc("Module Def", "Hr", "HR")
frappe.db.set_value("Module Def", "HR", "module_name", "HR")

8
erpnext/patches/v4_0/new_address_template.py
View File

@ -2,9 +2,7 @@ import frappe
def execute():
frappe.reload_doc("utilities", "doctype", "address_template")
d = frappe.new_doc("Address Template")
d.update({"country":frappe.db.get_default("country")})
try:
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()
except Exception:
pass

86
erpnext/utilities/doctype/address_template/address_template.json
View File

@ -1,57 +1,57 @@
{
"autoname": "field:country",
"creation": "2014-06-05 02:22:36.029850",
"docstatus": 0,
"doctype": "DocType",
"document_type": "Master",
"autoname": "field:country",
"creation": "2014-06-05 02:22:36.029850",
"docstatus": 0,
"doctype": "DocType",
"document_type": "Master",
"fields": [
{
"fieldname": "country",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Country",
"options": "Country",
"permlevel": 0,
"reqd": 0,
"fieldname": "country",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Country",
"options": "Country",
"permlevel": 0,
"reqd": 1,
"search_index": 1
},
},
{
"description": "This format is used if country specific format is not found",
"fieldname": "is_default",
"fieldtype": "Check",
"in_list_view": 1,
"label": "Is Default",
"description": "This format is used if country specific format is not found",
"fieldname": "is_default",
"fieldtype": "Check",
"in_list_view": 1,
"label": "Is Default",
"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",
"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",
"label": "Template",
"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",
"label": "Template",
"permlevel": 0
}
],
"icon": "icon-map-marker",
"modified": "2014-06-05 06:14:13.200689",
"modified_by": "Administrator",
"module": "Utilities",
"name": "Address Template",
"name_case": "",
"owner": "Administrator",
],
"icon": "icon-map-marker",
"modified": "2014-06-05 06:14:15.200689",
"modified_by": "Administrator",
"module": "Utilities",
"name": "Address Template",
"name_case": "",
"owner": "Administrator",
"permissions": [
{
"create": 1,
"delete": 1,
"export": 1,
"permlevel": 0,
"read": 1,
"report": 1,
"role": "System Manager",
"set_user_permissions": 1,
"create": 1,
"delete": 1,
"export": 1,
"permlevel": 0,
"read": 1,
"report": 1,
"role": "System Manager",
"set_user_permissions": 1,
"write": 1
}
],
"sort_field": "modified",
],
"sort_field": "modified",
"sort_order": "DESC"
}
}