mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-01 04:28:27 +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
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
paths-ignore:
|
||||
- '**.js'
|
||||
- '**.css'
|
||||
- '**.md'
|
||||
- '**.html'
|
||||
- '**.csv'
|
||||
# pull_request:
|
||||
# paths-ignore:
|
||||
# - '**.js'
|
||||
# - '**.css'
|
||||
# - '**.md'
|
||||
# - '**.html'
|
||||
# - '**.csv'
|
||||
workflow_dispatch:
|
||||
|
||||
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
|
||||
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 }}
|
||||
|
||||
@@ -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"):
|
||||
|
||||
Reference in New Issue
Block a user