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

Merge pull request #25020 from prssanna/help-links-fix-v13

Browse Source
This commit is contained in:
Prssanna Desai 2021-03-30 19:29:30 +05:30 committed by GitHub
commit 7e442c74b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 940 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/patches.txt
View File

@ -720,7 +720,7 @@ erpnext.patches.v13_0.delete_report_requested_items_to_order
erpnext.patches.v12_0.update_item_tax_template_company erpnext.patches.v12_0.update_item_tax_template_company
erpnext.patches.v13_0.move_branch_code_to_bank_account erpnext.patches.v13_0.move_branch_code_to_bank_account
erpnext.patches.v13_0.healthcare_lab_module_rename_doctypes erpnext.patches.v13_0.healthcare_lab_module_rename_doctypes
erpnext.patches.v13_0.add_standard_navbar_items #4 erpnext.patches.v13_0.add_standard_navbar_items #2021-03-24
erpnext.patches.v13_0.stock_entry_enhancements erpnext.patches.v13_0.stock_entry_enhancements
erpnext.patches.v12_0.update_state_code_for_daman_and_diu erpnext.patches.v12_0.update_state_code_for_daman_and_diu
erpnext.patches.v12_0.rename_lost_reason_detail erpnext.patches.v12_0.rename_lost_reason_detail

1283
erpnext/public/js/help_links.js
View File

File diff suppressed because it is too large Load Diff

8
erpnext/setup/install.py
View File

@ -142,13 +142,15 @@ def add_standard_navbar_items():
} }
] ]
current_nabvar_items = navbar_settings.help_dropdown current_navbar_items = navbar_settings.help_dropdown
navbar_settings.set('help_dropdown', []) navbar_settings.set('help_dropdown', [])
for item in erpnext_navbar_items: for item in erpnext_navbar_items:
navbar_settings.append('help_dropdown', item) current_labels = [item.get('item_label') for item in current_navbar_items]
if not item.get('item_label') in current_labels:
navbar_settings.append('help_dropdown', item)
for item in current_nabvar_items: for item in current_navbar_items:
navbar_settings.append('help_dropdown', { navbar_settings.append('help_dropdown', {
'item_label': item.item_label, 'item_label': item.item_label,
'item_type': item.item_type, 'item_type': item.item_type,