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

Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop

Browse Source
This commit is contained in:
marination
2021-11-16 16:06:07 +05:30
parent fd6f3c6b88 952fc87c99
commit f9929ed8a6
2194 changed files with 4243 additions and 11241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/setup/setup_wizard/data/country_wise_tax.json
View File

@@ -1195,7 +1195,7 @@
"*": {
"item_tax_templates": [
{
"title": "GST 9%",
"title": "GST 18%",
"taxes": [
{
"tax_type": {
@@ -2120,6 +2120,10 @@
"account_name": "VAT 15%",
"tax_rate": 15.00
},
"KSA VAT 5%": {
"account_name": "VAT 5%",
"tax_rate": 5.00
},
"KSA VAT Zero": {
"account_name": "VAT Zero",
"tax_rate": 0.00

2
erpnext/setup/setup_wizard/data/dashboard_charts.py
View File

@@ -1,5 +1,3 @@
from __future__ import unicode_literals
import json
import frappe

2
erpnext/setup/setup_wizard/data/industry_type.py
View File

@@ -1,5 +1,3 @@
from __future__ import unicode_literals
from frappe import _

1
erpnext/setup/setup_wizard/operations/company_setup.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
from frappe import _
from frappe.utils import cstr, getdate

1
erpnext/setup/setup_wizard/operations/default_website.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
from frappe import _

1
erpnext/setup/setup_wizard/operations/defaults_setup.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
from frappe import _
from frappe.utils import cstr, getdate

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

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import json
import os
@@ -202,7 +201,6 @@ def install(country=None):
{'doctype': "Party Type", "party_type": "Student", "account_type": "Receivable"},
{'doctype': "Party Type", "party_type": "Donor", "account_type": "Receivable"},
{'doctype': "Opportunity Type", "name": "Hub"},
{'doctype': "Opportunity Type", "name": _("Sales")},
{'doctype': "Opportunity Type", "name": _("Support")},
{'doctype': "Opportunity Type", "name": _("Maintenance")},

1
erpnext/setup/setup_wizard/operations/sample_data.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import json
import os

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

@@ -1,7 +1,6 @@
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import os
import json

1
erpnext/setup/setup_wizard/setup_wizard.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
from frappe import _

2
erpnext/setup/setup_wizard/utils.py
View File

@@ -1,5 +1,3 @@
from __future__ import unicode_literals
import json
import os