From c9ed09440c7abe04660e248a8768e172511ed26f Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 28 Dec 2017 18:42:22 +0530 Subject: [PATCH] Re-execute uae vat patch (#12230) --- erpnext/patches.txt | 2 +- .../regional/united_arab_emirates/setup.py | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index e8f3997f60..5976915ede 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -478,7 +478,7 @@ erpnext.patches.v9_2.rename_net_weight_in_item_master erpnext.patches.v9_2.delete_process_payroll erpnext.patches.v10_0.add_agriculture_domain erpnext.patches.v10_0.add_non_profit_domain -erpnext.patches.v10_0.setup_vat_for_uae_and_saudi_arabia #2017-12-27 +erpnext.patches.v10_0.setup_vat_for_uae_and_saudi_arabia #2017-12-28 erpnext.patches.v10_0.set_primary_contact_for_customer erpnext.patches.v10_0.copy_projects_renamed_fields erpnext.patches.v10_0.enabled_regional_print_format_based_on_country diff --git a/erpnext/regional/united_arab_emirates/setup.py b/erpnext/regional/united_arab_emirates/setup.py index f88c32fe9e..aa27d6159d 100644 --- a/erpnext/regional/united_arab_emirates/setup.py +++ b/erpnext/regional/united_arab_emirates/setup.py @@ -56,8 +56,11 @@ def make_custom_fields(): dict(fieldname='total_amount', label='Total Amount', fieldtype='Currency', insert_after='tax_amount', print_hide=1, hidden=1, read_only=1, options="currency"), + ] + + delivery_date_field = [ dict(fieldname='delivery_date', label='Delivery Date', - fieldtype='Date', insert_after='item_name', print_hide=1), + fieldtype='Date', insert_after='item_name', print_hide=1) ] custom_fields = { @@ -74,9 +77,19 @@ def make_custom_fields(): fieldtype='Data', insert_after='supplier_name'), ], 'Purchase Invoice': purchase_invoice_fields + invoice_fields, + 'Purchase Order': purchase_invoice_fields + invoice_fields, + 'Purchase Receipt': purchase_invoice_fields + invoice_fields, 'Sales Invoice': sales_invoice_fields + invoice_fields, - 'Sales Invoice Item': invoice_item_fields, - 'Purchase Invoice Item': invoice_item_fields + 'Sales Order': sales_invoice_fields + invoice_fields, + 'Delivery Note': sales_invoice_fields + invoice_fields, + 'Sales Invoice Item': invoice_item_fields + delivery_date_field, + 'Purchase Invoice Item': invoice_item_fields, + 'Sales Order Item': invoice_item_fields, + 'Delivery Note Item': invoice_item_fields, + 'Quotation Item': invoice_item_fields, + 'Purchase Order Item': invoice_item_fields, + 'Purchase Receipt Item': invoice_item_fields, + 'Supplier Quotation Item': invoice_item_fields, } create_custom_fields(custom_fields)