Skip to content

[pull] develop from frappe:develop#372

Merged
pull[bot] merged 17 commits into
thispl:developfrom
frappe:develop
Jun 24, 2026
Merged

[pull] develop from frappe:develop#372
pull[bot] merged 17 commits into
thispl:developfrom
frappe:develop

Conversation

@pull

@pull pull Bot commented Jun 24, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

akhtarmohsin and others added 17 commits June 17, 2026 15:18
- Rename Balance column to Outstanding Amount
- Add Department, Branch, Advance Account filters with multi-select support
- Add Group By filter (Employee, Department, Branch) with subtotals and grand total
- Add Advance Account column to report output
- Resolve department from Employee record when not set on Employee Advance
- Add bold formatter for group header rows

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…Summary

- Use frappe._dict(filters) and dot-access instead of filters.get()
- Use frappe.utils.scrub() to derive group field from group_by label
- Use OrderedDict for deterministic group ordering (as in gross_profit report)
- Remove manual GROUP_BY_FIELDS mapping
- Use frappe.query_builder.Order instead of pypika.Order
- Build result rows inline during grouping iteration

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…oyee

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…nd group header

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- Revert filters.key dot-access to filters.get("key") to match hrms conventions
- Remove group_field variable; use scrub(filters.get("group_by")) inline
  matching gross_profit report pattern
- Show employee ID and name in Employee column and group header

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…y creation to avoid empty exchange gain/loss account error
…ry-report

feat(report): enhance Employee Advance Summary report
…ent_exchange_rate

fix: creating payment entry for Employee Advance asks for Exchange Gain/Loss Account even for same currency
fix: add permission check for insert_shift mutations
@pull pull Bot locked and limited conversation to collaborators Jun 24, 2026
@pull pull Bot added the ⤵️ pull label Jun 24, 2026
@pull pull Bot merged commit d63ee95 into thispl:develop Jun 24, 2026
10 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants