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

Company based on exising company fix

Browse Source
This commit is contained in:
Nabin Hait 2017-03-12 16:44:25 +05:30
parent ae205f878a
commit fb4b8d926f
5 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
View File

@ -117,7 +117,7 @@ def get_charts_for_country(country):
def get_account_tree_from_existing_company(existing_company):
all_accounts = frappe.get_all('Account',
filters={'company': existing_company},
filters={'company': existing_company, "warehouse": ""},
fields = ["name", "account_name", "parent_account", "account_type",
"is_group", "root_type", "tax_rate"],
order_by="lft, rgt")
@ -126,7 +126,6 @@ def get_account_tree_from_existing_company(existing_company):
# fill in tree starting with root accounts (those with no parent)
build_account_tree(account_tree, None, all_accounts)
return account_tree
def build_account_tree(tree, parent, all_accounts):

5
erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json
View File

@ -88,10 +88,7 @@
"Items Delivered to Customs on temprary Base": {}
},
"Stock in Hand": {
"All Warehouses": {
"account_type": "Stock",
"is_group": 1
},
"is_group": 1,
"account_type": "Stock"
}
},

5
erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_default_coa.json
View File

@ -40,10 +40,7 @@
"Rental Deposits": {}
},
"Stock Assets": {
"All Warehouses": {
"account_type": "Stock",
"is_group": 1
},
"is_group": 1,
"account_type": "Stock"
},
"Tax Assets": {

11
erpnext/setup/doctype/company/company.json
View File

@ -1,5 +1,6 @@
{
"allow_copy": 0,
"allow_guest_to_view": 0,
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:company_name",
@ -407,7 +408,7 @@
"label": "Create Chart Of Accounts Based On",
"length": 0,
"no_copy": 0,
"options": "Standard Template\nExisting Company",
"options": "\nStandard Template\nExisting Company",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@ -415,7 +416,7 @@
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
@ -1680,19 +1681,19 @@
"unique": 0
}
],
"has_web_view": 0,
"hide_heading": 0,
"hide_toolbar": 0,
"icon": "fa fa-building",
"idx": 1,
"image_view": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
"modified": "2017-03-02 15:24:52.908559",
"modified": "2017-03-12 15:50:23.099622",
"modified_by": "Administrator",
"module": "Setup",
"name": "Company",
@ -1846,4 +1847,4 @@
"sort_order": "ASC",
"track_changes": 0,
"track_seen": 0
}
}

2
erpnext/setup/doctype/company/test_company.py
View File

@ -28,7 +28,7 @@ class TestCompany(unittest.TestCase):
"root_type": "Asset",
"parent_account": "Accounts Receivable - CFEC",
},
"_Test Cash - CFEC": {
"Cash - CFEC": {
"account_type": "Cash",
"is_group": 0,
"root_type": "Asset",