mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-25 16:04:46 +00:00
Merge branch 'hotfix'
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
import frappe
|
import frappe
|
||||||
|
|
||||||
__version__ = '7.0.49'
|
__version__ = '7.0.50'
|
||||||
|
|
||||||
def get_default_company(user=None):
|
def get_default_company(user=None):
|
||||||
'''Get default company for user'''
|
'''Get default company for user'''
|
||||||
|
|||||||
@@ -48,5 +48,24 @@ frappe.treeview_settings["Account"] = {
|
|||||||
+ " " + dr_or_cr
|
+ " " + dr_or_cr
|
||||||
+ '</span>').insertBefore(node.$ul);
|
+ '</span>').insertBefore(node.$ul);
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
toolbar: [
|
||||||
|
{
|
||||||
|
condition: function(node) {
|
||||||
|
return !node.root && frappe.boot.user.can_read.indexOf("GL Entry") !== -1
|
||||||
|
},
|
||||||
|
label: __("View Ledger"),
|
||||||
|
click: function(node, btn) {
|
||||||
|
frappe.route_options = {
|
||||||
|
"account": node.label,
|
||||||
|
"from_date": sys_defaults.year_start_date,
|
||||||
|
"to_date": sys_defaults.year_end_date,
|
||||||
|
"company": frappe.defaults.get_default('company') ? frappe.defaults.get_default('company'): ""
|
||||||
|
};
|
||||||
|
frappe.set_route("query-report", "General Ledger");
|
||||||
|
},
|
||||||
|
btnClass: "hidden-xs"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
extend_toolbar: true
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user