Merge pull request #170 from efeone/fix_item_DA

fix: While adding stone item in Aumms Item and creating Design Analysis
efeone · Nov 3, 2023 · 2c461f0 · 2c461f0
2 parents d75206f + f10ddf5
commit 2c461f0
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 27 deletions.
diff --git a/aumms/aumms/doctype/aumms_item/aumms_item.json b/aumms/aumms/doctype/aumms_item/aumms_item.json
@@ -183,10 +183,12 @@
    "read_only": 1
   },
   {
+   "depends_on": "eval:doc.is_stone_item == 0",
    "fieldname": "weight_uom",
    "fieldtype": "Link",
    "ignore_user_permissions": 1,
    "label": "Weight UOM",
+   "mandatory_depends_on": "!has_stone",
    "options": "UOM"
   },
   {
@@ -265,9 +267,11 @@
   },
   {
    "default": "0",
+   "depends_on": "eval:doc.is_stone_item == 0",
    "fieldname": "gold_weight",
    "fieldtype": "Float",
    "label": "Gold Weight",
+   "mandatory_depends_on": "!has_stone",
    "non_negative": 1
   },
   {
@@ -308,19 +312,22 @@
   },
   {
    "default": "0",
-   "depends_on": "has_stone",
+   "depends_on": "eval:(doc.has_stone || doc.is_stone_item)",
    "fieldname": "stone_weight",
    "fieldtype": "Float",
    "label": "Stone Weight",
-   "read_only": 1
+   "mandatory_depends_on": "has_stone",
+   "read_only_depends_on": "has_stone"
   },
   {
    "default": "0",
-   "depends_on": "has_stone",
+   "depends_on": "eval:(doc.has_stone || doc.is_stone_item)",
    "fieldname": "stone_charge",
    "fieldtype": "Currency",
    "label": "Stone Charge",
-   "read_only": 1
+   "mandatory_depends_on": "has_stone",
+   "read_only": 1,
+   "read_only_depends_on": "has_stone"
   },
   {
    "default": "0",
@@ -341,7 +348,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-08-25 17:19:31.111307",
+ "modified": "2023-11-03 15:10:32.224949",
  "modified_by": "Administrator",
  "module": "AuMMS",
  "name": "AuMMS Item",

diff --git a/aumms/aumms/doctype/verified_item/verified_item.json b/aumms/aumms/doctype/verified_item/verified_item.json
@@ -21,34 +21,30 @@
   {
    "fetch_from": "item.item_group",
    "fieldname": "item_group",
-   "fieldtype": "Link",
+   "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Item Group",
-   "options": "AuMMS Item"
+   "label": "Item Group"
   },
   {
    "fetch_from": "item.item_type",
    "fieldname": "item_type",
-   "fieldtype": "Link",
+   "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Item Type",
-   "options": "AuMMS Item"
+   "label": "Item Type"
   },
   {
    "fetch_from": "item.purity",
    "fieldname": "purity",
-   "fieldtype": "Link",
+   "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Purity",
-   "options": "AuMMS Item"
+   "label": "Purity"
   },
   {
    "fetch_from": "item.weight_uom",
    "fieldname": "unit_of_measure",
-   "fieldtype": "Link",
+   "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Unit of Measure",
-   "options": "AuMMS Item"
+   "label": "Unit of Measure"
   },
   {
    "fieldname": "quantity",
@@ -73,31 +69,28 @@
   {
    "fetch_from": "item.gold_weight",
    "fieldname": "gold_wt",
-   "fieldtype": "Link",
+   "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Gold Wt",
-   "options": "AuMMS Item"
+   "label": "Gold Wt"
   },
   {
    "fetch_from": "item.weight_per_unit",
    "fieldname": "net_wt",
-   "fieldtype": "Link",
+   "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Net Wt",
-   "options": "AuMMS Item"
+   "label": "Net Wt"
   },
   {
    "fetch_from": "item.stone_weight",
    "fieldname": "stone_wt",
-   "fieldtype": "Link",
-   "label": "Stone Wt",
-   "options": "AuMMS Item"
+   "fieldtype": "Data",
+   "label": "Stone Wt"
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-11-02 11:18:45.086742",
+ "modified": "2023-11-03 11:21:02.548953",
  "modified_by": "Administrator",
  "module": "AuMMS",
  "name": "Verified Item",