commit 758f0f07800c4ea3386d76f47f1c2f51f612eee1
author Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Thu Apr 30 11:37:27 2020 +0530
committer GitHub <noreply@github.com> Thu Apr 30 11:37:27 2020 +0530
tree 8dd6e7fa3ce22ee86b830d14dfe92ce8c5955d98
parent acfe8f020f4ba4eb440609c35febdf142f563880
parent a8779872eed2590a486054eda99a01014ff25a35

Merge branch 'develop' into patch-8

erpnext/stock/doctype/item/item.json

diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 7d2e311..968fa68 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -382,7 +382,7 @@
   {
    "depends_on": "eval:doc.is_stock_item",
    "fieldname": "warranty_period",
-   "fieldtype": "Data",
+   "fieldtype": "Int",
    "label": "Warranty Period (in days)",
    "oldfieldname": "warranty_period",
    "oldfieldtype": "Data"
@@ -1060,7 +1060,7 @@
  "image_field": "image",
  "links": [],
  "max_attachments": 1,
- "modified": "2020-04-07 15:56:06.195722",
+ "modified": "2020-04-27 08:46:06.195722",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item",
@@ -1122,4 +1122,4 @@
  "sort_order": "DESC",
  "title_field": "item_name",
  "track_changes": 1
-}
\ No newline at end of file
+}