From 60e5e4ac2dbd9b738589d9b37f2ddcdd21effe2c Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 1 Nov 2016 12:49:03 +0530 Subject: [PATCH] change fieldtype from float to currency --- .../sales_invoice_item.json | 4 +- .../quotation_item/quotation_item.json | 4 +- .../sales_order_item/sales_order_item.json | 6 +- .../delivery_note_item.json | 60 ++++++++++++++++++- 4 files changed, 65 insertions(+), 9 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json index dd46e762af..7be5a24516 100644 --- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json +++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json @@ -572,7 +572,7 @@ "columns": 0, "depends_on": "eval:doc.margin_type && doc.price_list_rate", "fieldname": "total_margin", - "fieldtype": "Float", + "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -1724,7 +1724,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-08-26 04:48:29.142409", + "modified": "2016-11-01 13:01:58.844818", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice Item", diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json index 2c73a8e136..3a27706829 100644 --- a/erpnext/selling/doctype/quotation_item/quotation_item.json +++ b/erpnext/selling/doctype/quotation_item/quotation_item.json @@ -563,7 +563,7 @@ "columns": 0, "depends_on": "eval:doc.margin_type && doc.price_list_rate", "fieldname": "total_margin", - "fieldtype": "Float", + "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -1276,7 +1276,7 @@ "istable": 1, "max_attachments": 0, "menu_index": 0, - "modified": "2016-08-26 04:46:21.936481", + "modified": "2016-11-01 13:02:18.665333", "modified_by": "Administrator", "module": "Selling", "name": "Quotation Item", diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json index 35d8b0b1e9..a59858a0bb 100644 --- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json +++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -563,7 +563,7 @@ "columns": 0, "depends_on": "eval:doc.margin_type && doc.price_list_rate", "fieldname": "total_margin", - "fieldtype": "Float", + "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -614,7 +614,7 @@ "columns": 2, "depends_on": "eval: doc.type != \"\"", "fieldname": "rate", - "fieldtype": "Float", + "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -1582,7 +1582,7 @@ "istable": 1, "max_attachments": 0, "menu_index": 0, - "modified": "2016-08-26 04:50:27.723801", + "modified": "2016-11-01 13:01:13.572400", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order Item", diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json index b40be5ec56..5ac7b45e31 100644 --- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json +++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -10,11 +10,13 @@ "doctype": "DocType", "document_type": "Document", "editable_grid": 1, + "engine": "InnoDB", "fields": [ { "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "barcode", "fieldtype": "Data", "hidden": 0, @@ -39,6 +41,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "item_code", "fieldtype": "Link", "hidden": 0, @@ -68,6 +71,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "item_name", "fieldtype": "Data", "hidden": 0, @@ -96,6 +100,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break1", "fieldtype": "Column Break", "hidden": 0, @@ -119,6 +124,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "customer_item_code", "fieldtype": "Data", "hidden": 1, @@ -143,6 +149,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "section_break_6", "fieldtype": "Section Break", "hidden": 0, @@ -168,6 +175,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "description", "fieldtype": "Text Editor", "hidden": 0, @@ -196,6 +204,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_8", "fieldtype": "Column Break", "hidden": 0, @@ -220,6 +229,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image", "fieldtype": "Attach", "hidden": 1, @@ -245,6 +255,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "image_view", "fieldtype": "Image", "hidden": 0, @@ -271,6 +282,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "quantity_and_rate", "fieldtype": "Section Break", "hidden": 0, @@ -295,6 +307,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "qty", "fieldtype": "Float", "hidden": 0, @@ -323,6 +336,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "price_list_rate", "fieldtype": "Currency", "hidden": 0, @@ -352,6 +366,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break2", "fieldtype": "Column Break", "hidden": 0, @@ -375,6 +390,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "stock_uom", "fieldtype": "Link", "hidden": 0, @@ -404,6 +420,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_price_list_rate", "fieldtype": "Currency", "hidden": 0, @@ -433,6 +450,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 1, + "columns": 0, "fieldname": "discount_and_margin", "fieldtype": "Section Break", "hidden": 0, @@ -458,6 +476,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "price_list_rate", "fieldname": "discount_percentage", "fieldtype": "Float", @@ -487,6 +506,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_19", "fieldtype": "Column Break", "hidden": 0, @@ -511,6 +531,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "price_list_rate", "fieldname": "margin_type", "fieldtype": "Select", @@ -538,6 +559,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.margin_type && doc.price_list_rate", "fieldname": "margin_rate_or_amount", "fieldtype": "Float", @@ -564,9 +586,10 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.margin_type && doc.price_list_rate", "fieldname": "total_margin", - "fieldtype": "Float", + "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -590,6 +613,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_1", "fieldtype": "Section Break", "hidden": 0, @@ -613,6 +637,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "rate", "fieldtype": "Currency", "hidden": 0, @@ -642,6 +667,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "amount", "fieldtype": "Currency", "hidden": 0, @@ -671,6 +697,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break3", "fieldtype": "Column Break", "hidden": 0, @@ -694,6 +721,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_rate", "fieldtype": "Currency", "hidden": 0, @@ -723,6 +751,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_amount", "fieldtype": "Currency", "hidden": 0, @@ -752,6 +781,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "pricing_rule", "fieldtype": "Link", "hidden": 0, @@ -777,6 +807,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_25", "fieldtype": "Section Break", "hidden": 0, @@ -801,6 +832,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "net_rate", "fieldtype": "Currency", "hidden": 0, @@ -827,6 +859,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "net_amount", "fieldtype": "Currency", "hidden": 0, @@ -853,6 +886,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_28", "fieldtype": "Column Break", "hidden": 0, @@ -877,6 +911,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_net_rate", "fieldtype": "Currency", "hidden": 0, @@ -903,6 +938,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "base_net_amount", "fieldtype": "Currency", "hidden": 0, @@ -929,6 +965,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "warehouse_and_reference", "fieldtype": "Section Break", "hidden": 0, @@ -953,6 +990,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "warehouse", "fieldtype": "Link", "hidden": 0, @@ -982,6 +1020,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "", "description": "", "fieldname": "target_warehouse", @@ -1010,6 +1049,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "serial_no", "fieldtype": "Text", "hidden": 0, @@ -1036,6 +1076,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "batch_no", "fieldtype": "Link", "hidden": 0, @@ -1063,6 +1104,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "actual_qty", "fieldtype": "Float", "hidden": 0, @@ -1091,6 +1133,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "batch_no", "fieldname": "actual_batch_qty", "fieldtype": "Float", @@ -1119,6 +1162,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "item_group", "fieldtype": "Link", @@ -1147,6 +1191,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "brand", "fieldtype": "Link", "hidden": 1, @@ -1176,6 +1221,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "item_tax_rate", "fieldtype": "Small Text", "hidden": 1, @@ -1202,6 +1248,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "col_break4", "fieldtype": "Column Break", "hidden": 0, @@ -1225,6 +1272,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "expense_account", "fieldtype": "Link", "hidden": 0, @@ -1251,6 +1299,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": ":Company", "fieldname": "cost_center", "fieldtype": "Link", @@ -1278,6 +1327,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "against_sales_order", "fieldtype": "Link", "hidden": 0, @@ -1303,6 +1353,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "against_sales_invoice", "fieldtype": "Link", "hidden": 0, @@ -1328,6 +1379,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "so_detail", "fieldtype": "Data", "hidden": 1, @@ -1356,6 +1408,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "si_detail", "fieldtype": "Data", "hidden": 1, @@ -1381,6 +1434,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "installed_qty", "fieldtype": "Float", "hidden": 0, @@ -1409,6 +1463,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "billed_amt", "fieldtype": "Currency", "hidden": 0, @@ -1435,6 +1490,7 @@ "allow_on_submit": 1, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "page_break", "fieldtype": "Check", "hidden": 0, @@ -1468,7 +1524,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-07-11 03:27:59.254550", + "modified": "2016-11-01 13:01:29.621272", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note Item",