Merge pull request #418 from efeone/poc_requirements_5

feat: purchase entry final changes

aumms/aumms/doctype/item_wise_stone_details/item_wise_stone_details.json

@@ -0,0 +1,68 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2024-08-20 10:05:13.872227",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "reference",
+  "stone",
+  "uom",
+  "stone_weight",
+  "rate",
+  "amount"
+ ],
+ "fields": [
+  {
+   "fieldname": "reference",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Reference"
+  },
+  {
+   "fieldname": "stone",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Stone",
+   "options": "AuMMS Item"
+  },
+  {
+   "fieldname": "uom",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "UOM",
+   "options": "UOM"
+  },
+  {
+   "fieldname": "stone_weight",
+   "fieldtype": "Float",
+   "in_list_view": 1,
+   "label": "Stone Weight"
+  },
+  {
+   "fieldname": "rate",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Rate"
+  },
+  {
+   "fieldname": "amount",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Amount"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2024-08-20 10:07:11.991708",
+ "modified_by": "Administrator",
+ "module": "AuMMS",
+ "name": "Item Wise Stone Details",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}

aumms/aumms/doctype/item_wise_stone_details/item_wise_stone_details.py

@@ -0,0 +1,9 @@
+# Copyright (c) 2024, efeone and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class ItemWiseStoneDetails(Document):
+	pass

aumms/aumms/doctype/jewellery_item_receipt/jewellery_item_receipt.json

@@ -11,26 +11,28 @@
   "item_code",
   "item_type",
   "item_group",
-  "has_stone",
-  "single_stone",
-  "multi_stone",
-  "stone",
-  "add_multi_stone",
-  "stones",
   "gold_weight",
   "uom",
-  "unit_stone_charge",
-  "stone_weight",
-  "individual_stone_weight",
   "column_break_juco",
+  "stone_weight_gold_weight_uom",
   "net_weight",
   "stone_charge",
   "making_chargein_percentage",
   "making_charge",
   "purity",
   "board_rate",
   "amount_without_making_charge",
-  "amount"
+  "amount",
+  "section_break_lkhd",
+  "has_stone",
+  "stone",
+  "stone_weight",
+  "stone_uom",
+  "rate",
+  "add_stone",
+  "column_break_piui",
+  "stones",
+  "individual_stone_weight"
  ],
  "fields": [
   {
@@ -54,7 +56,7 @@
    "reqd": 1
   },
   {
-   "depends_on": "eval:doc.stone",
+   "depends_on": "eval:doc.has_stone",
    "fieldname": "stone_weight",
    "fieldtype": "Float",
    "in_list_view": 1,
@@ -72,7 +74,7 @@
    "fieldtype": "Column Break"
   },
   {
-   "depends_on": "eval:doc.single_stone == 1",
+   "depends_on": "eval:doc.has_stone",
    "fieldname": "stone",
    "fieldtype": "Link",
    "label": "Stone",
@@ -104,7 +106,7 @@
    "default": "0",
    "fieldname": "has_stone",
    "fieldtype": "Check",
-   "label": "has Stone"
+   "label": "Has Stone"
   },
   {
    "fieldname": "amount_without_making_charge",
@@ -119,12 +121,6 @@
    "precision": "1",
    "reqd": 1
   },
-  {
-   "depends_on": "eval:doc.has_stone == 1",
-   "fieldname": "unit_stone_charge",
-   "fieldtype": "Int",
-   "label": "Unit Stone Charge"
-  },
   {
    "fieldname": "individual_stone_weight",
    "fieldtype": "Data",
@@ -164,19 +160,6 @@
    "label": "Board Rate",
    "precision": "2"
   },
-  {
-   "default": "0",
-   "depends_on": "eval:doc.has_stone && !doc.multi_stone == 1",
-   "fieldname": "single_stone",
-   "fieldtype": "Check",
-   "label": "Single Stone"
-  },
-  {
-   "depends_on": "eval:doc.has_stone && doc.multi_stone == 1",
-   "fieldname": "add_multi_stone",
-   "fieldtype": "Button",
-   "label": "Add Multi Stone"
-  },
   {
    "fieldname": "uom",
    "fieldtype": "Link",
@@ -185,23 +168,48 @@
    "reqd": 1
   },
   {
-   "depends_on": "eval:doc.has_stone && doc.multi_stone == 1",
+   "depends_on": "eval:doc.has_stone",
    "fieldname": "stones",
    "fieldtype": "Data",
    "label": "Stones"
   },
   {
-   "default": "0",
-   "depends_on": "eval:doc.has_stone && !doc.single_stone == 1",
-   "fieldname": "multi_stone",
-   "fieldtype": "Check",
-   "label": "Multi Stone"
+   "fieldname": "section_break_lkhd",
+   "fieldtype": "Section Break"
+  },
+  {
+   "depends_on": "eval:doc.has_stone",
+   "fieldname": "add_stone",
+   "fieldtype": "Button",
+   "label": "Add Stone"
+  },
+  {
+   "fieldname": "column_break_piui",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "stone_weight_gold_weight_uom",
+   "fieldtype": "Float",
+   "label": "Stone Weight (Gold Weight UOM)"
+  },
+  {
+   "depends_on": "eval: doc.has_stone",
+   "fieldname": "stone_uom",
+   "fieldtype": "Link",
+   "label": "UOM",
+   "options": "UOM"
+  },
+  {
+   "depends_on": "eval: doc.has_stone",
+   "fieldname": "rate",
+   "fieldtype": "Currency",
+   "label": "Rate"
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-03-20 11:55:02.622652",
+ "modified": "2024-08-20 10:11:54.088886",
  "modified_by": "Administrator",
  "module": "AuMMS",
  "name": "Jewellery Item Receipt",