Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5331 from nabinhait/multi-fix-55

Browse Source 
Multiple fixes
This commit is contained in:
Nabin Hait 2016-05-12 12:27:42 +05:30
commit 825070e504
8 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/accounts/page/accounts_browser/accounts_browser.js
View File

@ -232,7 +232,7 @@ erpnext.AccountsChart = Class.extend({
$(fd.tax_rate.wrapper).toggle(false);
$(fd.warehouse.wrapper).toggle(false);
} else {
$(fd.account_type.wrapper).toggle(true);
$(fd.account_type.wrapper).toggle(node.root ? false : true);
fd.account_type.$input.trigger("change");
}
});
@ -243,9 +243,6 @@ erpnext.AccountsChart = Class.extend({
$(fd.warehouse.wrapper).toggle(fd.account_type.get_value()==='Warehouse');
})
// root type if root
$(fd.root_type.wrapper).toggle(node.root);
// create
d.set_primary_action(__("Create New"), function() {
var btn = this;
@ -262,10 +259,10 @@ erpnext.AccountsChart = Class.extend({
v.company = me.company;
if(node.root) {
v.is_root = true;
v.is_root = 1;
v.parent_account = null;
} else {
v.is_root = false;
v.is_root = 0;
v.root_type = null;
}
@ -289,6 +286,11 @@ erpnext.AccountsChart = Class.extend({
}
$(fd.is_group.input).prop("checked", false).change();
// In case of root, show root type and hide account_type, is_group
$(fd.root_type.wrapper).toggle(node.root);
$(fd.is_group.wrapper).toggle(!node.root);
d.show();
},

2
erpnext/accounts/report/accounts_payable/accounts_payable.html
View File

@ -1 +1 @@
{% include "accounts/report/accounts_receivable/accounts_receivable.html" %}
{% include "erpnext/accounts/report/accounts_receivable/accounts_receivable.html" %}

2
erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.html
View File

@ -1 +1 @@
{% include "accounts/report/accounts_receivable/accounts_receivable.html" %}
{% include "erpnext/accounts/report/accounts_receivable/accounts_receivable.html" %}

2
erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.html
View File

@ -1 +1 @@
{% include "accounts/report/accounts_receivable/accounts_receivable.html" %}
{% include "erpnext/accounts/report/accounts_receivable/accounts_receivable.html" %}

2
erpnext/accounts/report/balance_sheet/balance_sheet.html
View File

@ -1 +1 @@
{% include "accounts/report/financial_statements.html" %}
{% include "erpnext/accounts/report/financial_statements.html" %}

2
erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.html
View File

@ -1 +1 @@
{% include "accounts/report/financial_statements.html" %}
{% include "erpnext/accounts/report/financial_statements.html" %}

2
erpnext/accounts/report/trial_balance/trial_balance.html
View File

@ -1 +1 @@
{% include "accounts/report/financial_statements.html" %}
{% include "erpnext/accounts/report/financial_statements.html" %}

7
erpnext/accounts/utils.py
View File

@ -4,7 +4,7 @@
from __future__ import unicode_literals
import frappe
from frappe.utils import nowdate, cstr, flt, now, getdate, add_months
from frappe.utils import nowdate, cstr, flt, cint, now, getdate, add_months
from frappe import throw, _
from frappe.utils import formatdate
import frappe.desk.reportview
@ -129,12 +129,13 @@ def add_ac(args=None):
if not args:
args = frappe.local.form_dict
args.pop("cmd")
ac = frappe.new_doc("Account")
ac.update(args)
ac.old_parent = ""
ac.freeze_account = "No"
if ac.get("is_root"):
if cint(ac.get("is_root")):
ac.parent_account = None
ac.flags.ignore_mandatory = True
ac.insert()