nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 13:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/frappe/erpnext into erpnext_setup_cleanup

Browse Source
This commit is contained in:
Deepesh Garg
2022-05-03 18:17:36 +05:30
parent 429361ce87 924cf7763e
commit 2e3e666784
580 changed files with 2111 additions and 28046 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/setup/setup_wizard/operations/install_fixtures.py
View File

@@ -368,7 +368,6 @@ def install(country=None):
{"doctype": "Party Type", "party_type": "Supplier", "account_type": "Payable"},
{"doctype": "Party Type", "party_type": "Employee", "account_type": "Payable"},
{"doctype": "Party Type", "party_type": "Shareholder", "account_type": "Payable"},
{"doctype": "Party Type", "party_type": "Student", "account_type": "Receivable"},
{"doctype": "Opportunity Type", "name": _("Sales")},
{"doctype": "Opportunity Type", "name": _("Support")},
{"doctype": "Opportunity Type", "name": _("Maintenance")},
@@ -389,13 +388,6 @@ def install(country=None):
{"doctype": "Offer Term", "offer_term": _("Incentives")},
{"doctype": "Print Heading", "print_heading": _("Credit Note")},
{"doctype": "Print Heading", "print_heading": _("Debit Note")},
# Assessment Group
{
"doctype": "Assessment Group",
"assessment_group_name": _("All Assessment Groups"),
"is_group": 1,
"parent_assessment_group": "",
},
# Share Management
{"doctype": "Share Type", "title": _("Equity")},
{"doctype": "Share Type", "title": _("Preference")},

2
erpnext/setup/setup_wizard/operations/taxes_setup.py
View File

@@ -116,7 +116,7 @@ def update_regional_tax_settings(country, company):
frappe.get_attr(module_name)(country, company)
except Exception as e:
# Log error and ignore if failed to setup regional tax settings
frappe.log_error()
frappe.log_error("Unable to setup regional tax settings")
pass