nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-04 14:08:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: allow group accounts

Browse Source
This commit is contained in:
Dany Robert
2021-12-17 13:06:30 +00:00
parent 75de5be53e
commit b3a3367d1d
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/ledger_merge/ledger_merge.js
View File

@@ -24,7 +24,6 @@ frappe.ui.form.on('Ledger Merge', {
if (!doc.root_type) frappe.throw(__('Please set Root Type')); if (!doc.root_type) frappe.throw(__('Please set Root Type'));
return { return {
filters: { filters: {
is_group: 0,
root_type: doc.root_type, root_type: doc.root_type,
company: doc.company company: doc.company
} }
@@ -41,7 +40,7 @@ frappe.ui.form.on('Ledger Merge', {
}); });
return { return {
filters: { filters: {
is_group: 0, is_group: doc.is_group,
root_type: doc.root_type, root_type: doc.root_type,
name: ["not in", acc], name: ["not in", acc],
company: doc.company company: doc.company

12
erpnext/accounts/doctype/ledger_merge/ledger_merge.json
View File

@@ -13,6 +13,7 @@
"column_break_3", "column_break_3",
"company", "company",
"status", "status",
"is_group",
"section_break_5", "section_break_5",
"merge_accounts" "merge_accounts"
], ],
@@ -79,11 +80,20 @@
"label": "Account Name", "label": "Account Name",
"read_only": 1, "read_only": 1,
"reqd": 1 "reqd": 1
},
{
"default": "0",
"depends_on": "account",
"fetch_from": "account.is_group",
"fieldname": "is_group",
"fieldtype": "Check",
"label": "Is Group",
"read_only": 1
} }
], ],
"hide_toolbar": 1, "hide_toolbar": 1,
"links": [], "links": [],
"modified": "2021-12-10 15:28:34.520588", "modified": "2021-12-12 21:34:55.155146",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Ledger Merge", "name": "Ledger Merge",

9
erpnext/accounts/doctype/ledger_merge/ledger_merge.py
View File

@@ -46,7 +46,13 @@ def start_merge(docname):
for row in ledger_merge.merge_accounts: for row in ledger_merge.merge_accounts:
if not row.merged: if not row.merged:
try: try:
merge_account(row.account, ledger_merge.account, 0, ledger_merge.root_type, ledger_merge.company) merge_account(
row.account,
ledger_merge.account,
ledger_merge.is_group,
ledger_merge.root_type,
ledger_merge.company
)
row.db_set('merged', 1) row.db_set('merged', 1)
frappe.db.commit() frappe.db.commit()
successful_merges += 1 successful_merges += 1
@@ -58,7 +64,6 @@ def start_merge(docname):
) )
except Exception: except Exception:
frappe.db.rollback() frappe.db.rollback()
ledger_merge.db_set("status", "Error")
frappe.log_error(title=ledger_merge.name) frappe.log_error(title=ledger_merge.name)
finally: finally:
if successful_merges == total: if successful_merges == total: