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

Fixed conflict

Browse Source
This commit is contained in:
Nabin Hait
2016-05-26 16:10:02 +05:30
parent 8ed2f87480 1c383c3664
commit 310d64d565
6 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/setup/doctype/company/company.py
View File

@@ -109,9 +109,9 @@ class Company(Document):
create_charts(self.chart_of_accounts, self.name, self.flags.ignore_permissions)
frappe.db.set(self, "default_receivable_account", frappe.db.get_value("Account",
{"company": self.name, "account_type": "Receivable"}))
{"company": self.name, "account_type": "Receivable", "is_group": 0}))
frappe.db.set(self, "default_payable_account", frappe.db.get_value("Account",
{"company": self.name, "account_type": "Payable"}))
{"company": self.name, "account_type": "Payable", "is_group": 0}))
def set_default_accounts(self):
self._set_default_account("default_cash_account", "Cash")

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

@@ -20,7 +20,7 @@ def setup_complete(args=None):
install_fixtures.install(args.get("country"))
# update_setup_wizard_access()
update_setup_wizard_access()
create_fiscal_year_and_company(args)
create_users(args)
set_defaults(args)