nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1310' of github.com:webnotes/erpnext

Browse Source 
Conflicts:
	setup/doctype/setup_control/setup_control.py
	stock/doctype/stock_entry/stock_entry.py
	utilities/demo/demo_docs/Price_List.csv
This commit is contained in:
Anand Doshi
2013-11-04 13:14:39 +05:30
parent cb72e01e9d 06757a19ef
commit daaa14c079
37 changed files with 84 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patches/october_2013/p02_update_price_list_and_item_details_in_item_price.py
View File

@@ -5,7 +5,7 @@ from __future__ import unicode_literals
import webnotes
def execute():
webnotes.reload_doc("setup", "doctype", "item_price")
webnotes.reload_doc("stock", "doctype", "item_price")
webnotes.conn.sql("""update `tabItem Price` ip, `tabItem` i
set ip.item_name=i.item_name, ip.item_description=i.description

23
patches/october_2013/p07_rename_for_territory.py Normal file
View File

@@ -0,0 +1,23 @@
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd.
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import webnotes, os
def execute():
from webnotes.utils import get_base_path
webnotes.reload_doc("core", "doctype", "doctype")
tables = webnotes.conn.sql_list("show tables")
if "tabApplicable Territory" not in tables:
webnotes.rename_doc("DocType", "For Territory", "Applicable Territory", force=True)
webnotes.reload_doc("setup", "doctype", "applicable_territory")
path = os.path.join(get_base_path(), "app", "setup", "doctype", "for_territory")
if os.path.exists(path):
os.system("rm -rf {path}".format(path=path))
if webnotes.conn.exists("DocType", "For Territory"):
webnotes.delete_doc("DocType", "For Territory")