From 32eb9a78930d2771f68ee25ad1930bda5929545f Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Date: Mon, 19 Oct 2020 17:58:50 +0530 Subject: [PATCH] feat(UAE VAT 201): claimable to recoverable --- erpnext/regional/united_arab_emirates/setup.py | 10 +++++----- erpnext/regional/united_arab_emirates/utils.py | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/erpnext/regional/united_arab_emirates/setup.py b/erpnext/regional/united_arab_emirates/setup.py index a0e7620919..efa39bd3c5 100644 --- a/erpnext/regional/united_arab_emirates/setup.py +++ b/erpnext/regional/united_arab_emirates/setup.py @@ -38,13 +38,13 @@ def make_custom_fields(): dict(fieldname='supplier_name_in_arabic', label='Supplier Name in Arabic', fieldtype='Read Only', insert_after='supplier_name', fetch_from='supplier.supplier_name_in_arabic', print_hide=1), - dict(fieldname='claimable_standard_rated_expenses', label='Claimable Standard Rated Expenses (AED)', + dict(fieldname='recoverable_standard_rated_expenses', label='Recoverable Standard Rated Expenses (AED)', insert_after='permit_no', fieldtype='Currency', print_hide=1, default='0', depends_on="eval:doc.reverse_charge=='N'",), dict(fieldname='reverse_charge', label='Reverse Charge Applicable', - fieldtype='Select', insert_after='claimable_standard_rated_expenses', print_hide=1, + fieldtype='Select', insert_after='recoverable_standard_rated_expenses', print_hide=1, options='Y\nN', default='N'), - dict(fieldname='claimable_reverse_charge', label='Claimable Reverse Charge (Percentage)', + dict(fieldname='recoverable_reverse_charge', label='Recoverable Reverse Charge (Percentage)', insert_after='reverse_charge', fieldtype='Percent', print_hide=1, depends_on="eval:doc.reverse_charge=='Y'", default='100.000'), ] @@ -57,7 +57,7 @@ def make_custom_fields(): fieldtype='Read Only', insert_after='customer_name', fetch_from='customer.customer_name_in_arabic', print_hide=1), dict(fieldname='emirate', label='Emirate', insert_after='customer_address', - fieldtype='Read Only', fetch_from='customer_address.emirates'), + fieldtype='Read Only', fetch_from='customer_address.emirate'), dict(fieldname='tourist_tax_return', label='Tax Refund provided to Tourists (AED)', insert_after='permit_no', fieldtype='Currency', print_hide=1, default='0'), ] @@ -102,7 +102,7 @@ def make_custom_fields(): fieldtype='Data', insert_after='supplier_name'), ], 'Address': [ - dict(fieldname='emirates', label='Emirates', fieldtype='Select', insert_after='state', + dict(fieldname='emirate', label='Emirate', fieldtype='Select', insert_after='state', options='Abu Dhabi\nAjman\nDubai\nFujairah\nRas Al Khaimah\nSharjah\nUmm Al Quwain') ], 'Purchase Invoice': purchase_invoice_fields + invoice_fields, diff --git a/erpnext/regional/united_arab_emirates/utils.py b/erpnext/regional/united_arab_emirates/utils.py index 847bda8271..7edc2b6720 100644 --- a/erpnext/regional/united_arab_emirates/utils.py +++ b/erpnext/regional/united_arab_emirates/utils.py @@ -147,5 +147,5 @@ def validate_returns(doc, method): country = frappe.get_cached_value('Company', doc.company, 'country') if country != 'United Arab Emirates': return - if doc.reverse_charge == 'Y' and flt(doc.claimable_standard_rated_expenses) != 0: - frappe.throw(_("Claimable Standard Rated expenses should not be set when Reverse Charge Applicable is Y")) \ No newline at end of file + if doc.reverse_charge == 'Y' and flt(doc.recoverable_standard_rated_expenses) != 0: + frappe.throw(_("Recoverable Standard Rated expenses should not be set when Reverse Charge Applicable is Y")) \ No newline at end of file