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

refactor: change uae vat settingplural

Browse Source
This commit is contained in:
hasnain2808 2020-09-30 21:51:00 +05:30
parent 3294f86b92
commit 10a3a338b6
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
erpnext/regional/doctype/uae_vat_setting/__init__.py → erpnext/regional/doctype/uae_vat_settings/__init__.py
View File

2
erpnext/regional/doctype/uae_vat_setting/test_uae_vat_setting.py → erpnext/regional/doctype/uae_vat_settings/test_uae_vat_settings.py
View File

@ -6,5 +6,5 @@ from __future__ import unicode_literals
# import frappe # import frappe
import unittest import unittest
class TestUAEVATSetting(unittest.TestCase): class TestUAEVATSettings(unittest.TestCase):
pass pass

2
erpnext/regional/doctype/uae_vat_setting/uae_vat_setting.js → erpnext/regional/doctype/uae_vat_settings/uae_vat_settings.js
View File

@ -1,7 +1,7 @@
// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors // Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt // For license information, please see license.txt
frappe.ui.form.on('UAE VAT Setting', { frappe.ui.form.on('UAE VAT Settings', {
// refresh: function(frm) { // refresh: function(frm) {
// } // }

10
erpnext/regional/doctype/uae_vat_setting/uae_vat_setting.json → erpnext/regional/doctype/uae_vat_settings/uae_vat_settings.json
View File

@ -7,7 +7,7 @@
"engine": "InnoDB", "engine": "InnoDB",
"field_order": [ "field_order": [
"company", "company",
"uae_vat_account" "uae_vat_accounts"
], ],
"fields": [ "fields": [
{ {
@ -20,19 +20,19 @@
"unique": 1 "unique": 1
}, },
{ {
"fieldname": "uae_vat_account", "fieldname": "uae_vat_accounts",
"fieldtype": "Table", "fieldtype": "Table",
"label": "UAE VAT Account", "label": "UAE VAT Accounts",
"options": "UAE VAT Account", "options": "UAE VAT Account",
"reqd": 1 "reqd": 1
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"modified": "2020-09-28 12:19:11.493138", "modified": "2020-09-30 20:08:18.764798",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Regional", "module": "Regional",
"name": "UAE VAT Setting", "name": "UAE VAT Settings",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {

2
erpnext/regional/doctype/uae_vat_setting/uae_vat_setting.py → erpnext/regional/doctype/uae_vat_settings/uae_vat_settings.py
View File

@ -6,5 +6,5 @@ from __future__ import unicode_literals
# import frappe # import frappe
from frappe.model.document import Document from frappe.model.document import Document
class UAEVATSetting(Document): class UAEVATSettings(Document):
pass pass

2
erpnext/regional/united_arab_emirates/setup.py
View File

@ -145,7 +145,7 @@ def add_custom_roles_for_reports():
def add_permissions(): def add_permissions():
"""Add Permissions for UAE VAT Settings and UAE VAT Account.""" """Add Permissions for UAE VAT Settings and UAE VAT Account."""
for doctype in ('UAE VAT Setting', 'UAE VAT Account'): for doctype in ('UAE VAT Settings', 'UAE VAT Account'):
add_permission(doctype, 'All', 0) add_permission(doctype, 'All', 0)
for role in ('Accounts Manager', 'Accounts User', 'System Manager'): for role in ('Accounts Manager', 'Accounts User', 'System Manager'):
add_permission(doctype, role, 0) add_permission(doctype, role, 0)

2
erpnext/regional/united_arab_emirates/utils.py
View File

@ -52,7 +52,7 @@ def get_tax_accounts(company):
) )
if not tax_accounts_list and not frappe.flags.in_test: if not tax_accounts_list and not frappe.flags.in_test:
frappe.throw(_(f'Please set Vat Accounts for Company: "{company}" in UAE VAT Setting')) frappe.throw(_(f'Please set Vat Accounts for Company: "{company}" in UAE VAT Settings'))
for d in tax_accounts_list: for d in tax_accounts_list:
for key, name in d.items(): for key, name in d.items():
tax_accounts_dict[name] = name tax_accounts_dict[name] = name