Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests 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
commit daaa14c079
37 changed files with 84 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
accounts/doctype/gl_entry/gl_entry.py
View File

@ -135,17 +135,18 @@ def check_freezing_date(posting_date, adv_adj=False):
def update_outstanding_amt(account, against_voucher_type, against_voucher, on_cancel=False): def update_outstanding_amt(account, against_voucher_type, against_voucher, on_cancel=False):
# get final outstanding amt # get final outstanding amt
bal = flt(webnotes.conn.sql("""select sum(debit) - sum(credit) from `tabGL Entry` bal = flt(webnotes.conn.sql("""select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0))
from `tabGL Entry`
where against_voucher_type=%s and against_voucher=%s and account = %s""", where against_voucher_type=%s and against_voucher=%s and account = %s""",
(against_voucher_type, against_voucher, account))[0][0] or 0.0) (against_voucher_type, against_voucher, account))[0][0] or 0.0)
if against_voucher_type == 'Purchase Invoice': if against_voucher_type == 'Purchase Invoice':
bal = -bal bal = -bal
elif against_voucher_type == "Journal Voucher": elif against_voucher_type == "Journal Voucher":
against_voucher_amount = flt(webnotes.conn.sql("""select sum(debit) - sum(credit) against_voucher_amount = flt(webnotes.conn.sql("""
select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0))
from `tabGL Entry` where voucher_type = 'Journal Voucher' and voucher_no = %s from `tabGL Entry` where voucher_type = 'Journal Voucher' and voucher_no = %s
and account = %s""", (against_voucher, account))[0][0]) and account = %s""", (against_voucher, account))[0][0])
bal = against_voucher_amount + bal bal = against_voucher_amount + bal
if against_voucher_amount < 0: if against_voucher_amount < 0:
bal = -bal bal = -bal

