Skip to content

[pull] develop from frappe:develop - #434

Merged
pull[bot] merged 12 commits into
thispl:developfrom
frappe:develop
Sep 4, 2026
Merged

pull[bot] merged 12 commits into
thispl:developfrom
frappe:develop

Conversation

@pull

@pull pull Bot commented Sep 4, 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 : )

nareshkannasln and others added 12 commits August 28, 2026 20:31
The three salary slip print formats HR currently ships were all built with
the Print Format Builder, which cannot express a net pay band, a year to date
column, or an attendance breakdown. These three are custom Jinja formats and
cover the layouts people usually rebuild by hand.

- Classic: everyday payslip. Employee and period details, earnings against
  deductions, net pay band with amount in words.
- Detailed: full statement. Year to date per component, five way attendance
  breakdown, leave balances and the annual income tax working.
- Compact: short slip for emailing. Net pay leads, a single ledger for
  earnings and deductions, fits in roughly half a page.

All three are greyscale so they never clash with a company letter head, and
they degrade gracefully: leave balance and income tax blocks are hidden when
the slip carries no such data, and rows flagged do_not_include_in_total are
skipped so the printed column always sums to the totals on the document.

The existing three formats are left untouched, so no saved default breaks.
The templates picked the net pay figure with `doc.rounded_total or
doc.net_pay`. rounded_total is always populated by set_net_pay, so that
expression always resolved to the rounded figure, while total_in_words is
built from net_pay when Payroll Settings has disable_rounded_total enabled.
With rounding disabled the printed number and the amount in words disagreed
by the fractional part.

Mirror the controller's selection instead, so the number and the words are
always derived from the same value. The `or doc.net_pay` fallback is kept
for the rounding-enabled path to stay safe on slips with no rounded_total.
feat: enable allow data import for the doctypes
…cess_toast

fix(pwa): false "check-in successful" message when Employee Checkin isn't actually created
feat: add Classic, Detailed and Compact salary slip print formats
fix: update employee permission filters in payroll entry
@pull pull Bot locked and limited conversation to collaborators Sep 4, 2026
@pull pull Bot added the ⤵️ pull label Sep 4, 2026
@pull
pull Bot merged commit 8e85dfa into thispl:develop Sep 4, 2026
12 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.

4 participants