Merge pull request #34998 from Vishnu7025/develop
fix: update workstation hour rate when workstation change in job card
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index f76dfff..60f9d62 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -1369,6 +1369,7 @@
"options": "Warehouse",
"print_hide": 1,
"print_width": "50px",
+ "ignore_user_permissions": 1,
"width": "50px"
},
{
@@ -1572,7 +1573,7 @@
"idx": 204,
"is_submittable": 1,
"links": [],
- "modified": "2023-04-28 12:57:50.832598",
+ "modified": "2023-04-29 12:57:50.832598",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice",
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index ff08ddd..c51c6ed 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -1171,6 +1171,7 @@
"depends_on": "is_internal_supplier",
"fieldname": "set_from_warehouse",
"fieldtype": "Link",
+ "ignore_user_permissions": 1,
"label": "Set From Warehouse",
"options": "Warehouse"
},
@@ -1271,7 +1272,7 @@
"idx": 105,
"is_submittable": 1,
"links": [],
- "modified": "2023-04-14 16:42:29.448464",
+ "modified": "2023-05-07 20:18:09.196799",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order",
diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index 413c373..ae39470 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@@ -280,6 +280,7 @@
{
"fieldname": "set_warehouse",
"fieldtype": "Link",
+ "ignore_user_permissions": 1,
"in_list_view": 1,
"label": "Set Target Warehouse",
"options": "Warehouse"
@@ -355,7 +356,7 @@
"idx": 70,
"is_submittable": 1,
"links": [],
- "modified": "2022-09-27 17:58:26.366469",
+ "modified": "2023-05-07 20:17:29.108095",
"modified_by": "Administrator",
"module": "Stock",
"name": "Material Request",
diff --git a/erpnext/stock/doctype/material_request_item/material_request_item.json b/erpnext/stock/doctype/material_request_item/material_request_item.json
index dd66cff..770dacd 100644
--- a/erpnext/stock/doctype/material_request_item/material_request_item.json
+++ b/erpnext/stock/doctype/material_request_item/material_request_item.json
@@ -419,6 +419,7 @@
"depends_on": "eval:parent.material_request_type == \"Material Transfer\"",
"fieldname": "from_warehouse",
"fieldtype": "Link",
+ "ignore_user_permissions": 1,
"label": "Source Warehouse",
"options": "Warehouse"
},
@@ -451,16 +452,16 @@
"fieldname": "job_card_item",
"fieldtype": "Data",
"hidden": 1,
+ "label": "Job Card Item",
"no_copy": 1,
- "print_hide": 1,
- "label": "Job Card Item"
+ "print_hide": 1
}
],
"idx": 1,
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2022-03-10 18:42:42.705190",
+ "modified": "2023-05-07 20:23:31.250252",
"modified_by": "Administrator",
"module": "Stock",
"name": "Material Request Item",
@@ -469,5 +470,6 @@
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index 8f04358..dc61ec4 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -1113,6 +1113,7 @@
"depends_on": "eval: doc.is_internal_supplier",
"fieldname": "set_from_warehouse",
"fieldtype": "Link",
+ "ignore_user_permissions": 1,
"label": "Set From Warehouse",
"options": "Warehouse"
},
@@ -1238,7 +1239,7 @@
"idx": 261,
"is_submittable": 1,
"links": [],
- "modified": "2022-12-12 18:40:32.447752",
+ "modified": "2023-05-07 20:18:25.458185",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt",
diff --git a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
index 5053460..d3bcab7 100644
--- a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
+++ b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
@@ -353,7 +353,7 @@
return frappe.db.sql(
""" SELECT name from `tabRepost Item Valuation`
WHERE status in ('Queued', 'In Progress') and creation <= %s and docstatus = 1
- ORDER BY timestamp(posting_date, posting_time) asc, creation asc
+ ORDER BY timestamp(posting_date, posting_time) asc, creation asc, status asc
""",
now(),
as_dict=1,