nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-16 18:24:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
Nabin Hait
2015-02-17 11:12:04 +05:30
parent 3237c75d98 46e03eadca
commit 6f0a3ed8d4
62 changed files with 1220 additions and 897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,5 +97,7 @@ def get_charts_for_country(country):
with open(os.path.join(os.path.dirname(__file__), "syscohada_syscohada_chart_template.json"), "r") as f:
_get_chart_name(f.read())
charts.append("Standard")
if len(charts) > 1:
charts.append("Standard")
return charts