Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
6d5a14e
fix: French translations
frappe-pr-bot Jun 1, 2026
e51d6f4
fix: Arabic translations
frappe-pr-bot Jun 1, 2026
b7bc277
fix: Italian translations
frappe-pr-bot Jun 1, 2026
e44ec97
fix: Swedish translations
frappe-pr-bot Jun 1, 2026
e984bd0
fix: Chinese Simplified translations
frappe-pr-bot Jun 1, 2026
186f761
fix: Persian translations
frappe-pr-bot Jun 1, 2026
3aefb6a
fix: Thai translations
frappe-pr-bot Jun 1, 2026
c95b364
fix: Croatian translations
frappe-pr-bot Jun 1, 2026
cd08711
fix: Bosnian translations
frappe-pr-bot Jun 1, 2026
9788f39
fix: Esperanto translations
frappe-pr-bot Jun 1, 2026
b5dd4ba
fix: Spanish translations
frappe-pr-bot Jun 1, 2026
a7e177c
fix: Czech translations
frappe-pr-bot Jun 1, 2026
416a385
fix: Danish translations
frappe-pr-bot Jun 1, 2026
d89ab19
fix: German translations
frappe-pr-bot Jun 1, 2026
039ac9e
fix: Hungarian translations
frappe-pr-bot Jun 1, 2026
3af01ba
fix: Dutch translations
frappe-pr-bot Jun 1, 2026
2e0cbfa
fix: Polish translations
frappe-pr-bot Jun 1, 2026
352ef34
fix: Portuguese translations
frappe-pr-bot Jun 1, 2026
544f58c
fix: Russian translations
frappe-pr-bot Jun 1, 2026
b69b2e9
fix: Slovenian translations
frappe-pr-bot Jun 1, 2026
139e83d
fix: Serbian (Cyrillic) translations
frappe-pr-bot Jun 1, 2026
d5d77aa
fix: Turkish translations
frappe-pr-bot Jun 1, 2026
99b99af
fix: Vietnamese translations
frappe-pr-bot Jun 1, 2026
849606b
fix: Portuguese, Brazilian translations
frappe-pr-bot Jun 1, 2026
a0f1df7
fix: Indonesian translations
frappe-pr-bot Jun 1, 2026
bf887dc
fix: Burmese translations
frappe-pr-bot Jun 1, 2026
2889285
fix: Norwegian Bokmal translations
frappe-pr-bot Jun 1, 2026
0ede5a7
fix: Serbian (Latin) translations
frappe-pr-bot Jun 1, 2026
99e25db
fix: Korean translations
frappe-pr-bot Jun 1, 2026
1d73b1b
feat: build and upload assets to GitHub Releases
rmehta Jun 2, 2026
dafeb62
Merge pull request #4627 from rmehta/feat/build-and-upload-assets
asmitahase Jun 3, 2026
40f3665
Merge pull request #4626 from frappe/l10n_develop
asmitahase Jun 3, 2026
b3c0cf2
fix: make reason_for_adjustment optional in create_leave_adjustment m…
elshafei-developer Jun 3, 2026
c54e24e
Merge pull request #4635 from elshafei-developer/fix-make-reason_for_…
asmitahase Jun 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
70 changes: 70 additions & 0 deletions .github/workflows/build-and-commit-assets.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
name: Build and Upload Assets

on:
push:
branches:
- develop
- 'version-*'

concurrency:
group: build-assets-${{ github.ref }}
cancel-in-progress: true

permissions:
contents: write

jobs:
build-assets:
name: Build JS/CSS and upload to release
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
repository: frappe/frappe
path: apps/frappe
ref: ${{ github.ref_name }}

- uses: actions/checkout@v4
with:
path: apps/hrms

- name: Create bench structure
run: |
mkdir -p sites
printf "frappe\nhrms\n" > sites/apps.txt

- uses: actions/setup-node@v4
with:
node-version: 24
cache: yarn
cache-dependency-path: apps/frappe/yarn.lock

- name: Install frappe JS dependencies
working-directory: apps/frappe
run: yarn install --frozen-lockfile

- name: Install hrms JS dependencies
working-directory: apps/hrms
run: yarn install --frozen-lockfile --ignore-scripts

- name: Link node_modules into public/
working-directory: apps/frappe
run: ln -s "$PWD/node_modules" frappe/public/node_modules

- name: Build assets (production)
working-directory: apps/frappe
run: yarn run production

- name: Package assets
working-directory: apps/hrms
run: tar czf hrms-assets.tar.gz -C ../../sites/assets/hrms dist

- name: Upload to rolling release
working-directory: apps/hrms
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
TAG="assets-${GITHUB_REF_NAME//\//-}"
gh release create "$TAG" --prerelease --title "Assets: $GITHUB_REF_NAME" --notes "" 2>/dev/null || true
gh release upload "$TAG" hrms-assets.tar.gz --clobber
2 changes: 1 addition & 1 deletion hrms/hr/doctype/leave_allocation/leave_allocation.py
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ def create_leave_adjustment(
adjustment_type: str,
leaves_to_adjust: str | float,
posting_date: str | datetime.date,
reason_for_adjustment: str,
reason_for_adjustment: str | None = None,
) -> None:
leave_adjustment = frappe.new_doc(
"Leave Adjustment",
Expand Down
Loading
Loading