Merge branch '1310' of github.com:webnotes/erpnext into 1310
diff --git a/patches/august_2013/p02_rename_price_list.py b/patches/august_2013/p02_rename_price_list.py
index 0a19299..dbe268f 100644
--- a/patches/august_2013/p02_rename_price_list.py
+++ b/patches/august_2013/p02_rename_price_list.py
@@ -6,7 +6,7 @@
def execute():
webnotes.reload_doc("selling", "doctype", "shopping_cart_price_list")
- webnotes.reload_doc("setup", "doctype", "item_price")
+ webnotes.reload_doc("stock", "doctype", "item_price")
for t in [
("Supplier Quotation", "price_list_name", "buying_price_list"),
diff --git a/patches/june_2013/p03_buying_selling_for_price_list.py b/patches/june_2013/p03_buying_selling_for_price_list.py
index ead97ab..61cddd0 100644
--- a/patches/june_2013/p03_buying_selling_for_price_list.py
+++ b/patches/june_2013/p03_buying_selling_for_price_list.py
@@ -7,8 +7,8 @@
import MySQLdb
def execute():
- webnotes.reload_doc("setup", "doctype", "price_list")
- webnotes.reload_doc("setup", "doctype", "item_price")
+ webnotes.reload_doc("stock", "doctype", "price_list")
+ webnotes.reload_doc("stock", "doctype", "item_price")
try:
for price_list in webnotes.conn.sql_list("""select name from `tabPrice List`"""):
diff --git a/patches/june_2013/p07_taxes_price_list_for_territory.py b/patches/june_2013/p07_taxes_price_list_for_territory.py
index f57ecf8..d523ea9 100644
--- a/patches/june_2013/p07_taxes_price_list_for_territory.py
+++ b/patches/june_2013/p07_taxes_price_list_for_territory.py
@@ -4,8 +4,8 @@
import webnotes
def execute():
- webnotes.reload_doc("setup", "doctype", "for_territory")
- webnotes.reload_doc("setup", "doctype", "price_list")
+ webnotes.reload_doc("stock", "doctype", "for_territory")
+ webnotes.reload_doc("stock", "doctype", "price_list")
webnotes.reload_doc("accounts", "doctype", "sales_taxes_and_charges_master")
webnotes.reload_doc("accounts", "doctype", "shipping_rule")
diff --git a/patches/october_2013/p02_update_price_list_and_item_details_in_item_price.py b/patches/october_2013/p02_update_price_list_and_item_details_in_item_price.py
index 209ebf3..4a90b8c 100644
--- a/patches/october_2013/p02_update_price_list_and_item_details_in_item_price.py
+++ b/patches/october_2013/p02_update_price_list_and_item_details_in_item_price.py
@@ -5,7 +5,7 @@
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
diff --git a/patches/september_2013/p03_modify_item_price_include_in_price_list.py b/patches/september_2013/p03_modify_item_price_include_in_price_list.py
index 8ca6d76..2400918 100644
--- a/patches/september_2013/p03_modify_item_price_include_in_price_list.py
+++ b/patches/september_2013/p03_modify_item_price_include_in_price_list.py
@@ -5,8 +5,8 @@
import webnotes
def execute():
- webnotes.reload_doc("setup", "doctype", "price_list")
- webnotes.reload_doc("setup", "doctype", "item_price")
+ webnotes.reload_doc("stock", "doctype", "price_list")
+ webnotes.reload_doc("stock", "doctype", "item_price")
webnotes.reload_doc("stock", "doctype", "item")
webnotes.conn.sql("""update `tabItem Price` set parenttype='Price List',
diff --git a/setup/doctype/for_territory/__init__.py b/stock/doctype/for_territory/__init__.py
similarity index 100%
rename from setup/doctype/for_territory/__init__.py
rename to stock/doctype/for_territory/__init__.py
diff --git a/setup/doctype/for_territory/for_territory.py b/stock/doctype/for_territory/for_territory.py
similarity index 100%
rename from setup/doctype/for_territory/for_territory.py
rename to stock/doctype/for_territory/for_territory.py
diff --git a/setup/doctype/for_territory/for_territory.txt b/stock/doctype/for_territory/for_territory.txt
similarity index 100%
rename from setup/doctype/for_territory/for_territory.txt
rename to stock/doctype/for_territory/for_territory.txt
diff --git a/setup/doctype/item_price/README.md b/stock/doctype/item_price/README.md
similarity index 100%
rename from setup/doctype/item_price/README.md
rename to stock/doctype/item_price/README.md
diff --git a/setup/doctype/item_price/__init__.py b/stock/doctype/item_price/__init__.py
similarity index 100%
rename from setup/doctype/item_price/__init__.py
rename to stock/doctype/item_price/__init__.py
diff --git a/setup/doctype/item_price/item_price.js b/stock/doctype/item_price/item_price.js
similarity index 100%
rename from setup/doctype/item_price/item_price.js
rename to stock/doctype/item_price/item_price.js
diff --git a/setup/doctype/item_price/item_price.py b/stock/doctype/item_price/item_price.py
similarity index 100%
rename from setup/doctype/item_price/item_price.py
rename to stock/doctype/item_price/item_price.py
diff --git a/setup/doctype/item_price/item_price.txt b/stock/doctype/item_price/item_price.txt
similarity index 100%
rename from setup/doctype/item_price/item_price.txt
rename to stock/doctype/item_price/item_price.txt
diff --git a/setup/doctype/item_price/test_item_price.py b/stock/doctype/item_price/test_item_price.py
similarity index 100%
rename from setup/doctype/item_price/test_item_price.py
rename to stock/doctype/item_price/test_item_price.py
diff --git a/setup/doctype/price_list/README.md b/stock/doctype/price_list/README.md
similarity index 100%
rename from setup/doctype/price_list/README.md
rename to stock/doctype/price_list/README.md
diff --git a/setup/doctype/price_list/__init__.py b/stock/doctype/price_list/__init__.py
similarity index 100%
rename from setup/doctype/price_list/__init__.py
rename to stock/doctype/price_list/__init__.py
diff --git a/setup/doctype/price_list/price_list.css b/stock/doctype/price_list/price_list.css
similarity index 100%
rename from setup/doctype/price_list/price_list.css
rename to stock/doctype/price_list/price_list.css
diff --git a/setup/doctype/price_list/price_list.js b/stock/doctype/price_list/price_list.js
similarity index 100%
rename from setup/doctype/price_list/price_list.js
rename to stock/doctype/price_list/price_list.js
diff --git a/setup/doctype/price_list/price_list.py b/stock/doctype/price_list/price_list.py
similarity index 100%
rename from setup/doctype/price_list/price_list.py
rename to stock/doctype/price_list/price_list.py
diff --git a/setup/doctype/price_list/price_list.txt b/stock/doctype/price_list/price_list.txt
similarity index 100%
rename from setup/doctype/price_list/price_list.txt
rename to stock/doctype/price_list/price_list.txt
diff --git a/setup/doctype/price_list/test_price_list.py b/stock/doctype/price_list/test_price_list.py
similarity index 100%
rename from setup/doctype/price_list/test_price_list.py
rename to stock/doctype/price_list/test_price_list.py