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

[minor] fixed conflict while merging with master

Browse Source
This commit is contained in:
Nabin Hait
2013-08-21 17:51:46 +05:30
parent f68d563a68 bbc2d11d10
commit 11bd44e447
44 changed files with 167 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
accounts/page/general_ledger/general_ledger.js
View File

@@ -141,13 +141,13 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({
toggle_group_by_checks: function() {
this.make_account_by_name();
this.filter_inputs.group_by_ledger
.parent().toggle(!!(this.account_by_name[this.account]
&& this.account_by_name[this.account].group_or_ledger==="Group"));
this.filter_inputs.group_by_voucher
.parent().toggle(!!(this.account_by_name[this.account]
&& this.account_by_name[this.account].group_or_ledger==="Ledger"));
// this.filter_inputs.group_by_ledger
// .parent().toggle(!!(this.account_by_name[this.account]
// && this.account_by_name[this.account].group_or_ledger==="Group"));
//
// this.filter_inputs.group_by_voucher
// .parent().toggle(!!(this.account_by_name[this.account]
// && this.account_by_name[this.account].group_or_ledger==="Ledger"));
},
prepare_data: function() {
var me = this;