Merge pull request #1725 from rmehta/develop

Fix for awesome bar
This commit is contained in:
Anand Doshi
2014-06-02 11:07:26 +05:30
5 changed files with 1404 additions and 1379 deletions

View File

@@ -416,7 +416,6 @@
"read_only": null, "read_only": null,
"read_only_onload": null, "read_only_onload": null,
"search_fields": null, "search_fields": null,
"section_style": null,
"server_code": null, "server_code": null,
"server_code_compiled": null, "server_code_compiled": null,
"server_code_core": null, "server_code_core": null,

View File

@@ -416,7 +416,6 @@
"read_only": null, "read_only": null,
"read_only_onload": null, "read_only_onload": null,
"search_fields": null, "search_fields": null,
"section_style": null,
"server_code": null, "server_code": null,
"server_code_compiled": null, "server_code_compiled": null,
"server_code_core": null, "server_code_core": null,

View File

@@ -222,7 +222,6 @@
"read_only": null, "read_only": null,
"read_only_onload": null, "read_only_onload": null,
"search_fields": null, "search_fields": null,
"section_style": null,
"server_code": null, "server_code": null,
"server_code_compiled": null, "server_code_compiled": null,
"server_code_core": null, "server_code_core": null,

View File

@@ -352,7 +352,6 @@
"read_only": null, "read_only": null,
"read_only_onload": null, "read_only_onload": null,
"search_fields": null, "search_fields": null,
"section_style": null,
"server_code": null, "server_code": null,
"server_code_compiled": null, "server_code_compiled": null,
"server_code_core": null, "server_code_core": null,

View File

@@ -9,33 +9,35 @@ def boot_session(bootinfo):
"""boot session - send website info if guest""" """boot session - send website info if guest"""
import frappe import frappe
bootinfo['custom_css'] = frappe.db.get_value('Style Settings', None, 'custom_css') or '' bootinfo.custom_css = frappe.db.get_value('Style Settings', None, 'custom_css') or ''
bootinfo['website_settings'] = frappe.get_doc('Website Settings') bootinfo.website_settings = frappe.get_doc('Website Settings')
if frappe.session['user']!='Guest': if frappe.session['user']!='Guest':
bootinfo['letter_heads'] = get_letter_heads() bootinfo.letter_heads = get_letter_heads()
update_page_info(bootinfo)
load_country_and_currency(bootinfo) load_country_and_currency(bootinfo)
bootinfo['notification_settings'] = frappe.get_doc("Notification Control", bootinfo.notification_settings = frappe.get_doc("Notification Control",
"Notification Control") "Notification Control")
# if no company, show a dialog box to create a new company # if no company, show a dialog box to create a new company
bootinfo["customer_count"] = frappe.db.sql("""select count(*) from tabCustomer""")[0][0] bootinfo.customer_count = frappe.db.sql("""select count(*) from tabCustomer""")[0][0]
if not bootinfo["customer_count"]: if not bootinfo.customer_count:
bootinfo['setup_complete'] = frappe.db.sql("""select name from bootinfo.setup_complete = frappe.db.sql("""select name from
tabCompany limit 1""") and 'Yes' or 'No' tabCompany limit 1""") and 'Yes' or 'No'
bootinfo['docs'] += frappe.db.sql("""select name, default_currency, cost_center bootinfo.docs += frappe.db.sql("""select name, default_currency, cost_center
from `tabCompany`""", as_dict=1, update={"doctype":":Company"}) from `tabCompany`""", as_dict=1, update={"doctype":":Company"})
def load_country_and_currency(bootinfo): def load_country_and_currency(bootinfo):
country = frappe.db.get_default("country") country = frappe.db.get_default("country")
if country and frappe.db.exists("Country", country): if country and frappe.db.exists("Country", country):
bootinfo["docs"] += [frappe.get_doc("Country", country)] bootinfo.docs += [frappe.get_doc("Country", country)]
bootinfo["docs"] += frappe.db.sql("""select * from tabCurrency bootinfo.docs += frappe.db.sql("""select * from tabCurrency
where ifnull(enabled,0)=1""", as_dict=1, update={"doctype":":Currency"}) where ifnull(enabled,0)=1""", as_dict=1, update={"doctype":":Currency"})
def get_letter_heads(): def get_letter_heads():
@@ -44,3 +46,30 @@ def get_letter_heads():
where ifnull(disabled,0)=0""") where ifnull(disabled,0)=0""")
return dict(ret) return dict(ret)
def update_page_info(bootinfo):
bootinfo.page_info.update({
"Chart of Accounts": {
"title": "Chart of Accounts",
"route": "Accounts Browser/Account"
},
"Chart of Cost Centers": {
"title": "Chart of Cost Centers",
"route": "Accounts Browser/Cost Center"
},
"Item Group Tree": {
"title": "Item Group Tree",
"route": "Sales Browser/Item Group"
},
"Customer Group Tree": {
"title": "Customer Group Tree",
"route": "Sales Browser/Customer Group"
},
"Territory Tree": {
"title": "Territory Tree",
"route": "Sales Browser/Territory"
},
"Sales Person Tree": {
"title": "Sales Person Tree",
"route": "Sales Browser/Sales Person"
}
})