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

[setup][fix] get newly created root Territory for children

Browse Source
This commit is contained in:
Prateeksha Singh 2018-11-19 15:01:25 +05:30
parent c1c057611e
commit 6bf22fa7d7
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/setup/setup_wizard/operations/install_fixtures.py
View File

@ -19,8 +19,6 @@ default_sales_partner_type = ["Channel Partner", "Distributor", "Dealer", "Agent
"Retailer", "Implementation Partner", "Reseller"] "Retailer", "Implementation Partner", "Reseller"]
def install(country=None): def install(country=None):
root_territory = get_root_of("Territory")
records = [ records = [
# domains # domains
{ 'doctype': 'Domain', 'domain': 'Distribution'}, { 'doctype': 'Domain', 'domain': 'Distribution'},
@ -104,8 +102,8 @@ def install(country=None):
# territory: with two default territories, one for home country and one named Rest of the World # territory: with two default territories, one for home country and one named Rest of the World
{'doctype': 'Territory', 'territory_name': _('All Territories'), 'is_group': 1, 'name': _('All Territories'), 'parent_territory': ''}, {'doctype': 'Territory', 'territory_name': _('All Territories'), 'is_group': 1, 'name': _('All Territories'), 'parent_territory': ''},
{'doctype': 'Territory', 'territory_name': country.replace("'", ""), 'is_group': 0, 'parent_territory': root_territory}, {'doctype': 'Territory', 'territory_name': country.replace("'", ""), 'is_group': 0, 'parent_territory': _('All Territories')},
{'doctype': 'Territory', 'territory_name': _("Rest Of The World"), 'is_group': 0, 'parent_territory': root_territory}, {'doctype': 'Territory', 'territory_name': _("Rest Of The World"), 'is_group': 0, 'parent_territory': _('All Territories')},
# customer group # customer group
{'doctype': 'Customer Group', 'customer_group_name': _('All Customer Groups'), 'is_group': 1, 'name': _('All Customer Groups'), 'parent_customer_group': ''}, {'doctype': 'Customer Group', 'customer_group_name': _('All Customer Groups'), 'is_group': 1, 'name': _('All Customer Groups'), 'parent_customer_group': ''},
@ -417,7 +415,6 @@ def install_post_company_fixtures(args=None):
stock_settings.set_qty_in_transactions_based_on_serial_no_input = 1 stock_settings.set_qty_in_transactions_based_on_serial_no_input = 1
stock_settings.save() stock_settings.save()
if args.bank_account: if args.bank_account:
company_name = args.company_name company_name = args.company_name
bank_account_group = frappe.db.get_value("Account", bank_account_group = frappe.db.get_value("Account",
@ -480,7 +477,8 @@ def install_post_company_fixtures(args=None):
# {} # {}
] ]
make_records(records, True) # TODO:
# make_records(records, True)
def get_fy_details(fy_start_date, fy_end_date): def get_fy_details(fy_start_date, fy_end_date):