Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
cc887aa
wip: mobile view
agritheory Mar 9, 2024
2c8d861
Changes to remove null value in handling unit list (#95)
viralkansodiya Mar 26, 2024
c71599f
Added remaining qty and transferred qty on dialog box(Cancellation pr…
viralkansodiya Apr 9, 2024
0323066
fix: add read-only decorator to APIs (#104)
Alchez Apr 20, 2024
d463e13
14.8.5
agritheory Apr 20, 2024
d766a01
wip: demand poc
agritheory Apr 20, 2024
aa249d0
Merge remote-tracking branch 'upstream/version-14' into demand
May 3, 2024
ab7503f
feat: add BEAM Settings for v15 (#96)
HKuz Mar 26, 2024
b3b0a2e
15.1.0
agritheory Mar 26, 2024
e7acef9
ci: refactor env variable, remove unused code (#97)
HKuz Mar 26, 2024
43c026d
ci: update conftest for json (#101)
HKuz Apr 9, 2024
f8da4e4
Barcode Font Size should be set in BEAM settings (#103)
fproldan Apr 17, 2024
0095b0d
fix: minor cleanup
May 8, 2024
a8b743d
fix: restructure demand folder to match scan structure
May 8, 2024
d9498a6
fix: add missing imports
May 8, 2024
392cf00
feat: setup demand matrix (#115)
Alchez May 9, 2024
df302b8
Merge remote-tracking branch 'upstream/version-15' into demand
May 9, 2024
978a65f
fix: typing issue
May 9, 2024
a029d53
Merge remote-tracking branch 'upstream/version-15' into demand
May 14, 2024
b70c4bb
test: time log addition
May 14, 2024
3027456
fix: update deps
May 22, 2024
2b6d972
Merge remote-tracking branch 'upstream/version-15' into mobile_v15
May 22, 2024
afe35e0
ci: remove eslint
May 22, 2024
cfab50e
feat: add mirage server to mock workstations (#123)
Alchez May 29, 2024
e123d7e
Merge branch 'version-15' into mobile_v15
Alchez Jun 5, 2024
2e68a34
fix: filelock on demand.db (#127)
MyuddinKhatri Jun 7, 2024
5d62b52
Descendant warehouse lookup with warehouse types (#132)
MyuddinKhatri Jul 3, 2024
df9c291
wip: import stonecrop/beam components
agritheory Jul 11, 2024
f572b29
wip: add routing
agritheory Jul 11, 2024
e2bbb23
Merge branch 'version-15' into mobile_v15
Alchez Jul 12, 2024
da5fdeb
feat: adding WorkOrder, JobCard, Operation pages and routes
bhattdevarsh Jul 15, 2024
b9d7b10
Merge branch 'version-15' of github.com:agritheory/beam into demand
agritheory Jul 22, 2024
e6e121d
wip: demand
agritheory Jul 29, 2024
8b683e5
fix: add typescript + minor fixes
Aug 1, 2024
02b2e56
feat: add API calls for Beam views
Aug 1, 2024
b0df4d0
wip: demand
agritheory Aug 1, 2024
492cdae
wip: get tests passing without measuring in-process demand
agritheory Aug 2, 2024
b180fb0
wip: trying to detect demand side effects
agritheory Aug 2, 2024
fd846bd
Merge remote-tracking branch 'upstream/version-15' into demand
Aug 9, 2024
12fc1f4
fix: allow development outside Frappe
Aug 9, 2024
b3efc37
Merge branch 'version-15' into mobile_v15
agritheory Aug 9, 2024
fa0a470
fix: replace frappe.call with fetch
Aug 12, 2024
4bd23c6
fix: override website theme to exclude Frappe
Aug 12, 2024
6b5761d
fix: apply demand map to transactions (#145)
Alchez Aug 13, 2024
5683e58
Merge remote-tracking branch 'upstream/mobile_v15' into demand
Aug 15, 2024
b0e02ad
Merge remote-tracking branch 'upstream/version-15' into mobile_v15
Aug 16, 2024
9aa0706
Merge remote-tracking branch 'upstream/mobile_v15' into demand
Aug 16, 2024
51cd7f9
fix: add typing to get_demand return value (#156)
Alchez Aug 16, 2024
69d7f5c
tests: reorder demand artifacts
agritheory Aug 16, 2024
5a78123
tests: change setup and add creation as ordering key to get determini…
agritheory Aug 16, 2024
81ae717
Merge remote-tracking branch 'upstream/version-15' into mobile_v15
Aug 20, 2024
bfb3d7e
move mfg and wo (#154)
Alchez Aug 27, 2024
2b38695
Merge remote-tracking branch 'upstream/mobile_v15' into demand
Aug 28, 2024
990d01d
feat: requires login for /beam (#149)
MyuddinKhatri Aug 28, 2024
5e61fc1
fix: update demand when sales or work orders are updated (#162)
Alchez Sep 2, 2024
876660f
Merge branch 'mobile_v15' into demand
agritheory Sep 2, 2024
aa338fb
feat: add pagination to demand API (#166)
Alchez Sep 6, 2024
9381697
[mobile] fix work order routing (#169)
agritheory Sep 13, 2024
1fc1b5b
feat: implement scan matrix for mobile (#167)
Alchez Sep 18, 2024
73ce8ef
fix: refactor Beam data store (#173)
Alchez Sep 19, 2024
911508d
[mobile] Refactor WO view (#170)
agritheory Sep 20, 2024
05f2cef
Operations hide (#178)
agritheory Sep 24, 2024
4bb6c8a
feat: update Work Order via scanned item (#182)
Alchez Sep 26, 2024
36b7e17
feat: implement pagination for demand (#184)
Alchez Sep 27, 2024
936e13f
feat: handle units from beam settings (#186)
lauty95 Oct 1, 2024
41d4fad
Merge remote-tracking branch 'upstream/version-15' into mobile_v15
Oct 2, 2024
10c48a3
Mobile v15 control buttons (#180)
lauty95 Oct 2, 2024
78ee411
[mobile / demand] Add accounting dimensions to Demand DB and allow fi…
fproldan Oct 2, 2024
41e2c27
Remove mirage (#190)
agritheory Oct 2, 2024
b0f3300
fix: manufacture items label (#192)
lauty95 Oct 5, 2024
e5a3d98
UI fixes (#195)
agritheory Oct 9, 2024
52a13a4
[demand] Escape special characters in item name (#203)
fproldan Oct 11, 2024
469630a
Codespace branch fix (#206)
agritheory Oct 14, 2024
6035b56
Merge remote-tracking branch 'upstream/version-15' into mobile_v15
Oct 15, 2024
0bb3c1c
Receiving demand (#188)
agritheory Oct 27, 2024
b363761
Component and Route cross-application import (#171)
agritheory Nov 1, 2024
06500f9
Detect mobile user agents on login and redirect to /beam (#212)
fproldan Nov 1, 2024
35f257a
Mobile v15 home config (#213)
agritheory Nov 4, 2024
0af4ad1
Mobile v15 se workflow (#209)
agritheory Nov 4, 2024
64c3122
feat: Add accounting dimensions to Demand DB and allow filtering by …
fproldan Sep 27, 2024
7661867
feat: Add accounting dimensions to Demand DB and allow filtering by …
fproldan Sep 27, 2024
ba61eea
fix: styles on buttons
agritheory Nov 4, 2024
8e2df22
feat: track unsaved changes in data store (#217)
Alchez Nov 8, 2024
8718aec
refactor: control buttons (#222)
lauty95 Nov 14, 2024
5c9e99f
Mobile v15 metadata component (#196)
lauty95 Nov 21, 2024
445a93f
Mobile v15 work order (#219)
agritheory Nov 21, 2024
c0011a8
wip: better import for third party apps (#226)
agritheory Nov 21, 2024
49edc67
fix: pass through for custom hooks
agritheory Nov 22, 2024
d14610d
fix: remove mapped document local caching (#230)
Alchez Nov 22, 2024
52aa507
Mobile v15 metadata demand (#228)
lauty95 Nov 25, 2024
c48069c
fix: delete redirect-to (#231)
lauty95 Nov 25, 2024
bc953c4
fix: reset margin on body
agritheory Nov 25, 2024
8d2ba3e
fix: show error toast for invalid barcode scan (#233)
Alchez Nov 26, 2024
5c84b9b
feat: allow toggling demand features (#234)
Alchez Nov 26, 2024
21e95bb
feat: add toast for success and error messages (#236)
Alchez Nov 27, 2024
733656b
feat: implement day divider config (#238)
Alchez Dec 5, 2024
d7afe7a
PWA (#239)
lauty95 Dec 5, 2024
2354e52
fix: remove assumption about demand route in beam settings (#240)
agritheory Dec 5, 2024
3e0f4f9
fix: added remaining_time_in_mins in job card (#243)
lauty95 Jan 20, 2025
cc37a04
Mobile v15 move page (#241)
lauty95 Jan 23, 2025
a8c630c
feat: allow re-routing after scan input (#246)
Alchez Jan 28, 2025
3894a0a
fix: add 404 catch-all page (#249)
Alchez Jan 29, 2025
fd44463
Mobile v15 scan to login (#248)
lauty95 Jan 29, 2025
ed55585
fix: don't set FG qty on skip_transfer WO (#250)
agritheory Feb 4, 2025
b170693
feat: repack page (#251)
lauty95 Feb 28, 2025
b086dbc
feat: add filters for beam list views (#260)
Alchez Mar 13, 2025
b3d1110
fix: improve context in debug UI
agritheory Mar 13, 2025
6bf1ed2
266 add cache busting (#267)
lauty95 Apr 30, 2025
058c26a
269 scan to login (#270)
lauty95 May 23, 2025
dfc532b
Merge remote-tracking branch 'upstream/version-15' into mobile_v15
Alchez May 28, 2025
a17b5d1
Fix barcode generation v15 (#277)
agritheory Jul 15, 2025
2781074
fix: purchase-receipt path (#274)
lauty95 Jul 23, 2025
fe40718
fix: controls deleted (#281)
lauty95 Jul 30, 2025
f575ff4
fix: is_corrective_job_card (#280)
lauty95 Aug 11, 2025
cd64b2e
test: add playwright tests (#237)
Alchez Aug 22, 2025
5a0b0d2
feat: pipefail (#289)
lauty95 Sep 26, 2025
530b52b
[mobile] Fix redirect to Beam (#297)
lauty95 Dec 3, 2025
603d18f
Issue 329 merge (#335)
lauty95 Mar 2, 2026
519fa86
Mobile Repack Tests (#333)
IshwaryaM1030 Mar 3, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"remoteUser": "frappe",
"shutdownAction": "stopCompose",
"postCreateCommand": "bash /workspace/.devcontainer/scripts/init.sh",

"dockerComposeFile": "./docker-compose.yml",
"service": "frappe",
"workspaceFolder": "/workspace/frappe-bench"
Expand Down
12 changes: 6 additions & 6 deletions .github/helper/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export PIP_ROOT_USER_ACTION=ignore
set -e

# Check for merge conflicts before proceeding
python -m compileall -f "${GITHUB_WORKSPACE}"
# python -m compileall -f "${GITHUB_WORKSPACE}"
if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}"
then echo "Found merge conflicts"
exit 1
Expand All @@ -26,8 +26,7 @@ mysql --host 127.0.0.1 --port 3306 -u root -e "GRANT ALL PRIVILEGES ON \`test_si
mysql --host 127.0.0.1 --port 3306 -u root -e "ALTER USER 'root'@'localhost' IDENTIFIED BY 'root'" # match site_cofig
mysql --host 127.0.0.1 --port 3306 -u root -e "FLUSH PRIVILEGES"

echo BRANCH_NAME: "${BRANCH_NAME}"
git clone https://github.com/frappe/frappe --branch ${BRANCH_NAME}
git clone https://github.com/frappe/frappe --branch "version-15"
bench init frappe-bench --frappe-path ~/frappe --python "$(which python)" --skip-assets --ignore-exist

mkdir ~/frappe-bench/sites/test_site
Expand All @@ -40,7 +39,7 @@ sed -i 's/schedule:/# schedule:/g' Procfile
sed -i 's/socketio:/# socketio:/g' Procfile
sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile

bench get-app erpnext https://github.com/frappe/erpnext --branch ${BRANCH_NAME} --resolve-deps --skip-assets
bench get-app erpnext https://github.com/frappe/erpnext --branch "version-15" --resolve-deps --skip-assets
bench get-app beam "${GITHUB_WORKSPACE}" --skip-assets

printf '%s\n' 'frappe' 'erpnext' 'beam' > ~/frappe-bench/sites/apps.txt
Expand All @@ -51,13 +50,14 @@ bench start &> bench_run_logs.txt &
CI=Yes &
bench --site test_site reinstall --yes --admin-password admin

bench --site test_site migrate
bench --site test_site build

bench setup requirements --dev

echo "BENCH VERSION NUMBERS:"
bench version
echo "SITE LIST-APPS:"
bench list-apps

bench start &> bench_run_logs.txt &
CI=Yes &
bench execute 'beam.tests.setup.before_test'
169 changes: 0 additions & 169 deletions .github/validate_customizations.py

This file was deleted.

29 changes: 29 additions & 0 deletions .github/workflows/code-duplication.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Code Duplication

on:
push:
branches: ["*"]
pull_request:
branches: ["*"]

permissions:
contents: read
pull-requests: write
issues: write

jobs:
duplication:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/setup-node@v4
with:
node-version: '18'

- uses: agritheory/test_utils/actions/code_duplication@main
with:
max_clones: 60
max_percentage: 5.0
23 changes: 23 additions & 0 deletions .github/workflows/generate-changelog.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Generate Changelog

on:
pull_request:
types: [opened, reopened, synchronize]
issue_comment:
types: [created]

jobs:
generate-changelog:
runs-on: ubuntu-latest
permissions:
contents: read
pull-requests: write

steps:
- uses: actions/checkout@v4

- name: Generate Changelog
uses: agritheory/test_utils/actions/generate_changelog@main
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
anthropic-api-key: ${{ secrets.ANTHROPIC_API_KEY }}
50 changes: 25 additions & 25 deletions .github/workflows/generate_matrix.yaml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
name: Generate Matrix
on:
push:
branches:
- version-14
- version-15
pull_request:
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
jobs:
generate:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Generate Scanning Decision Matrix
run: python3 ./beam/docs/generate_matrix.py
name: Generate Matrix

on:
push:
branches:
- version-14
- version-15
pull_request:

env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
generate:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: '3.10'

- name: Generate Scanning Decision Matrix
run: python3 ./beam/docs/generate_matrix.py
4 changes: 1 addition & 3 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ name: Linters
on:
push:
branches:
- version-15
- version-14
pull_request:
branches:
- version-15
pull_request:

env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/overrides.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Track Overrides

on:
pull_request:
branches:
- version-14
- version-15

jobs:
track_overrides:
runs-on: ubuntu-latest
name: Track Overrides
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Track Overrides
uses: agritheory/test_utils/actions/track_overrides@main
with:
app: beam
Loading