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

Merge branch 'develop' into fix/github-issue/33145

Browse Source
This commit is contained in:
Sagar Sharma 2022-12-13 14:00:51 +05:30 committed by GitHub
commit f9be137cf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
View File

@ -533,12 +533,13 @@ def get_accounts(root_type, companies):
], ],
filters={"company": company, "root_type": root_type}, filters={"company": company, "root_type": root_type},
): ):
if account.account_name not in added_accounts:
accounts.append(account)
if account.account_number: if account.account_number:
account_key = account.account_number + "-" + account.account_name account_key = account.account_number + "-" + account.account_name
else: else:
account_key = account.account_name account_key = account.account_name
if account_key not in added_accounts:
accounts.append(account)
added_accounts.append(account_key) added_accounts.append(account_key)
return accounts return accounts

5
erpnext/selling/doctype/sales_order/sales_order_dashboard.py
View File

@ -12,7 +12,10 @@ def get_data():
"Auto Repeat": "reference_document", "Auto Repeat": "reference_document",
"Maintenance Visit": "prevdoc_docname", "Maintenance Visit": "prevdoc_docname",
}, },
"internal_links": {"Quotation": ["items", "prevdoc_docname"]}, "internal_links": {
"Quotation": ["items", "prevdoc_docname"],
"Material Request": ["items", "material_request"],
},
"transactions": [ "transactions": [
{ {
"label": _("Fulfillment"), "label": _("Fulfillment"),