feat: add work assignment doctype with member hour tracking (LAN-885) by MarcCon · Pull Request #294 · alyf-de/landa

MarcCon · 2026-01-12T08:45:27Z

This PR enables tracking of work hours for members through work assignments.

Features:

Work Assignment DocType
Work Hours Report
button to create work assignments directly from a member record

Open Questions:
Do we need a hourly account for a member? It is not necessary for the report.

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

barredterra

Good start!

I think in the requirements I read that each Organization should be able to specify a number of working hours per year and we need to track the members´ actual working hours against that. And, ideally, also allow carrying over excess working hours to the next year.

Let's also add the Work Assignment to the connections in the LANDA Member form.

MarcCon · 2026-01-26T09:39:04Z

Good start!

I think in the requirements I read that each Organization should be able to specify a number of working hours per year and we need to track the members´ actual working hours against that. And, ideally, also allow carrying over excess working hours to the next year.

Let's also add the Work Assignment to the connections in the LANDA Member form.

My idea would be to add a DocType "Organization Work Hours" with a child table to show members of the organization with their hours from the Work Assignment DocType and validate them against the target hours.

barredterra · 2026-01-26T11:34:06Z

See my alternative proposal in LAN-885

barredterra · 2026-04-08T11:24:02Z

@MarcCon exactly, die Rechte haben gefehlt, sodass niemand buchen kann. Das müsste noch gefixt werden.

MarcCon · 2026-04-09T12:12:36Z

Ah habs falsch verstanden, alles klar.

MarcCon · 2026-04-09T15:59:58Z

Die offenen Issues sind erledigt, ich teste es noch als normaler Nutzer durch.

Edit:
Als Nutzer mit der Rolle "LANDA Local Organization Management" kann ich ein Work Assignment nur für den Verein des Nutzers erstellen. Ebenso sehe ich nur Work Assignments und Work Ledger Entries dieses Vereines.

In beiden Reports kann ich in den Filtern auch nur den eigenen Verein auswählen und ansehen.

MarcCon · 2026-06-15T07:18:41Z

@greptile

greptile-apps · 2026-06-15T07:23:48Z

Confidence Score: 4/5

Mostly safe to merge; create_yearly_negative_entries has no guard against being run more than once in the same year, which would double every member's annual obligation.

The core submit/cancel ledger logic is correct and the previously flagged delete bug is properly fixed. The one remaining concern is that create_yearly_negative_entries is not idempotent — a second execution (scheduler restart, manual console call, test run) silently creates duplicate obligation entries for every member with no way to detect them automatically.

landa/organization_management/doctype/work_ledger_entry/work_ledger_entry.py — the yearly scheduler function needs a duplicate-run guard.

Sequence Diagram

%%{init: {'theme': 'neutral'}}%%
sequenceDiagram
    participant User
    participant WorkAssignment
    participant WorkLedgerEntry
    participant Scheduler
    participant Organization

    User->>WorkAssignment: Submit
    WorkAssignment->>WorkLedgerEntry: insert() per member row
    Note over WorkLedgerEntry: hours_change = member.duration

    User->>WorkAssignment: Cancel
    WorkAssignment->>WorkLedgerEntry: delete_doc() per linked entry

    Scheduler->>WorkLedgerEntry: create_yearly_negative_entries() [Jan 1]
    WorkLedgerEntry->>Organization: "get_list (expected_work_hours_per_year > 0)"
    WorkLedgerEntry->>WorkLedgerEntry: insert(-expected_hours) per member

    User->>Organization: Save (change expected_work_hours_per_year)
    Organization->>WorkLedgerEntry: create_expected_hours_adjustment_entries(old - new)
    WorkLedgerEntry->>WorkLedgerEntry: insert(adjustment) per member

