Skip to content

Commit

Permalink
Merge pull request #390 from efeone/aumms_063
Browse files Browse the repository at this point in the history
fix : Created New Role Sales Manager
  • Loading branch information
SherinKR authored May 8, 2024
2 parents af49a4e + f1c0d94 commit fb815d1
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@
"fieldtype": "Column Break"
},
{
"depends_on": "eval:doc.request_from == \"Jewellery Order\"",
"fieldname": "weight",
"fieldtype": "Float",
"label": "Weight"
Expand Down Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
21 changes: 21 additions & 0 deletions aumms/fixtures/role.json
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion aumms/hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit fb815d1

Please sign in to comment.