ci: interim

.github/workflows/patch.yml

@@ -1,13 +1,13 @@
 name: Patch
 
 on:
-  pull_request:
-    paths-ignore:
-      - '**.js'
-      - '**.css'
-      - '**.md'
-      - '**.html'
-      - '**.csv'
+  # pull_request:
+  #   paths-ignore:
+  #     - '**.js'
+  #     - '**.css'
+  #     - '**.md'
+  #     - '**.html'
+  #     - '**.csv'
   workflow_dispatch:
 
 concurrency:

.github/workflows/server-tests-mariadb.yml

@@ -32,12 +32,6 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
 
-    strategy:
-      fail-fast: false
-
-      matrix:
-        container: [1, 2, 3, 4]
-
     name: Python Unit Tests
 
     services:
@@ -117,7 +111,7 @@ jobs:
           FRAPPE_BRANCH: ${{ github.event.inputs.branch }}
 
       - name: Run Tests
-        run: 'cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app erpnext --total-builds 4 --build-number ${{ matrix.container }}'
+        run: 'cd ~/frappe-bench/ && bench --site test_site run-tests --doctype "Subcontracting Receipt"'
         env:
           TYPE: server
           CI_BUILD_ID: ${{ github.run_id }}

erpnext/stock/doctype/quality_inspection/quality_inspection.py

@@ -392,13 +392,15 @@ def item_query(doctype, txt, searchfield, start, page_len, filters):
 
 		return frappe.db.sql(
 			f"""
-				SELECT distinct item_code, item_name
-				FROM `tab{from_doctype}`
-				WHERE parent=%(parent)s and docstatus < 2 and item_code like %(txt)s
+			SELECT DISTINCT pri.item_code, pri.item_name
+			FROM `tab{from_doctype}` pri
+			JOIN `tab{parent_doctype}` pr ON pr.name = pri.parent
+			WHERE pri.item_code LIKE %(txt)s
 				{qi_condition} {cond} {mcond}
-				ORDER BY item_code limit {cint(page_len)} offset {cint(start)}
+			ORDER BY pri.item_code
+			LIMIT {cint(page_len)} OFFSET {cint(start)}
 			""",
-			{"parent": filters.get("parent"), "txt": "%%%s%%" % txt},
+			{"parent": filters.get("parent"), "txt": f"%{txt}%"},
 		)
 
 	elif filters.get("reference_name"):

erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py

@@ -25,6 +25,10 @@ from erpnext.controllers.tests.test_subcontracting_controller import (
 	set_backflush_based_on,
 )
 from erpnext.manufacturing.doctype.production_plan.test_production_plan import make_bom
+from erpnext.stock.doctype.inventory_dimension.test_inventory_dimension import (
+	create_inventory_dimension,
+	prepare_test_data,
+)
 from erpnext.stock.doctype.item.test_item import make_item
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import get_gl_entries
 from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
@@ -44,6 +48,17 @@ from erpnext.subcontracting.doctype.subcontracting_receipt.subcontracting_receip
 
 
 class TestSubcontractingReceipt(FrappeTestCase):
+	@classmethod
+	def setUpClass(cls):
+		prepare_test_data()
+		create_inventory_dimension(
+			apply_to_all_doctypes=1,
+			dimension_name="Inv Site",
+			reference_document="Inv Site",
+			document_type="Inv Site",
+		)
+		return super().setUpClass()
+
 	def setUp(self):
 		make_subcontracted_items()
 		make_raw_materials()
@@ -2007,20 +2022,6 @@ class TestSubcontractingReceipt(FrappeTestCase):
 		The subcontracting controller resets the supplied items table on each save causing the inventory dimensions to be lost.
 		This test ensures that the inventory dimensions are retained on each save.
 		"""
-		from erpnext.stock.doctype.inventory_dimension.test_inventory_dimension import (
-			create_inventory_dimension,
-		)
-
-		inventory_dimension = create_inventory_dimension(
-			apply_to_all_doctypes=1,
-			dimension_name="Inv Site",
-			reference_document="Inv Site",
-			document_type="Inv Site",
-		)
-
-		inventory_dimension.reqd = 1
-		inventory_dimension.save()
-
 		set_backflush_based_on("BOM")
 
 		sco = get_subcontracting_order()
@@ -2040,9 +2041,6 @@ class TestSubcontractingReceipt(FrappeTestCase):
 
 		self.assertEqual(scr.supplied_items[0].inv_site, "Site 1")
 
-		inventory_dimension.reqd = 0
-		inventory_dimension.save()
-
 
 def make_return_subcontracting_receipt(**args):
 	args = frappe._dict(args)