%%{init: {'theme': 'base', 'themeVariables': {"darkMode": true, "background": "#0d1117", "primaryColor": "#21262d", "primaryTextColor": "#e6edf3", "primaryBorderColor": "#8b949e", "lineColor": "#8b949e", "textColor": "#e6edf3", "edgeLabelBackground": "#161b22", "actorBkg": "#21262d", "actorBorder": "#8b949e", "actorTextColor": "#e6edf3", "actorLineColor": "#8b949e", "signalColor": "#8b949e", "signalTextColor": "#e6edf3", "noteBkgColor": "#373320", "noteBorderColor": "#d4a72c", "noteTextColor": "#f0e6c0", "labelBoxBkgColor": "#21262d", "labelBoxBorderColor": "#8b949e", "labelTextColor": "#e6edf3", "loopTextColor": "#e6edf3", "activationBkgColor": "#30363d", "activationBorderColor": "#8b949e"}}}%%
sequenceDiagram
    participant User
    participant WorkAssignment
    participant WorkLedgerEntry
    participant Scheduler
    participant Organization

    User->>WorkAssignment: Submit
    WorkAssignment->>WorkLedgerEntry: insert() per member row
    Note over WorkLedgerEntry: hours_change = member.duration

    User->>WorkAssignment: Cancel
    WorkAssignment->>WorkLedgerEntry: delete_doc() per linked entry

    Scheduler->>WorkLedgerEntry: create_yearly_negative_entries() [Jan 1]
    WorkLedgerEntry->>Organization: "get_list (expected_work_hours_per_year > 0)"
    WorkLedgerEntry->>WorkLedgerEntry: insert(-expected_hours) per member

    User->>Organization: Save (change expected_work_hours_per_year)
    Organization->>WorkLedgerEntry: create_expected_hours_adjustment_entries(old - new)
    WorkLedgerEntry->>WorkLedgerEntry: insert(adjustment) per member

_{Reviews (3): Last reviewed commit: "Merge branch 'version-15-hotfix' into la..." | Re-trigger Greptile}

MarcCon · 2026-06-25T08:18:54Z

@greptile

greptile-apps · 2026-06-25T08:27:11Z

+def create_yearly_negative_entries():
+	"""Create negative Work Ledger Entries for all members based on expected work hours per year."""
+
+	organizations = frappe.get_list(
+		"Organization",
+		filters={"expected_work_hours_per_year": [">", 0]},
+		fields=["name", "expected_work_hours_per_year"],
+	)
+
+	if not organizations:
+		return
+
+	# Get all active members for each organization
+	for org in organizations:
+		members = frappe.get_list(
+			"LANDA Member",
+			filters={"organization": org.name},
+			fields=["name"],
+		)
+
+		for member in members:
+			ledger_entry = frappe.new_doc("Work Ledger Entry")
+			ledger_entry.member = member.name
+			ledger_entry.organization = org.name
+			ledger_entry.date = f"{now_datetime().year}-01-01"
+			ledger_entry.hours_change = -org.expected_work_hours_per_year
+			ledger_entry.insert()


No idempotency guard in create_yearly_negative_entries

If this function runs more than once for the same year — scheduler restart, a manual frappe bench execute call during maintenance, or a test run — every member in every qualifying organisation gets duplicate negative entries. Because there is no check for an existing entry dated {year}-01-01 without a work_assignment, the second run silently doubles every member's annual obligation. The corruption is permanent and would require manual clean-up per member.

A safe guard would be to skip creating entries for any member that already has a no-work_assignment entry on {year}-01-01 for the current run year.

MarcCon added 9 commits January 8, 2026 10:15

feat: add work assignment doctype and child table

ea53b45

feat: add organization filter for member

78526c9

feat: set organization based on user role

57c06f8

feat: add work hours report

382fb35

fix: permissions for work assignment

9bdf1a6

feat: create work assignment from member

5d6e57b

fix: remove accidentally committed file

2a1eaf5

fix: correct organization assignment

5a16aa2

feat: add translations

11b4cf1

MarcCon requested a review from barredterra January 12, 2026 08:45

github-advanced-security AI found potential problems Jan 12, 2026

View reviewed changes

Comment thread landa/organization_management/doctype/work_assignment/work_assignment.py Fixed

Comment thread landa/organization_management/doctype/work_assignment/test_work_assignment.py Fixed

MarcCon and others added 3 commits January 16, 2026 09:23

