diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 3341e10a43..ce156ec799 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '6.12.11' +__version__ = '6.13.0' diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js index 403c1cea02..c60713a3ba 100644 --- a/erpnext/accounts/page/accounts_browser/accounts_browser.js +++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js @@ -146,7 +146,7 @@ erpnext.AccountsChart = Class.extend({ label: __("Rename"), click: function(node) { frappe.model.rename_doc(me.ctype, node.label, function(new_name) { - node.reload(); + node.reload_parent(); }); }, btnClass: "hidden-xs" @@ -166,8 +166,8 @@ erpnext.AccountsChart = Class.extend({ var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr"; if (me.ctype == 'Account' && node.data && node.data.balance!==undefined) { $('' - + (node.data.balance_in_account_currency ? - (format_currency(Math.abs(node.data.balance_in_account_currency), + + (node.data.balance_in_account_currency ? + (format_currency(Math.abs(node.data.balance_in_account_currency), node.data.account_currency) + " / ") : "") + format_currency(Math.abs(node.data.balance), node.data.company_currency) + " " + dr_or_cr @@ -219,7 +219,7 @@ erpnext.AccountsChart = Class.extend({ description: __("Optional. This setting will be used to filter in various transactions.") }, {fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate')}, {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.")} ] }) @@ -243,7 +243,7 @@ erpnext.AccountsChart = Class.extend({ $(fd.tax_rate.wrapper).toggle(fd.account_type.get_value()==='Tax'); $(fd.warehouse.wrapper).toggle(fd.account_type.get_value()==='Warehouse'); }) - + // root type if root $(fd.root_type.wrapper).toggle(node.root); @@ -261,7 +261,7 @@ erpnext.AccountsChart = Class.extend({ var node = me.tree.get_selected_node(); v.parent_account = node.label; v.company = me.company; - + if(node.root) { v.is_root = true; v.parent_account = null; @@ -278,7 +278,7 @@ erpnext.AccountsChart = Class.extend({ if(node.expanded) { node.toggle_node(); } - node.reload(); + node.load(); } }); }); @@ -324,7 +324,7 @@ erpnext.AccountsChart = Class.extend({ if(node.expanded) { node.toggle_node(); } - node.reload(); + node.load(); } }); }); diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.py b/erpnext/accounts/page/accounts_browser/accounts_browser.py index 891a05de7b..d96b21355f 100644 --- a/erpnext/accounts/page/accounts_browser/accounts_browser.py +++ b/erpnext/accounts/page/accounts_browser/accounts_browser.py @@ -18,29 +18,31 @@ def get_companies(): def get_children(): args = frappe.local.form_dict ctype, company = args['ctype'], args['comp'] + fieldname = frappe.db.escape(ctype.lower().replace(' ','_')) + doctype = frappe.db.escape(ctype) # root 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 - name as value, is_group as expandable %s - from `tab%s` - where ifnull(`parent_%s`,'') = '' + name as value, is_group as expandable {fields} + from `tab{doctype}` + where ifnull(`parent_{fieldname}`,'') = '' 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) if args["parent"]=="Accounts": sort_root_accounts(acc) else: # other - select_cond = ", account_currency" if ctype=="Account" else "" + fields = ", account_currency" if ctype=="Account" else "" acc = frappe.db.sql("""select - name as value, is_group as expandable %s - from `tab%s` - where ifnull(`parent_%s`,'') = %s + name as value, is_group as expandable, parent_{fieldname} as parent {fields} + from `tab{doctype}` + where ifnull(`parent_{fieldname}`,'') = %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), args['parent'], as_dict=1) if ctype == 'Account': @@ -48,7 +50,7 @@ def get_children(): for each in acc: each["company_currency"] = company_currency each["balance"] = flt(get_balance_on(each.get("value"), in_account_currency=False)) - + if each.account_currency != company_currency: each["balance_in_account_currency"] = flt(get_balance_on(each.get("value"))) diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py index bd0bfb01ae..c53ed99857 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -178,7 +178,8 @@ def get_data_with_opening_closing(filters, account_details, gl_entries): else: for gl in gl_entries: - if gl.posting_date >= getdate(filters.from_date) and gl.posting_date <= getdate(filters.to_date): + if gl.posting_date >= getdate(filters.from_date) and gl.posting_date <= getdate(filters.to_date) \ + and gl.is_opening == "No": data.append(gl) diff --git a/erpnext/change_log/v6/v6_13.md b/erpnext/change_log/v6/v6_13.md new file mode 100644 index 0000000000..1f0a5684d1 --- /dev/null +++ b/erpnext/change_log/v6/v6_13.md @@ -0,0 +1 @@ +- [ERPNext Manual in German](http://frappe.github.io/erpnext/user/manual/de/) contributed by [CWT Connector & Wire Technology GmbH](http://www.cwt-assembly.com/) diff --git a/erpnext/docs/current/index.html b/erpnext/docs/current/index.html index 2eec67ee46..6d00ab1bdb 100644 --- a/erpnext/docs/current/index.html +++ b/erpnext/docs/current/index.html @@ -35,7 +35,7 @@ Version - 6.12.8 + 6.12.11 diff --git a/erpnext/docs/current/models/accounts/account.html b/erpnext/docs/current/models/accounts/account.html index 052e7b6409..e70c6c2cf7 100644 --- a/erpnext/docs/current/models/accounts/account.html +++ b/erpnext/docs/current/models/accounts/account.html @@ -945,6 +945,10 @@ Credit + + + +
  • diff --git a/erpnext/docs/current/models/hr/department.html b/erpnext/docs/current/models/hr/department.html index 5705451067..4f0ffefde1 100644 --- a/erpnext/docs/current/models/hr/department.html +++ b/erpnext/docs/current/models/hr/department.html @@ -106,8 +106,6 @@