diff --git a/aumms/aumms_manufacturing/doctype/manufacturing_request/manufacturing_request.json b/aumms/aumms_manufacturing/doctype/manufacturing_request/manufacturing_request.json index 036c9fed..f020d946 100644 --- a/aumms/aumms_manufacturing/doctype/manufacturing_request/manufacturing_request.json +++ b/aumms/aumms_manufacturing/doctype/manufacturing_request/manufacturing_request.json @@ -198,6 +198,7 @@ "fieldtype": "Column Break" }, { + "depends_on": "eval:doc.request_from == \"Jewellery Order\"", "fieldname": "weight", "fieldtype": "Float", "label": "Weight" @@ -252,7 +253,7 @@ "link_fieldname": "manufacturing_request" } ], - "modified": "2024-05-07 12:51:18.505865", + "modified": "2024-05-07 17:34:55.175911", "modified_by": "Administrator", "module": "AuMMS Manufacturing", "name": "Manufacturing Request", diff --git a/aumms/aumms_manufacturing/doctype/raw_material_request/raw_material_request.py b/aumms/aumms_manufacturing/doctype/raw_material_request/raw_material_request.py index 670cde41..1592ceba 100644 --- a/aumms/aumms_manufacturing/doctype/raw_material_request/raw_material_request.py +++ b/aumms/aumms_manufacturing/doctype/raw_material_request/raw_material_request.py @@ -19,8 +19,10 @@ def create_manufacturing_request(self): manufacturing_request.jewellery_order = self.jewellery_order manufacturing_request.required_date = self.required_date manufacturing_request.quantity = self.required_quantity - manufacturing_request.expected_weight = item.required_quantity + manufacturing_request.expected_weight = item.required_weight manufacturing_request.purity = self.purity + manufacturing_request.weight = item.required_weight + manufacturing_request.supervisor_warehouse = self.supervisor_warehouse manufacturing_request.uom = self.uom manufacturing_request.type = self.item_type manufacturing_request.insert(ignore_permissions=True) diff --git a/aumms/fixtures/role.json b/aumms/fixtures/role.json index 0b72570b..a3be40d6 100644 --- a/aumms/fixtures/role.json +++ b/aumms/fixtures/role.json @@ -1,4 +1,25 @@ [ + { + "bulk_actions": 1, + "dashboard": 1, + "desk_access": 1, + "disabled": 0, + "docstatus": 0, + "doctype": "Role", + "form_sidebar": 1, + "home_page": null, + "is_custom": 0, + "list_sidebar": 1, + "modified": "2024-05-07 11:57:06.425584", + "name": "Sales Manager", + "notifications": 1, + "restrict_to_domain": null, + "role_name": "Sales Manager", + "search_bar": 1, + "timeline": 1, + "two_factor_auth": 0, + "view_switcher": 1 + }, { "bulk_actions": 1, "dashboard": 1, diff --git a/aumms/hooks.py b/aumms/hooks.py index 88cf9b5c..8c5ae269 100644 --- a/aumms/hooks.py +++ b/aumms/hooks.py @@ -89,7 +89,7 @@ fixtures = [ { "dt": "Role", - "filters": [["name", "in", ["Design Analyst", "Supervisor","Smith","Head of Smith", "AuMMS Manager", "Sales Officer"]]] + "filters": [["name", "in", ["Design Analyst", "Supervisor","Smith","Head of Smith", "AuMMS Manager", "Sales Officer", "Sales Manager"]]] }, { "dt":"Designation",