5
accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@ -457,11 +457,16 @@ class DocType(BuyingController):
def get_expense_account(doctype, txt, searchfield, start, page_len, filters): def get_expense_account(doctype, txt, searchfield, start, page_len, filters):
from controllers.queries import get_match_cond from controllers.queries import get_match_cond
# expense account can be any Debit account,
# but can also be a Liability account with account_type='Expense Account' in special circumstances.
# Hence the first condition is an "OR"
return webnotes.conn.sql("""select tabAccount.name from `tabAccount` return webnotes.conn.sql("""select tabAccount.name from `tabAccount`
where (tabAccount.debit_or_credit="Debit" where (tabAccount.debit_or_credit="Debit"
or tabAccount.account_type = "Expense Account") or tabAccount.account_type = "Expense Account")
and tabAccount.group_or_ledger="Ledger" and tabAccount.group_or_ledger="Ledger"
and tabAccount.docstatus!=2 and tabAccount.docstatus!=2
and ifnull(tabAccount.master_type, "")=""
and ifnull(tabAccount.master_name, "")=""
and tabAccount.company = '%(company)s' and tabAccount.company = '%(company)s'
and tabAccount.%(key)s LIKE '%(txt)s' and tabAccount.%(key)s LIKE '%(txt)s'
%(mcond)s""" % {'company': filters['company'], 'key': searchfield, %(mcond)s""" % {'company': filters['company'], 'key': searchfield,

5
accounts/doctype/sales_invoice/sales_invoice.py
View File

@ -897,11 +897,16 @@ def get_bank_cash_account(mode_of_payment):
def get_income_account(doctype, txt, searchfield, start, page_len, filters): def get_income_account(doctype, txt, searchfield, start, page_len, filters):
from controllers.queries import get_match_cond from controllers.queries import get_match_cond
# income account can be any Credit account,
# but can also be a Asset account with account_type='Income Account' in special circumstances.
# Hence the first condition is an "OR"
return webnotes.conn.sql("""select tabAccount.name from `tabAccount` return webnotes.conn.sql("""select tabAccount.name from `tabAccount`
where (tabAccount.debit_or_credit="Credit" where (tabAccount.debit_or_credit="Credit"
or tabAccount.account_type = "Income Account") or tabAccount.account_type = "Income Account")
and tabAccount.group_or_ledger="Ledger" and tabAccount.group_or_ledger="Ledger"
and tabAccount.docstatus!=2 and tabAccount.docstatus!=2
and ifnull(tabAccount.master_type, "")=""
and ifnull(tabAccount.master_name, "")=""
and tabAccount.company = '%(company)s' and tabAccount.company = '%(company)s'
and tabAccount.%(key)s LIKE '%(txt)s' and tabAccount.%(key)s LIKE '%(txt)s'
%(mcond)s""" % {'company': filters['company'], 'key': searchfield, %(mcond)s""" % {'company': filters['company'], 'key': searchfield,

2
accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
View File

@ -7,7 +7,7 @@ wn.require("app/js/controllers/accounts.js");
cur_frm.cscript.onload = function(doc, cdt, cdn) { cur_frm.cscript.onload = function(doc, cdt, cdn) {
if(doc.doctype === "Sales Taxes and Charges Master") if(doc.doctype === "Sales Taxes and Charges Master")
erpnext.add_for_territory(); erpnext.add_applicable_territory();
} }
cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.cscript.refresh = function(doc, cdt, cdn) {

4
accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-01-10 16:34:09", "creation": "2013-01-10 16:34:09",
"docstatus": 0, "docstatus": 0,
"modified": "2013-07-22 15:22:14", "modified": "2013-10-31 19:25:09",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -94,7 +94,7 @@
"fieldname": "valid_for_territories", "fieldname": "valid_for_territories",
"fieldtype": "Table", "fieldtype": "Table",
"label": "Valid for Territories", "label": "Valid for Territories",
"options": "For Territory", "options": "Applicable Territory",
"reqd": 1 "reqd": 1
}, },
{ {

6
accounts/doctype/sales_taxes_and_charges_master/test_sales_taxes_and_charges_master.py
View File

@ -25,7 +25,7 @@ test_records = [
"rate": 6.36, "rate": 6.36,
}, },
{ {
"doctype": "For Territory", "doctype": "Applicable Territory",
"parentfield": "valid_for_territories", "parentfield": "valid_for_territories",
"territory": "All Territories" "territory": "All Territories"
} }
@ -113,7 +113,7 @@ test_records = [
"row_id": 7 "row_id": 7
}, },
{ {
"doctype": "For Territory", "doctype": "Applicable Territory",
"parentfield": "valid_for_territories", "parentfield": "valid_for_territories",
"territory": "_Test Territory India" "territory": "_Test Territory India"
} }
@ -141,7 +141,7 @@ test_records = [
"rate": 4, "rate": 4,
}, },
{ {
"doctype": "For Territory", "doctype": "Applicable Territory",
"parentfield": "valid_for_territories", "parentfield": "valid_for_territories",
"territory": "All Territories" "territory": "All Territories"
} }

2
accounts/doctype/shipping_rule/shipping_rule.js
View File

@ -3,6 +3,6 @@
$.extend(cur_frm.cscript, { $.extend(cur_frm.cscript, {
onload: function() { onload: function() {
erpnext.add_for_territory(); erpnext.add_applicable_territory();
} }
}); });

4
accounts/doctype/shipping_rule/shipping_rule.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-06-25 11:48:03", "creation": "2013-06-25 11:48:03",
"docstatus": 0, "docstatus": 0,
"modified": "2013-07-05 14:55:00", "modified": "2013-10-31 19:24:50",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -87,7 +87,7 @@
"fieldname": "valid_for_territories", "fieldname": "valid_for_territories",
"fieldtype": "Table", "fieldtype": "Table",
"label": "Valid For Territories", "label": "Valid For Territories",
"options": "For Territory", "options": "Applicable Territory",
"reqd": 1 "reqd": 1
}, },
{ {

2
accounts/doctype/shipping_rule/test_shipping_rule.py
View File

@ -62,7 +62,7 @@ test_records = [
"shipping_amount": 0.0 "shipping_amount": 0.0
}, },
{ {
"doctype": "For Territory", "doctype": "Applicable Territory",
"parentfield": "valid_for_territories", "parentfield": "valid_for_territories",
"territory": "_Test Territory" "territory": "_Test Territory"
} }

2
accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
View File

@ -86,7 +86,7 @@ def get_tax_accounts(item_list, columns):
item_wise_tax_detail = json.loads(item_wise_tax_detail) item_wise_tax_detail = json.loads(item_wise_tax_detail)
for item, tax_amount in item_wise_tax_detail.items(): for item, tax_amount in item_wise_tax_detail.items():
item_tax.setdefault(parent, {}).setdefault(item, {})[account_head] = \ item_tax.setdefault(parent, {}).setdefault(item, {})[account_head] = \
flt(tax_amount[1]) flt(tax_amount[1]) if isinstance(tax_amount, list) else flt(tax_amount)
except ValueError: except ValueError:
continue continue

2
accounts/report/item_wise_sales_register/item_wise_sales_register.py
View File

@ -83,7 +83,7 @@ def get_tax_accounts(item_list, columns):
item_wise_tax_detail = json.loads(item_wise_tax_detail) item_wise_tax_detail = json.loads(item_wise_tax_detail)
for item, tax_amount in item_wise_tax_detail.items(): for item, tax_amount in item_wise_tax_detail.items():
item_tax.setdefault(parent, {}).setdefault(item, {})[account_head] = \ item_tax.setdefault(parent, {}).setdefault(item, {})[account_head] = \
flt(tax_amount[1]) flt(tax_amount[1]) if isinstance(tax_amount, list) else flt(tax_amount)
except ValueError: except ValueError:
continue continue

2
patches/august_2013/p02_rename_price_list.py
View File

@ -6,7 +6,7 @@ import webnotes
def execute(): def execute():
webnotes.reload_doc("selling", "doctype", "shopping_cart_price_list") 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 [ for t in [
("Supplier Quotation", "price_list_name", "buying_price_list"), ("Supplier Quotation", "price_list_name", "buying_price_list"),

4
patches/june_2013/p03_buying_selling_for_price_list.py
View File

@ -7,8 +7,8 @@ from webnotes.utils import cint
import MySQLdb import MySQLdb
def execute(): def execute():
webnotes.reload_doc("setup", "doctype", "price_list") webnotes.reload_doc("stock", "doctype", "price_list")
webnotes.reload_doc("setup", "doctype", "item_price") webnotes.reload_doc("stock", "doctype", "item_price")
try: try:
for price_list in webnotes.conn.sql_list("""select name from `tabPrice List`"""): for price_list in webnotes.conn.sql_list("""select name from `tabPrice List`"""):

8
patches/june_2013/p07_taxes_price_list_for_territory.py
View File

@ -4,8 +4,8 @@
import webnotes import webnotes
def execute(): def execute():
webnotes.reload_doc("setup", "doctype", "for_territory") webnotes.reload_doc("setup", "doctype", "applicable_territory")
webnotes.reload_doc("setup", "doctype", "price_list") webnotes.reload_doc("stock", "doctype", "price_list")
webnotes.reload_doc("accounts", "doctype", "sales_taxes_and_charges_master") webnotes.reload_doc("accounts", "doctype", "sales_taxes_and_charges_master")
webnotes.reload_doc("accounts", "doctype", "shipping_rule") webnotes.reload_doc("accounts", "doctype", "shipping_rule")
@ -14,12 +14,12 @@ def execute():
for parenttype in ["Sales Taxes and Charges Master", "Price List", "Shipping Rule"]: for parenttype in ["Sales Taxes and Charges Master", "Price List", "Shipping Rule"]:
for name in webnotes.conn.sql_list("""select name from `tab%s` main for name in webnotes.conn.sql_list("""select name from `tab%s` main
where not exists (select parent from `tabFor Territory` territory where not exists (select parent from `tabApplicable Territory` territory
where territory.parenttype=%s and territory.parent=main.name)""" % \ where territory.parenttype=%s and territory.parent=main.name)""" % \
(parenttype, "%s"), (parenttype,)): (parenttype, "%s"), (parenttype,)):
doc = webnotes.doc({ doc = webnotes.doc({
"doctype": "For Territory", "doctype": "Applicable Territory",
"__islocal": 1, "__islocal": 1,
"parenttype": parenttype, "parenttype": parenttype,
"parentfield": "valid_for_territories", "parentfield": "valid_for_territories",

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 import webnotes
def execute(): 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 webnotes.conn.sql("""update `tabItem Price` ip, `tabItem` i
set ip.item_name=i.item_name, ip.item_description=i.description 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")

3
patches/patch_list.py
View File

@ -161,7 +161,6 @@ patch_list = [
"execute:webnotes.delete_doc('Report', 'Sales Orders Pending To Be Delivered')", "execute:webnotes.delete_doc('Report', 'Sales Orders Pending To Be Delivered')",
"patches.june_2013.p05_remove_unused_doctypes", "patches.june_2013.p05_remove_unused_doctypes",
"patches.june_2013.p06_drop_unused_tables", "patches.june_2013.p06_drop_unused_tables",
"patches.june_2013.p07_taxes_price_list_for_territory",
"patches.june_2013.p08_shopping_cart_settings", "patches.june_2013.p08_shopping_cart_settings",
"patches.june_2013.p09_update_global_defaults", "patches.june_2013.p09_update_global_defaults",
"patches.june_2013.p10_lead_address", "patches.june_2013.p10_lead_address",
@ -235,4 +234,6 @@ patch_list = [
"patches.october_2013.p04_update_report_permission", "patches.october_2013.p04_update_report_permission",
"patches.october_2013.p05_delete_gl_entries_for_cancelled_vouchers", "patches.october_2013.p05_delete_gl_entries_for_cancelled_vouchers",
"patches.october_2013.p06_update_control_panel_and_global_defaults", "patches.october_2013.p06_update_control_panel_and_global_defaults",
"patches.october_2013.p07_rename_for_territory",
"patches.june_2013.p07_taxes_price_list_for_territory",
] ]

4
patches/september_2013/p03_modify_item_price_include_in_price_list.py
View File

@ -5,8 +5,8 @@ from __future__ import unicode_literals
import webnotes import webnotes
def execute(): def execute():
webnotes.reload_doc("setup", "doctype", "price_list") webnotes.reload_doc("stock", "doctype", "price_list")
webnotes.reload_doc("setup", "doctype", "item_price") webnotes.reload_doc("stock", "doctype", "item_price")
webnotes.reload_doc("stock", "doctype", "item") webnotes.reload_doc("stock", "doctype", "item")
webnotes.conn.sql("""update `tabItem Price` set parenttype='Price List', webnotes.conn.sql("""update `tabItem Price` set parenttype='Price List',

4
public/js/utils.js
View File

@ -28,10 +28,10 @@ $.extend(erpnext, {
} }
}, },
add_for_territory: function() { add_applicable_territory: function() {
if(cur_frm.doc.__islocal && if(cur_frm.doc.__islocal &&
wn.model.get_doclist(cur_frm.doc.doctype, cur_frm.doc.name).length === 1) { wn.model.get_doclist(cur_frm.doc.doctype, cur_frm.doc.name).length === 1) {
var territory = wn.model.add_child(cur_frm.doc, "For Territory", var territory = wn.model.add_child(cur_frm.doc, "Applicable Territory",
"valid_for_territories"); "valid_for_territories");
territory.territory = wn.defaults.get_default("territory"); territory.territory = wn.defaults.get_default("territory");
} }

2
selling/doctype/shopping_cart_settings/shopping_cart_settings.py
View File

@ -72,7 +72,7 @@ class DocType(DocListController):
# make a map of territory: [list of names] # make a map of territory: [list of names]
# if list against each territory has more than one element, raise exception # if list against each territory has more than one element, raise exception
territory_name = webnotes.conn.sql("""select `territory`, `parent` territory_name = webnotes.conn.sql("""select `territory`, `parent`
from `tabFor Territory` from `tabApplicable Territory`
where `parenttype`=%s and `parent` in (%s)""" % where `parenttype`=%s and `parent` in (%s)""" %
("%s", ", ".join(["%s"]*len(names))), tuple([parenttype] + names)) ("%s", ", ".join(["%s"]*len(names))), tuple([parenttype] + names))

0
setup/doctype/for_territory/__init__.py → setup/doctype/applicable_territory/__init__.py
View File

2
setup/doctype/for_territory/for_territory.py → setup/doctype/applicable_territory/applicable_territory.py
View File

@ -1,5 +1,5 @@
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd.
# License: GNU General Public License v3. See license.txt # MIT License. See license.txt
# For license information, please see license.txt # For license information, please see license.txt

6
setup/doctype/for_territory/for_territory.txt → setup/doctype/applicable_territory/applicable_territory.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-06-20 12:48:38", "creation": "2013-06-20 12:48:38",
"docstatus": 0, "docstatus": 0,
"modified": "2013-07-10 14:54:09", "modified": "2013-10-31 18:56:54",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -20,7 +20,7 @@
"label": "Territory", "label": "Territory",
"name": "__common__", "name": "__common__",
"options": "Territory", "options": "Territory",
"parent": "For Territory", "parent": "Applicable Territory",
"parentfield": "fields", "parentfield": "fields",
"parenttype": "DocType", "parenttype": "DocType",
"permlevel": 0, "permlevel": 0,
@ -28,7 +28,7 @@
}, },
{ {
"doctype": "DocType", "doctype": "DocType",
"name": "For Territory" "name": "Applicable Territory"
}, },
{ {
"doctype": "DocField" "doctype": "DocField"

2
setup/page/setup_wizard/setup_wizard.py
View File

@ -108,7 +108,7 @@ def create_price_lists(args):
"currency": args["currency"] "currency": args["currency"]
}, },
{ {
"doctype": "For Territory", "doctype": "Applicable Territory",
"parentfield": "valid_for_territories", "parentfield": "valid_for_territories",
"territory": "All Territories" "territory": "All Territories"
} }

0
setup/doctype/item_price/README.md → stock/doctype/item_price/README.md
View File

0
setup/doctype/item_price/__init__.py → stock/doctype/item_price/__init__.py
View File

0
setup/doctype/item_price/item_price.js → stock/doctype/item_price/item_price.js
View File

0
setup/doctype/item_price/item_price.py → stock/doctype/item_price/item_price.py
View File

4
setup/doctype/item_price/item_price.txt → stock/doctype/item_price/item_price.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-05-02 16:29:48", "creation": "2013-05-02 16:29:48",
"docstatus": 0, "docstatus": 0,
"modified": "2013-10-21 15:11:20", "modified": "2013-10-31 12:59:02",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -14,7 +14,7 @@
"icon": "icon-flag", "icon": "icon-flag",
"in_create": 0, "in_create": 0,
"istable": 0, "istable": 0,
"module": "Setup", "module": "Stock",
"name": "__common__", "name": "__common__",
"read_only": 0 "read_only": 0
}, },

0
setup/doctype/item_price/test_item_price.py → stock/doctype/item_price/test_item_price.py
View File

0
setup/doctype/price_list/README.md → stock/doctype/price_list/README.md
View File

0
setup/doctype/price_list/__init__.py → stock/doctype/price_list/__init__.py
View File

0
setup/doctype/price_list/price_list.css → stock/doctype/price_list/price_list.css
View File

2
setup/doctype/price_list/price_list.js → stock/doctype/price_list/price_list.js
View File

@ -3,7 +3,7 @@
$.extend(cur_frm.cscript, { $.extend(cur_frm.cscript, {
onload: function() { onload: function() {
erpnext.add_for_territory(); erpnext.add_applicable_territory();
}, },
refresh: function() { refresh: function() {

2
setup/doctype/price_list/price_list.py → stock/doctype/price_list/price_list.py
View File

@ -18,7 +18,7 @@ class DocType(DocListController):
# if no territory, set default territory # if no territory, set default territory
if webnotes.defaults.get_user_default("territory"): if webnotes.defaults.get_user_default("territory"):
self.doclist.append({ self.doclist.append({
"doctype": "For Territory", "doctype": "Applicable Territory",
"parentfield": "valid_for_territories", "parentfield": "valid_for_territories",
"territory": webnotes.defaults.get_user_default("territory") "territory": webnotes.defaults.get_user_default("territory")
}) })

6
setup/doctype/price_list/price_list.txt → stock/doctype/price_list/price_list.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-01-25 11:35:09", "creation": "2013-01-25 11:35:09",
"docstatus": 0, "docstatus": 0,
"modified": "2013-10-18 13:33:07", "modified": "2013-10-31 19:24:33",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -17,7 +17,7 @@
"document_type": "Master", "document_type": "Master",
"icon": "icon-tags", "icon": "icon-tags",
"max_attachments": 1, "max_attachments": 1,
"module": "Setup", "module": "Stock",
"name": "__common__" "name": "__common__"
}, },
{ {
@ -81,7 +81,7 @@
"fieldname": "valid_for_territories", "fieldname": "valid_for_territories",
"fieldtype": "Table", "fieldtype": "Table",
"label": "Valid for Territories", "label": "Valid for Territories",
"options": "For Territory", "options": "Applicable Territory",
"reqd": 1 "reqd": 1
}, },
{ {

10
setup/doctype/price_list/test_price_list.py → stock/doctype/price_list/test_price_list.py
View File

@ -15,7 +15,7 @@ test_records = [
"buying_or_selling": "Selling" "buying_or_selling": "Selling"
}, },
{ {
"doctype": "For Territory", "doctype": "Applicable Territory",
"parentfield": "valid_for_territories", "parentfield": "valid_for_territories",
"territory": "All Territories" "territory": "All Territories"
}, },
@ -28,7 +28,7 @@ test_records = [
"buying_or_selling": "Selling" "buying_or_selling": "Selling"
}, },
{ {
"doctype": "For Territory", "doctype": "Applicable Territory",
"parentfield": "valid_for_territories", "parentfield": "valid_for_territories",
"territory": "_Test Territory Rest of the World" "territory": "_Test Territory Rest of the World"
} }
@ -41,7 +41,7 @@ test_records = [
"buying_or_selling": "Selling" "buying_or_selling": "Selling"
}, },
{ {
"doctype": "For Territory", "doctype": "Applicable Territory",
"parentfield": "valid_for_territories", "parentfield": "valid_for_territories",
"territory": "_Test Territory India" "territory": "_Test Territory India"
} }
@ -54,12 +54,12 @@ test_records = [
"buying_or_selling": "Selling" "buying_or_selling": "Selling"
}, },
{ {
"doctype": "For Territory", "doctype": "Applicable Territory",
"parentfield": "valid_for_territories", "parentfield": "valid_for_territories",
"territory": "_Test Territory Rest of the World" "territory": "_Test Territory Rest of the World"
}, },
{ {
"doctype": "For Territory", "doctype": "Applicable Territory",
"parentfield": "valid_for_territories", "parentfield": "valid_for_territories",
"territory": "_Test Territory United States" "territory": "_Test Territory United States"
} }