fix: delete unnecessary pass

6863069

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

fix: unused import

0549fc0

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

Merge remote-tracking branch 'upstream/version-15-hotfix' into lan-885

819edf4

barredterra reviewed Jan 16, 2026

View reviewed changes

Comment thread landa/organization_management/doctype/work_assignment/work_assignment.js Outdated

Comment thread landa/organization_management/doctype/work_assignment/work_assignment.json Outdated

Comment thread landa/organization_management/report/work_hours/work_hours.py

barredterra assigned MarcCon Jan 16, 2026

MarcCon added 3 commits January 26, 2026 10:23

refactor: use get_list instread of raw sql

adb72ba

fix: use hash naming

bf410c6

fix: js filter

1716666

MarcCon requested a review from barredterra January 26, 2026 09:39

MarcCon added 6 commits January 28, 2026 15:57

feat: make work assignment submittable

0f22296

feat(Organization): add work hours field

ba6cb69

feat: add work ledger entry doctype

c662199

feat: create and delete work ledger entry from work assignment

ab8fa6c

feat: create yearly negative entries

0f53b47

feat(Work Ledger Entry): filter members of organization

9c6798b

barredterra assigned barredterra and unassigned MarcCon Feb 11, 2026

fix: type error

7ccf61a

fix(Work Assignment): update permissions

ad85f12

MarcCon requested a review from barredterra April 9, 2026 17:58

fix: remove unnecessary pass

efb8f7d

barredterra assigned barredterra and unassigned MarcCon Apr 21, 2026

MarcCon and others added 2 commits April 23, 2026 18:04

Merge branch 'version-15-hotfix' into lan-885

604156f

Merge branch 'version-15-hotfix' into lan-885

643f818

barredterra reviewed Apr 25, 2026

View reviewed changes

Comment thread landa/organization_management/doctype/work_assignment/test_work_assignment.py Outdated

barredterra added 2 commits April 28, 2026 00:40

test: build on FrappeTestCase

c6f32c5

fix: work assignment data in work ledger balance

870e774

barredterra requested changes Apr 27, 2026

View reviewed changes

barredterra assigned MarcCon and unassigned barredterra Apr 27, 2026

MarcCon added 4 commits May 5, 2026 16:49

feat: add doctype shortcuts to workspace

7855ce2

feat(Work Assignment): show title in link

179be9f

fix(Organization): update link to Work Assignment

6fcb6ce

fix(Work Hours Report): activate add_total_row

4c3e8bb

greptile-apps Bot reviewed Jun 15, 2026

View reviewed changes

Comment thread landa/organization_management/doctype/work_assignment/work_assignment.py Outdated

Comment thread landa/organization_management/doctype/work_assignment_member/work_assignment_member.json

Comment thread landa/organization_management/doctype/work_assignment/work_assignment.json

MarcCon and others added 3 commits June 15, 2026 09:48

fix(Work Assignment): delete work ledger entries

79e4375

feat(Work Ledger Entry): disable form when connected to work assignment

5da3c1e

Merge branch 'version-15-hotfix' into lan-885

2ed1318

greptile-apps Bot reviewed Jun 25, 2026

View reviewed changes

MarcCon requested a review from barredterra June 25, 2026 09:37

Uh oh!

Conversation

MarcCon commented Jan 12, 2026

Uh oh!

Uh oh!

Uh oh!

barredterra left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MarcCon commented Jan 26, 2026

Uh oh!

barredterra commented Jan 26, 2026

Uh oh!

barredterra commented Apr 8, 2026

Uh oh!

MarcCon commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MarcCon commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MarcCon commented Jun 15, 2026

Uh oh!

greptile-apps Bot commented Jun 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Confidence Score: 4/5

Sequence Diagram

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MarcCon commented Jun 25, 2026

Uh oh!

greptile-apps Bot Jun 25, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

barredterra left a comment •

edited

Loading

MarcCon commented Apr 9, 2026 •

edited

Loading

MarcCon commented Apr 9, 2026 •

edited

Loading

greptile-apps Bot commented Jun 15, 2026 •

edited

Loading