nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-02 04:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Revert Changes

Browse Source
This commit is contained in:
Deepesh Garg
2021-06-26 23:49:32 +05:30
parent 0bfffddac4
commit 1e5482cedd
3 changed files with 81 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1218,37 +1218,43 @@
{
"tax_type": {
"account_name": "Input Tax SGST",
"tax_rate": 9.00
"tax_rate": 9.00,
"root_type": "Asset"
}
},
{
"tax_type": {
"account_name": "Input Tax CGST",
"tax_rate": 9.00
"tax_rate": 9.00,
"root_type": "Asset"
}
},
{
"tax_type": {
"account_name": "Input Tax IGST",
"tax_rate": 18.00
"tax_rate": 18.00,
"root_type": "Asset"
}
},
{
"tax_type": {
"account_name": "Input Tax SGST RCM",
"tax_rate": 9.00
"tax_rate": 9.00,
"root_type": "Asset"
}
},
{
"tax_type": {
"account_name": "Input Tax CGST RCM",
"tax_rate": 9.00
"tax_rate": 9.00,
"root_type": "Asset"
}
},
{
"tax_type": {
"account_name": "Input Tax IGST RCM",
"tax_rate": 18.00
"tax_rate": 18.00,
"root_type": "Asset"
}
}
]
@@ -1277,37 +1283,43 @@
{
"tax_type": {
"account_name": "Input Tax SGST",
"tax_rate": 2.5
"tax_rate": 2.5,
"root_type": "Asset"
}
},
{
"tax_type": {
"account_name": "Input Tax CGST",
"tax_rate": 2.5
"tax_rate": 2.5,
"root_type": "Asset"
}
},
{
"tax_type": {
"account_name": "Input Tax IGST",
"tax_rate": 5.0
"tax_rate": 5.0,
"root_type": "Asset"
}
},
{
"tax_type": {
"account_name": "Input Tax SGST RCM",
"tax_rate": 2.50
"tax_rate": 2.50,
"root_type": "Asset"
}
},
{
"tax_type": {
"account_name": "Input Tax CGST RCM",
"tax_rate": 2.50
"tax_rate": 2.50,
"root_type": "Asset"
}
},
{
"tax_type": {
"account_name": "Input Tax IGST RCM",
"tax_rate": 5.00
"tax_rate": 5.00,
"root_type": "Asset"
}
}
]
@@ -1336,37 +1348,43 @@
{
"tax_type": {
"account_name": "Input Tax SGST",
"tax_rate": 6.0
"tax_rate": 6.0,
"root_type": "Asset"
}
},
{
"tax_type": {
"account_name": "Input Tax CGST",
"tax_rate": 6.0
"tax_rate": 6.0,
"root_type": "Asset"
}
},
{
"tax_type": {
"account_name": "Input Tax IGST",
"tax_rate": 12.0
"tax_rate": 12.0,
"root_type": "Asset"
}
},
{
"tax_type": {
"account_name": "Input Tax SGST RCM",
"tax_rate": 6.00
"tax_rate": 6.00,
"root_type": "Asset"
}
},
{
"tax_type": {
"account_name": "Input Tax CGST RCM",
"tax_rate": 6.00
"tax_rate": 6.00,
"root_type": "Asset"
}
},
{
"tax_type": {
"account_name": "Input Tax IGST RCM",
"tax_rate": 12.00
"tax_rate": 12.00,
"root_type": "Asset"
}
}
]
@@ -1395,37 +1413,43 @@
{
"tax_type": {
"account_name": "Input Tax SGST",
"tax_rate": 14.0
"tax_rate": 14.0,
"root_type": "Asset"
}
},
{
"tax_type": {
"account_name": "Input Tax CGST",
"tax_rate": 14.0
"tax_rate": 14.0,
"root_type": "Asset"
}
},
{
"tax_type": {
"account_name": "Input Tax IGST",
"tax_rate": 28.0
"tax_rate": 28.0,
"root_type": "Asset"
}
},
{
"tax_type": {
"account_name": "Input Tax SGST RCM",
"tax_rate": 14.00
"tax_rate": 14.00,
"root_type": "Asset"
}
},
{
"tax_type": {
"account_name": "Input Tax CGST RCM",
"tax_rate": 14.00
"tax_rate": 14.00,
"root_type": "Asset"
}
},
{
"tax_type": {
"account_name": "Input Tax IGST RCM",
"tax_rate": 28.00
"tax_rate": 28.00,
"root_type": "Asset"
}
}
]

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

@@ -203,16 +203,15 @@ def get_or_create_account(company_name, account):
existing_accounts = frappe.get_list('Account',
filters={
'account_name': account.get('account_name'),
'account_number': account.get('account_number', ''),
'company': company_name
'company': company_name,
'root_type': root_type
},
or_filters={
'company': company_name,
'root_type': root_type,
'is_group': 0
}
)
'account_name': account.get('account_name'),
'account_number': account.get('account_number')
})
print(company_name, account, existing_accounts)
if existing_accounts:
return frappe.get_doc('Account', existing_accounts[0].name)