mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-02 03:39:11 +00:00
ci: interim
This commit is contained in:
14
.github/workflows/patch.yml
vendored
14
.github/workflows/patch.yml
vendored
@@ -1,13 +1,13 @@
|
|||||||
name: Patch
|
name: Patch
|
||||||
|
|
||||||
on:
|
on:
|
||||||
pull_request:
|
# pull_request:
|
||||||
paths-ignore:
|
# paths-ignore:
|
||||||
- '**.js'
|
# - '**.js'
|
||||||
- '**.css'
|
# - '**.css'
|
||||||
- '**.md'
|
# - '**.md'
|
||||||
- '**.html'
|
# - '**.html'
|
||||||
- '**.csv'
|
# - '**.csv'
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
|
|||||||
8
.github/workflows/server-tests-mariadb.yml
vendored
8
.github/workflows/server-tests-mariadb.yml
vendored
@@ -32,12 +32,6 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
timeout-minutes: 60
|
timeout-minutes: 60
|
||||||
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
|
|
||||||
matrix:
|
|
||||||
container: [1, 2, 3, 4]
|
|
||||||
|
|
||||||
name: Python Unit Tests
|
name: Python Unit Tests
|
||||||
|
|
||||||
services:
|
services:
|
||||||
@@ -117,7 +111,7 @@ jobs:
|
|||||||
FRAPPE_BRANCH: ${{ github.event.inputs.branch }}
|
FRAPPE_BRANCH: ${{ github.event.inputs.branch }}
|
||||||
|
|
||||||
- name: Run Tests
|
- 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:
|
env:
|
||||||
TYPE: server
|
TYPE: server
|
||||||
CI_BUILD_ID: ${{ github.run_id }}
|
CI_BUILD_ID: ${{ github.run_id }}
|
||||||
|
|||||||
@@ -392,13 +392,15 @@ def item_query(doctype, txt, searchfield, start, page_len, filters):
|
|||||||
|
|
||||||
return frappe.db.sql(
|
return frappe.db.sql(
|
||||||
f"""
|
f"""
|
||||||
SELECT distinct item_code, item_name
|
SELECT DISTINCT pri.item_code, pri.item_name
|
||||||
FROM `tab{from_doctype}`
|
FROM `tab{from_doctype}` pri
|
||||||
WHERE parent=%(parent)s and docstatus < 2 and item_code like %(txt)s
|
JOIN `tab{parent_doctype}` pr ON pr.name = pri.parent
|
||||||
|
WHERE pri.item_code LIKE %(txt)s
|
||||||
{qi_condition} {cond} {mcond}
|
{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"):
|
elif filters.get("reference_name"):
|
||||||
|
|||||||
Reference in New Issue
Block a user