From 290847df4655dc32f773eef0da7cc01a7ed36668 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Sun, 2 Jun 2019 19:35:18 +0530 Subject: [PATCH] fix: Fixes in accounting doctype dashboards --- .../accounts/doctype/bank/bank_dashboard.py | 1 - .../bank_account/bank_account_dashboard.py | 2 -- .../doctype/c_form/c_form_dashboard.py | 18 ------------- .../finance_book/finance_book_dashboard.py | 2 -- .../item_tax_template_dashboard.py | 1 - .../journal_entry/journal_entry_dashboard.py | 26 ------------------- .../loyalty_program_dashboard.py | 7 +---- .../monthly_distribution_dashboard.py | 1 - .../payment_gateway_account_dashboard.py | 2 -- .../payment_term/payment_term_dashboard.py | 9 ++++--- .../pos_profile/pos_profile_dashboard.py | 7 +---- ...se_taxes_and_charges_template_dashboard.py | 8 ++---- ...es_taxes_and_charges_template_dashboard.py | 6 +---- .../shareholder/shareholder_dashboard.py | 1 - .../subscription_plan_dashboard.py | 8 ++---- .../tax_withholding_category_dashboard.py | 1 - 16 files changed, 13 insertions(+), 87 deletions(-) delete mode 100644 erpnext/accounts/doctype/c_form/c_form_dashboard.py delete mode 100644 erpnext/accounts/doctype/journal_entry/journal_entry_dashboard.py diff --git a/erpnext/accounts/doctype/bank/bank_dashboard.py b/erpnext/accounts/doctype/bank/bank_dashboard.py index dcc6669043..230613c5b3 100644 --- a/erpnext/accounts/doctype/bank/bank_dashboard.py +++ b/erpnext/accounts/doctype/bank/bank_dashboard.py @@ -12,7 +12,6 @@ def get_data(): 'items': ['Bank Account', 'Bank Statement Transaction Entry', 'Bank Guarantee'] }, { - 'label': _('Payments'), 'items': ['Payment Order'] } ] diff --git a/erpnext/accounts/doctype/bank_account/bank_account_dashboard.py b/erpnext/accounts/doctype/bank_account/bank_account_dashboard.py index 8339cb5937..3d149eb334 100644 --- a/erpnext/accounts/doctype/bank_account/bank_account_dashboard.py +++ b/erpnext/accounts/doctype/bank_account/bank_account_dashboard.py @@ -21,11 +21,9 @@ def get_data(): 'items': ['Customer', 'Supplier'] }, { - 'label': _('Banking'), 'items': ['Bank Guarantee'] }, { - 'label': _('Journal Entries'), 'items': ['Journal Entry'] } ] diff --git a/erpnext/accounts/doctype/c_form/c_form_dashboard.py b/erpnext/accounts/doctype/c_form/c_form_dashboard.py deleted file mode 100644 index 97af2bc5b6..0000000000 --- a/erpnext/accounts/doctype/c_form/c_form_dashboard.py +++ /dev/null @@ -1,18 +0,0 @@ -from __future__ import unicode_literals - -from frappe import _ - - -def get_data(): - return { - 'fieldname': 'c_form', - 'non_standard_fieldnames': { - 'Sales Invoice': 'c_form_no' - }, - 'transactions': [ - { - 'label': _('Sales Invoice'), - 'items': ['Sales Invoice'] - } - ] - } diff --git a/erpnext/accounts/doctype/finance_book/finance_book_dashboard.py b/erpnext/accounts/doctype/finance_book/finance_book_dashboard.py index 4d3b42e911..c2ebea6e8f 100644 --- a/erpnext/accounts/doctype/finance_book/finance_book_dashboard.py +++ b/erpnext/accounts/doctype/finance_book/finance_book_dashboard.py @@ -16,11 +16,9 @@ def get_data(): 'items': ['Asset', 'Asset Value Adjustment'] }, { - 'label': _('Companies'), 'items': ['Company'] }, { - 'label': _('Journal Entries'), 'items': ['Journal Entry'] } ] diff --git a/erpnext/accounts/doctype/item_tax_template/item_tax_template_dashboard.py b/erpnext/accounts/doctype/item_tax_template/item_tax_template_dashboard.py index 674ad83a58..acc308e0e6 100644 --- a/erpnext/accounts/doctype/item_tax_template/item_tax_template_dashboard.py +++ b/erpnext/accounts/doctype/item_tax_template/item_tax_template_dashboard.py @@ -20,7 +20,6 @@ def get_data(): 'items': ['Purchase Invoice', 'Purchase Order', 'Purchase Receipt'] }, { - 'label': _('Item Tax'), 'items': ['Item'] } ] diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry_dashboard.py b/erpnext/accounts/doctype/journal_entry/journal_entry_dashboard.py deleted file mode 100644 index ba2641940a..0000000000 --- a/erpnext/accounts/doctype/journal_entry/journal_entry_dashboard.py +++ /dev/null @@ -1,26 +0,0 @@ -from __future__ import unicode_literals - -from frappe import _ - - -def get_data(): - return { - 'fieldname': 'journal_entry', - 'non_standard_fieldnames': { - 'Stock Entry': 'credit_note', - }, - 'transactions': [ - { - 'label': _('Assets'), - 'items': ['Asset', 'Asset Value Adjustment'] - }, - { - 'label': _('Stock'), - 'items': ['Stock Entry'] - }, - { - 'label': _('Salaries'), - 'items': ['Salary Slip'] - } - ] - } diff --git a/erpnext/accounts/doctype/loyalty_program/loyalty_program_dashboard.py b/erpnext/accounts/doctype/loyalty_program/loyalty_program_dashboard.py index 3fab11bf85..189004f5ec 100644 --- a/erpnext/accounts/doctype/loyalty_program/loyalty_program_dashboard.py +++ b/erpnext/accounts/doctype/loyalty_program/loyalty_program_dashboard.py @@ -8,12 +8,7 @@ def get_data(): 'fieldname': 'loyalty_program', 'transactions': [ { - 'label': _('Sales Invoice'), - 'items': ['Sales Invoice'] - }, - { - 'label': _('Customers'), - 'items': ['Customer'] + 'items': ['Sales Invoice', 'Customer'] } ] } diff --git a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution_dashboard.py b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution_dashboard.py index d307fd5732..a679499815 100644 --- a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution_dashboard.py +++ b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution_dashboard.py @@ -17,7 +17,6 @@ def get_data(): 'items': ['Sales Person', 'Territory', 'Sales Partner'] }, { - 'label': _('References'), 'items': ['Budget'] } ] diff --git a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account_dashboard.py b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account_dashboard.py index 210593e550..08982296f3 100644 --- a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account_dashboard.py +++ b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account_dashboard.py @@ -11,11 +11,9 @@ def get_data(): }, 'transactions': [ { - 'label': _('Payments'), 'items': ['Payment Request'] }, { - 'label': _('Subscription Plans'), 'items': ['Subscription Plan'] } ] diff --git a/erpnext/accounts/doctype/payment_term/payment_term_dashboard.py b/erpnext/accounts/doctype/payment_term/payment_term_dashboard.py index fafbb71976..d146fcdee3 100644 --- a/erpnext/accounts/doctype/payment_term/payment_term_dashboard.py +++ b/erpnext/accounts/doctype/payment_term/payment_term_dashboard.py @@ -8,11 +8,14 @@ def get_data(): 'fieldname': 'payment_term', 'transactions': [ { - 'label': _('Invoices and Orders'), - 'items': ['Sales Invoice', 'Sales Order', 'Purchase Invoice', 'Purchase Order', 'Quotation'] + 'label': _('Sales'), + 'items': ['Sales Invoice', 'Sales Order', 'Quotation'] + }, + { + 'label': _('Purchase'), + 'items': ['Purchase Invoice', 'Purchase Order'] }, { - 'label': _('Payment Terms Template'), 'items': ['Payment Terms Template'] } ] diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile_dashboard.py b/erpnext/accounts/doctype/pos_profile/pos_profile_dashboard.py index c0a3636cc6..e28bf73075 100644 --- a/erpnext/accounts/doctype/pos_profile/pos_profile_dashboard.py +++ b/erpnext/accounts/doctype/pos_profile/pos_profile_dashboard.py @@ -8,12 +8,7 @@ def get_data(): 'fieldname': 'pos_profile', 'transactions': [ { - 'label': _('Sales Invoices'), - 'items': ['Sales Invoice'] - }, - { - 'label': _('POS Closing Vouchers'), - 'items': ['POS Closing Voucher'] + 'items': ['Sales Invoice', 'POS Closing Voucher'] } ] } diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py index 0953a98fa2..11c220bf2d 100644 --- a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py +++ b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py @@ -15,12 +15,8 @@ def get_data(): 'items': ['Purchase Invoice', 'Purchase Order', 'Purchase Receipt'] }, { - 'label': _('Supplier Quotations'), - 'items': ['Supplier Quotation'] - }, - { - 'label': _('Tax Rules'), - 'items': ['Tax Rule'] + 'label': _('References'), + 'items': ['Supplier Quotation', 'Tax Rule'] } ] } \ No newline at end of file diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py index 9deb5b6b9e..0e9c808608 100644 --- a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py +++ b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py @@ -18,11 +18,7 @@ def get_data(): }, { 'label': _('References'), - 'items': ['POS Profile', 'Subscription', 'Restaurant'] - }, - { - 'label': _('Tax Rules'), - 'items': ['Tax Rule'] + 'items': ['POS Profile', 'Subscription', 'Restaurant', 'Tax Rule'] } ] } \ No newline at end of file diff --git a/erpnext/accounts/doctype/shareholder/shareholder_dashboard.py b/erpnext/accounts/doctype/shareholder/shareholder_dashboard.py index 1a64c94d22..3b77fd51b5 100644 --- a/erpnext/accounts/doctype/shareholder/shareholder_dashboard.py +++ b/erpnext/accounts/doctype/shareholder/shareholder_dashboard.py @@ -11,7 +11,6 @@ def get_data(): }, 'transactions': [ { - 'label': _('Share Transfers'), 'items': ['Share Transfer'] } ] diff --git a/erpnext/accounts/doctype/subscription_plan/subscription_plan_dashboard.py b/erpnext/accounts/doctype/subscription_plan/subscription_plan_dashboard.py index b118e582a2..df3023335a 100644 --- a/erpnext/accounts/doctype/subscription_plan/subscription_plan_dashboard.py +++ b/erpnext/accounts/doctype/subscription_plan/subscription_plan_dashboard.py @@ -12,12 +12,8 @@ def get_data(): }, 'transactions': [ { - 'label': _('Payments'), - 'items': ['Payment Request'] - }, - { - 'label': _('Subscriptions'), - 'items': ['Subscription'] + 'label': _('References'), + 'items': ['Payment Request', 'Subscription'] } ] } diff --git a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category_dashboard.py b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category_dashboard.py index 3c8ae98d3d..d51ba65b13 100644 --- a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category_dashboard.py +++ b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category_dashboard.py @@ -8,7 +8,6 @@ def get_data(): 'fieldname': 'tax_withholding_category', 'transactions': [ { - 'label': _('Suppliers'), 'items': ['Supplier'] } ]