diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 62d8a504fad..87131c3fdc7 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '11.1.74' +__version__ = '11.1.75' def get_default_company(user=None): '''Get default company for user''' diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json index 885f2c8926c..0775d8b3d35 100755 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -2454,7 +2454,7 @@ "columns": 0, "fetch_if_empty": 0, "fieldname": "other_charges_calculation", - "fieldtype": "Text", + "fieldtype": "Long Text", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -4903,7 +4903,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2019-04-22 12:45:49.728359", + "modified": "2020-04-16 19:04:18.599264", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice", diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 12ae9aae7b0..e959df13c0c 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -2544,7 +2544,7 @@ "columns": 0, "fetch_if_empty": 0, "fieldname": "other_charges_calculation", - "fieldtype": "Text", + "fieldtype": "Long Text", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -5816,7 +5816,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2019-04-22 12:45:41.109345", + "modified": "2020-04-16 19:05:00.498772", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice", diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index 0e145009efa..c48ba5f3afd 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -2176,7 +2176,7 @@ "columns": 0, "fetch_if_empty": 0, "fieldname": "other_charges_calculation", - "fieldtype": "Text", + "fieldtype": "Long Text", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -3948,7 +3948,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-06-24 20:55:03.466766", + "modified": "2020-04-16 18:54:54.840653", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order", diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json index 5738433a312..c70548397b9 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json @@ -1395,7 +1395,7 @@ "collapsible": 0, "columns": 0, "fieldname": "other_charges_calculation", - "fieldtype": "Text", + "fieldtype": "Long Text", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -2845,7 +2845,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2019-01-07 16:52:01.505553", + "modified": "2020-04-16 19:05:41.924303", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Quotation", diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json index 65fbe52d9a4..96a6c602ac7 100644 --- a/erpnext/selling/doctype/quotation/quotation.json +++ b/erpnext/selling/doctype/quotation/quotation.json @@ -1687,7 +1687,7 @@ "columns": 0, "fetch_if_empty": 0, "fieldname": "other_charges_calculation", - "fieldtype": "Text", + "fieldtype": "Long Text", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -3224,7 +3224,7 @@ "istable": 0, "max_attachments": 1, "menu_index": 0, - "modified": "2019-06-25 15:31:04.724730", + "modified": "2020-04-16 19:05:32.197858", "modified_by": "Administrator", "module": "Selling", "name": "Quotation", diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 3dba26238c2..d04c2ba7cc8 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -1981,7 +1981,7 @@ "columns": 0, "fetch_if_empty": 0, "fieldname": "other_charges_calculation", - "fieldtype": "Text", + "fieldtype": "Long Text", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -4204,7 +4204,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-04-05 03:44:46.037178", + "modified": "2020-04-16 19:05:14.867404", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json index 4e08a7a59f7..e65908e7b9e 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.json +++ b/erpnext/stock/doctype/delivery_note/delivery_note.json @@ -2156,7 +2156,7 @@ "collapsible": 0, "columns": 0, "fieldname": "other_charges_calculation", - "fieldtype": "Text", + "fieldtype": "Long Text", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -4296,7 +4296,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2019-01-07 16:51:52.357859", + "modified": "2020-04-16 19:05:56.439204", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note", diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json index 3e9ff4997d5..87dd89517d0 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -1945,7 +1945,7 @@ "collapsible": 0, "columns": 0, "fieldname": "other_charges_calculation", - "fieldtype": "Text", + "fieldtype": "Long Text", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -3708,7 +3708,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2018-11-02 19:59:01.423485", + "modified": "2020-04-16 19:06:51.546358", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt",