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

fixed conflict

Browse Source
This commit is contained in:
Nabin Hait 2014-03-25 16:53:50 +05:30
commit ec9fb67d84
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/patches.txt
View File

@ -1,3 +1,5 @@
execute:import unidecode # new requirement
erpnext.patches.4_0.validate_v3_patch erpnext.patches.4_0.validate_v3_patch
erpnext.patches.4_0.update_user_properties erpnext.patches.4_0.update_user_properties
erpnext.patches.4_0.move_warehouse_user_to_restrictions erpnext.patches.4_0.move_warehouse_user_to_restrictions

6
erpnext/patches/4_0/import_country_codes.py
View File

@ -3,11 +3,11 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from frappe.country_info import get_all
from erpnext.setup.install import import_country_and_currency
def execute(): def execute():
frappe.reload_doc("setup", "doctype", "country") frappe.reload_doc("setup", "doctype", "country")
import_country_and_currency()
from frappe.country_info import get_all
for name, country in get_all().iteritems(): for name, country in get_all().iteritems():
frappe.set_value("Country", name, "code", country.get("code")) frappe.set_value("Country", name, "code", country.get("code"))

1
erpnext/setup/install.py
View File

@ -23,6 +23,7 @@ def import_country_and_currency():
for name in data: for name in data:
country = frappe._dict(data[name]) country = frappe._dict(data[name])
if not frappe.db.exists("Country", name):
frappe.doc({ frappe.doc({
"doctype": "Country", "doctype": "Country",
"country_name": name, "country_name": name,