Re-execute uae vat patch (#12230)
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index e8f3997..5976915 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -478,7 +478,7 @@
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 f88c32f..aa27d61 100644
--- a/erpnext/regional/united_arab_emirates/setup.py
+++ b/erpnext/regional/united_arab_emirates/setup.py
@@ -56,8 +56,11 @@
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 @@
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)