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

chore(UAE VAT 201): Rename emirate to vat emirate

Browse Source
This commit is contained in:
Mohammad Hasnain 2020-10-28 10:28:25 +05:30
parent 5953acab8b
commit 81f2efd9b0
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/regional/report/uae_vat_201/test_uae_vat_201.py
View File

@ -190,7 +190,7 @@ def make_sales_invoices():
"description": "VAT 5% @ 5.0", "description": "VAT 5% @ 5.0",
"rate": 5.0 "rate": 5.0
}) })
si.emirate = 'Dubai' si.vat_emirate = 'Dubai'
si.submit() si.submit()
si = create_sales_invoice(company="_Test Company UAE VAT", si = create_sales_invoice(company="_Test Company UAE VAT",
@ -205,7 +205,7 @@ def make_sales_invoices():
item = "_Test UAE VAT Item", item = "_Test UAE VAT Item",
do_not_save=1 do_not_save=1
) )
si.emirate = 'Sharjah' si.vat_emirate = 'Sharjah'
si.append("taxes", { si.append("taxes", {
"charge_type": "On Net Total", "charge_type": "On Net Total",
"account_head": "VAT 5% - _TCUV", "account_head": "VAT 5% - _TCUV",
@ -230,7 +230,7 @@ def make_sales_invoices():
si.tourist_tax_return = 2 si.tourist_tax_return = 2
si.emirate = 'Dubai' si.vat_emirate = 'Dubai'
si.append("taxes", { si.append("taxes", {
"charge_type": "On Net Total", "charge_type": "On Net Total",
@ -253,7 +253,7 @@ def make_sales_invoices():
item = "_Test UAE VAT Zero Rated Item", item = "_Test UAE VAT Zero Rated Item",
do_not_save=1 do_not_save=1
) )
si.emirate = 'Sharjah' si.vat_emirate = 'Sharjah'
si.submit() si.submit()
si = create_sales_invoice(company="_Test Company UAE VAT", si = create_sales_invoice(company="_Test Company UAE VAT",
@ -268,7 +268,7 @@ def make_sales_invoices():
item = "_Test UAE VAT Exempt Item", item = "_Test UAE VAT Exempt Item",
do_not_save=1 do_not_save=1
) )
si.emirate = 'Sharjah' si.vat_emirate = 'Sharjah'
si.submit() si.submit()
def create_purchase_invoices(): def create_purchase_invoices():

4
erpnext/regional/report/uae_vat_201/uae_vat_201.py
View File

@ -147,9 +147,9 @@ def append_data(data, no, legend, amount, vat_amount):
def get_total_emiratewise(filters): def get_total_emiratewise(filters):
"""Returns Emiratewise Amount and Taxes.""" """Returns Emiratewise Amount and Taxes."""
return frappe.db.sql(f""" return frappe.db.sql(f"""
select emirate, sum(total), sum(total_taxes_and_charges) from `tabSales Invoice` select vat_emirate as emirate, sum(total), sum(total_taxes_and_charges) from `tabSales Invoice`
where docstatus = 1 {get_conditions(filters)} where docstatus = 1 {get_conditions(filters)}
group by `tabSales Invoice`.emirate; group by `tabSales Invoice`.vat_emirate;
""", filters) """, filters)
def get_emirates(): def get_emirates():

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

@ -55,10 +55,10 @@ def make_custom_fields():
dict(fieldname='customer_name_in_arabic', label='Customer Name in Arabic', dict(fieldname='customer_name_in_arabic', label='Customer Name in Arabic',
fieldtype='Read Only', insert_after='customer_name', fieldtype='Read Only', insert_after='customer_name',
fetch_from='customer.customer_name_in_arabic', print_hide=1), fetch_from='customer.customer_name_in_arabic', print_hide=1),
dict(fieldname='emirate', label='Emirate', insert_after='permit_no', fieldtype='Select', dict(fieldname='vat_emirate', label='VAT Emirate', insert_after='permit_no', fieldtype='Select',
options='\nAbu Dhabi\nAjman\nDubai\nFujairah\nRas Al Khaimah\nSharjah\nUmm Al Quwain'), options='\nAbu Dhabi\nAjman\nDubai\nFujairah\nRas Al Khaimah\nSharjah\nUmm Al Quwain'),
dict(fieldname='tourist_tax_return', label='Tax Refund provided to Tourists (AED)', dict(fieldname='tourist_tax_return', label='Tax Refund provided to Tourists (AED)',
insert_after='emirate', fieldtype='Currency', print_hide=1, default='0'), insert_after='vat_emirate', fieldtype='Currency', print_hide=1, default='0'),
] ]
invoice_item_fields = [ invoice_item_fields = [