Merge pull request #4500 from rmehta/fixes-to-tree

[fix] rename tree item fixes #2524
This commit is contained in:
Anand Doshi 2015-12-15 14:38:26 +05:30
commit 2da81732eb
3 changed files with 22 additions and 20 deletions

View File

@ -146,7 +146,7 @@ erpnext.AccountsChart = Class.extend({
label: __("Rename"), label: __("Rename"),
click: function(node) { click: function(node) {
frappe.model.rename_doc(me.ctype, node.label, function(new_name) { frappe.model.rename_doc(me.ctype, node.label, function(new_name) {
node.reload(); node.reload_parent();
}); });
}, },
btnClass: "hidden-xs" btnClass: "hidden-xs"
@ -166,8 +166,8 @@ erpnext.AccountsChart = Class.extend({
var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr"; var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr";
if (me.ctype == 'Account' && node.data && node.data.balance!==undefined) { if (me.ctype == 'Account' && node.data && node.data.balance!==undefined) {
$('<span class="balance-area pull-right text-muted small">' $('<span class="balance-area pull-right text-muted small">'
+ (node.data.balance_in_account_currency ? + (node.data.balance_in_account_currency ?
(format_currency(Math.abs(node.data.balance_in_account_currency), (format_currency(Math.abs(node.data.balance_in_account_currency),
node.data.account_currency) + " / ") : "") node.data.account_currency) + " / ") : "")
+ format_currency(Math.abs(node.data.balance), node.data.company_currency) + format_currency(Math.abs(node.data.balance), node.data.company_currency)
+ " " + dr_or_cr + " " + dr_or_cr
@ -219,7 +219,7 @@ erpnext.AccountsChart = Class.extend({
description: __("Optional. This setting will be used to filter in various transactions.") }, description: __("Optional. This setting will be used to filter in various transactions.") },
{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate')}, {fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate')},
{fieldtype:'Link', fieldname:'warehouse', label:__('Warehouse'), options:"Warehouse"}, {fieldtype:'Link', fieldname:'warehouse', label:__('Warehouse'), options:"Warehouse"},
{fieldtype:'Link', fieldname:'account_currency', label:__('Currency'), options:"Currency", {fieldtype:'Link', fieldname:'account_currency', label:__('Currency'), options:"Currency",
description: __("Optional. Sets company's default currency, if not specified.")} description: __("Optional. Sets company's default currency, if not specified.")}
] ]
}) })
@ -243,7 +243,7 @@ erpnext.AccountsChart = Class.extend({
$(fd.tax_rate.wrapper).toggle(fd.account_type.get_value()==='Tax'); $(fd.tax_rate.wrapper).toggle(fd.account_type.get_value()==='Tax');
$(fd.warehouse.wrapper).toggle(fd.account_type.get_value()==='Warehouse'); $(fd.warehouse.wrapper).toggle(fd.account_type.get_value()==='Warehouse');
}) })
// root type if root // root type if root
$(fd.root_type.wrapper).toggle(node.root); $(fd.root_type.wrapper).toggle(node.root);
@ -261,7 +261,7 @@ erpnext.AccountsChart = Class.extend({
var node = me.tree.get_selected_node(); var node = me.tree.get_selected_node();
v.parent_account = node.label; v.parent_account = node.label;
v.company = me.company; v.company = me.company;
if(node.root) { if(node.root) {
v.is_root = true; v.is_root = true;
v.parent_account = null; v.parent_account = null;
@ -278,7 +278,7 @@ erpnext.AccountsChart = Class.extend({
if(node.expanded) { if(node.expanded) {
node.toggle_node(); node.toggle_node();
} }
node.reload(); node.load();
} }
}); });
}); });
@ -324,7 +324,7 @@ erpnext.AccountsChart = Class.extend({
if(node.expanded) { if(node.expanded) {
node.toggle_node(); node.toggle_node();
} }
node.reload(); node.load();
} }
}); });
}); });

View File

@ -18,29 +18,31 @@ def get_companies():
def get_children(): def get_children():
args = frappe.local.form_dict args = frappe.local.form_dict
ctype, company = args['ctype'], args['comp'] ctype, company = args['ctype'], args['comp']
fieldname = frappe.db.escape(ctype.lower().replace(' ','_'))
doctype = frappe.db.escape(ctype)
# root # root
if args['parent'] in ("Accounts", "Cost Centers"): if args['parent'] in ("Accounts", "Cost Centers"):
select_cond = ", root_type, report_type, account_currency" if ctype=="Account" else "" fields = ", root_type, report_type, account_currency" if ctype=="Account" else ""
acc = frappe.db.sql(""" select acc = frappe.db.sql(""" select
name as value, is_group as expandable %s name as value, is_group as expandable {fields}
from `tab%s` from `tab{doctype}`
where ifnull(`parent_%s`,'') = '' where ifnull(`parent_{fieldname}`,'') = ''
and `company` = %s and docstatus<2 and `company` = %s and docstatus<2
order by name""" % (select_cond, frappe.db.escape(ctype), frappe.db.escape(ctype.lower().replace(' ','_')), '%s'), order by name""".format(fields=fields, fieldname = fieldname, doctype=doctype),
company, as_dict=1) company, as_dict=1)
if args["parent"]=="Accounts": if args["parent"]=="Accounts":
sort_root_accounts(acc) sort_root_accounts(acc)
else: else:
# other # other
select_cond = ", account_currency" if ctype=="Account" else "" fields = ", account_currency" if ctype=="Account" else ""
acc = frappe.db.sql("""select acc = frappe.db.sql("""select
name as value, is_group as expandable %s name as value, is_group as expandable, parent_{fieldname} as parent {fields}
from `tab%s` from `tab{doctype}`
where ifnull(`parent_%s`,'') = %s where ifnull(`parent_{fieldname}`,'') = %s
and docstatus<2 and docstatus<2
order by name""" % (select_cond, frappe.db.escape(ctype), frappe.db.escape(ctype.lower().replace(' ','_')), '%s'), order by name""".format(fields=fields, fieldname=fieldname, doctype=doctype),
args['parent'], as_dict=1) args['parent'], as_dict=1)
if ctype == 'Account': if ctype == 'Account':
@ -48,7 +50,7 @@ def get_children():
for each in acc: for each in acc:
each["company_currency"] = company_currency each["company_currency"] = company_currency
each["balance"] = flt(get_balance_on(each.get("value"), in_account_currency=False)) each["balance"] = flt(get_balance_on(each.get("value"), in_account_currency=False))
if each.account_currency != company_currency: if each.account_currency != company_currency:
each["balance_in_account_currency"] = flt(get_balance_on(each.get("value"))) each["balance_in_account_currency"] = flt(get_balance_on(each.get("value")))

View File

@ -155,7 +155,7 @@ erpnext.SalesChart = Class.extend({
if(node.expanded) { if(node.expanded) {
node.toggle_node(); node.toggle_node();
} }
node.reload(); node.reload_parent();
} }
} }
}); });