Merge branch 'develop'
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 913b372..5ba4160 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
-__version__ = '8.3.2'
+__version__ = '8.3.3'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/patches/v8_1/allow_invoice_copy_to_edit_after_submit.py b/erpnext/patches/v8_1/allow_invoice_copy_to_edit_after_submit.py
new file mode 100644
index 0000000..1fb297f
--- /dev/null
+++ b/erpnext/patches/v8_1/allow_invoice_copy_to_edit_after_submit.py
@@ -0,0 +1,12 @@
+import frappe
+
+def execute():
+ inv_copy_options = "ORIGINAL FOR RECIPIENT\nDUPLICATE FOR TRANSPORTER\nDUPLICATE FOR SUPPLIER\nTRIPLICATE FOR SUPPLIER"
+
+ frappe.db.sql("""update `tabCustom Field` set allow_on_submit=1, options=%s
+ where fieldname='invoice_copy' and dt = 'Sales Invoice'
+ """, inv_copy_options)
+
+ frappe.db.sql("""update `tabCustom Field` set read_only=1
+ where fieldname='gst_state_number' and dt = 'Address'
+ """)
diff --git a/erpnext/regional/india/setup.py b/erpnext/regional/india/setup.py
index 0aefc7b..93aea0d 100644
--- a/erpnext/regional/india/setup.py
+++ b/erpnext/regional/india/setup.py
@@ -84,7 +84,7 @@
dict(fieldname='gst_state', label='GST State', fieldtype='Select',
options='\n'.join(states), insert_after='gstin'),
dict(fieldname='gst_state_number', label='GST State Number',
- fieldtype='Int', insert_after='gst_state'),
+ fieldtype='Int', insert_after='gst_state', read_only=1),
],
'Purchase Invoice': [
dict(fieldname='supplier_gstin', label='Supplier GSTIN',
@@ -103,7 +103,7 @@
options='company_address.gstin', print_hide=1),
dict(fieldname='invoice_copy', label='Invoice Copy',
fieldtype='Select', insert_after='project', print_hide=1, allow_on_submit=1,
- options='ORIGINAL FOR RECIPIENT\nDUPLICATE FOR TRANSPORTER\nTRIPLICATE FOR SUPPLIER')
+ options='ORIGINAL FOR RECIPIENT\nDUPLICATE FOR TRANSPORTER\nDUPLICATE FOR SUPPLIER\nTRIPLICATE FOR SUPPLIER')
],
'Item': [
dict(fieldname='gst_hsn_code', label='HSN/SAC',