nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 18:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Frappe Bot
2019-03-01 09:22:36 +00:00
parent 94d6f94e0e 9ce994a320
commit 8f0660ab31
10 changed files with 71 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/startup/boot.py
View File

@@ -34,7 +34,7 @@ def boot_session(bootinfo):
LIMIT 1""") and 'Yes' or 'No'
bootinfo.docs += frappe.db.sql("""select name, default_currency, cost_center, default_terms,
default_letter_head, default_bank_account, enable_perpetual_inventory from `tabCompany`""",
default_letter_head, default_bank_account, enable_perpetual_inventory, country from `tabCompany`""",
as_dict=1, update={"doctype":":Company"})
party_account_types = frappe.db.sql(""" select name, ifnull(account_type, '') from `tabParty Type`""")