Skip to content

feat(Working Time): whole day timesheets #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
barredterra merged 6 commits into from
Jun 11, 2026
Merged

feat(Working Time): whole day timesheets #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5bdeea8
refactor(Working Time): insert_timesheet
barredterra Jun 11, 2026
aeaef6a
feat(Working Time): whole day timesheets
barredterra Jun 11, 2026
62e17f9
fix(Working Time): fall back to hourly rate
barredterra Jun 11, 2026
1320ed6
refactor: shared get_project_details
barredterra Jun 11, 2026
1c6193d
feat(Working Time): enforce time log requirement for whole day projec…
barredterra Jun 11, 2026
896abc4
chore: update translations
barredterra Jun 11, 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
8 changes: 8 additions & 0 deletions working_time/hooks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,14 @@
"insert_after": "cost_center",
"translatable": 0,
},
{
"fieldname": "billing_rate_per_day",
"label": "Billing Rate per Day",
"fieldtype": "Currency",
"options": "currency",
"insert_after": "billing_rate",
"translatable": 0,
},
{
"fieldname": "jira_section",
"label": "Jira",
Expand Down
35 changes: 27 additions & 8 deletions working_time/locale/de.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Working Time VERSION\n"
"Report-Msgid-Bugs-To: hallo@alyf.de\n"
"POT-Creation-Date: 2026-05-26 23:08+0053\n"
"POT-Creation-Date: 2026-06-11 17:09+0053\n"
"PO-Revision-Date: 2026-03-27 14:57+0053\n"
"Last-Translator: hallo@alyf.de\n"
"Language-Team: hallo@alyf.de\n"
Expand Down Expand Up @@ -217,6 +217,12 @@ msgstr "Freelancer-Zeit"
msgid "Freelancer Time Log"
msgstr "Freelancer-Zeiteintrag"

#. Description of the 'Whole Day Project' (Link) field in DocType 'Working
#. Time'
#: working_time/working_time/doctype/working_time/working_time.json
msgid "If set, all time logs for this project will be merged into a single 8-hour timesheet."
msgstr "Wenn gesetzt, werden alle Einträge für dieses Projekt in ein 8-Stunden-Timesheet zusammengefasst."

#. Description of the 'Note' (Small Text) field in DocType 'Working Time Log'
#: working_time/working_time/doctype/working_time_log/working_time_log.json
msgid "If the Issue Key is missing or needs additional explanation. Start with a \"+\" to get this printed on the invoice."
Expand Down Expand Up @@ -258,6 +264,10 @@ msgstr "Maximale produktive Arbeitszeit pro Tag"
msgid "Min Rest Between Days"
msgstr "Mindest-Ruhezeit zwischen Tagen"

#: working_time/working_time/doctype/working_time/working_time.py:188
msgid "Missing Time Log"
msgstr "Fehlender Zeiteintrag"

#. Label of a shortcut in the Time Tracking Workspace
#: working_time/working_time/workspace/time_tracking/time_tracking.json
msgid "New Freelancer Time"
Expand Down Expand Up @@ -286,11 +296,15 @@ msgstr "Bezahlte Pausenzeit"
msgid "Paid Working Time"
msgstr "Bezahlte Arbeitszeit"

#: working_time/working_time/doctype/working_time/working_time.py:64
#: working_time/working_time/doctype/working_time/working_time.py:65
msgid "Please add an issue key or invoice note to the billable row {0}"
msgstr "Bitte einen Issue-Key oder eine Rechnungsnotiz zur abrechenbaren Zeile {0} hinzufügen"

#: working_time/working_time/doctype/working_time/working_time.py:55
#: working_time/working_time/doctype/working_time/working_time.py:185
msgid "Please add at least one time log for the whole day project {0}."
msgstr "Bitte mindestens einen Zeiteintrag für das Ganztagesprojekt {0} hinzufügen."

#: working_time/working_time/doctype/working_time/working_time.py:56
msgid "Please fix negative duration in row {0}"
msgstr "Bitte negative Dauer in Zeile {0} korrigieren"

Expand All @@ -299,11 +313,11 @@ msgstr "Bitte negative Dauer in Zeile {0} korrigieren"
msgid "Productive Time"
msgstr "Produktive Arbeitszeit"

#: working_time/working_time/doctype/working_time/working_time.py:116
#: working_time/working_time/doctype/working_time/working_time.py:117
msgid "Productive time ({0}) exceeds the maximum allowed ({1}) per day"
msgstr "Produktive Arbeitszeit ({0}) überschreitet die maximal erlaubte ({1}) pro Tag"

#: working_time/working_time/doctype/working_time/working_time.py:129
#: working_time/working_time/doctype/working_time/working_time.py:130
msgid "Productive time of {0} or more requires at least {1} of break time"
msgstr "Produktive Arbeitszeit von {0} oder mehr benötigt mindestens {1} Pausenzeit"

Expand All @@ -326,7 +340,7 @@ msgstr "Erinnerung: Arbeitszeit einreichen"
msgid "Required Break Minutes"
msgstr "Erforderliche Pausenminuten"

#: working_time/working_time/doctype/working_time/working_time.py:173
#: working_time/working_time/doctype/working_time/working_time.py:174
msgid "Rest time since previous day ({0}) is less than the required minimum ({1})"
msgstr "Die Ruhezeit seit dem Vortag ({0}) ist kürzer als das erforderliche Minimum ({1})"

Expand Down Expand Up @@ -357,6 +371,11 @@ msgstr "Das Datum in Zeile {0} liegt vor dem Startdatum."
msgid "Total Duration"
msgstr "Gesamtdauer"

#. Label of a Link field in DocType 'Working Time'
#: working_time/working_time/doctype/working_time/working_time.json
msgid "Whole Day Project"
msgstr "Ganztagesprojekt"

#. Label of a Duration field in DocType 'Working Time Break Policy'
#: working_time/working_time/doctype/working_time_break_policy/working_time_break_policy.json
msgid "Work Threshold"
Expand Down Expand Up @@ -405,11 +424,11 @@ msgstr "Arbeitszeit Zusammenfassung"
msgid "e.g. your-domain.atlassian.net"
msgstr "z.B. your-domain.atlassian.net"

#: working_time/working_time/doctype/working_time/working_time.py:89
#: working_time/working_time/doctype/working_time/working_time.py:90
msgid "{0} is a blocked day according to the Working Time Policy"
msgstr "{0} ist laut Arbeitszeitrichtlinie ein gesperrter Tag"

#: working_time/working_time/doctype/working_time/working_time.py:105
#: working_time/working_time/doctype/working_time/working_time.py:106
msgid "{0} is a holiday according to your holiday list"
msgstr "{0} ist laut Ihrer Feiertagsliste ein Feiertag"

Expand Down
37 changes: 28 additions & 9 deletions working_time/locale/main.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Working Time VERSION\n"
"Report-Msgid-Bugs-To: hallo@alyf.de\n"
"POT-Creation-Date: 2026-05-26 23:08+0053\n"
"PO-Revision-Date: 2026-05-26 23:08+0053\n"
"POT-Creation-Date: 2026-06-11 17:09+0053\n"
"PO-Revision-Date: 2026-06-11 17:09+0053\n"
"Last-Translator: hallo@alyf.de\n"
"Language-Team: hallo@alyf.de\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -207,6 +207,12 @@ msgstr ""
msgid "Freelancer Time Log"
msgstr ""

#. Description of the 'Whole Day Project' (Link) field in DocType 'Working
#. Time'
#: working_time/working_time/doctype/working_time/working_time.json
msgid "If set, all time logs for this project will be merged into a single 8-hour timesheet."
msgstr ""

#. Description of the 'Note' (Small Text) field in DocType 'Working Time Log'
#: working_time/working_time/doctype/working_time_log/working_time_log.json
msgid "If the Issue Key is missing or needs additional explanation. Start with a \"+\" to get this printed on the invoice."
Expand Down Expand Up @@ -248,6 +254,10 @@ msgstr ""
msgid "Min Rest Between Days"
msgstr ""

#: working_time/working_time/doctype/working_time/working_time.py:188
msgid "Missing Time Log"
msgstr ""

#. Label of a shortcut in the Time Tracking Workspace
#: working_time/working_time/workspace/time_tracking/time_tracking.json
msgid "New Freelancer Time"
Expand Down Expand Up @@ -276,11 +286,15 @@ msgstr ""
msgid "Paid Working Time"
msgstr ""

#: working_time/working_time/doctype/working_time/working_time.py:64
#: working_time/working_time/doctype/working_time/working_time.py:65
msgid "Please add an issue key or invoice note to the billable row {0}"
msgstr ""

#: working_time/working_time/doctype/working_time/working_time.py:55
#: working_time/working_time/doctype/working_time/working_time.py:185
msgid "Please add at least one time log for the whole day project {0}."
msgstr ""

#: working_time/working_time/doctype/working_time/working_time.py:56
msgid "Please fix negative duration in row {0}"
msgstr ""

Expand All @@ -289,11 +303,11 @@ msgstr ""
msgid "Productive Time"
msgstr ""

#: working_time/working_time/doctype/working_time/working_time.py:116
#: working_time/working_time/doctype/working_time/working_time.py:117
msgid "Productive time ({0}) exceeds the maximum allowed ({1}) per day"
msgstr ""

#: working_time/working_time/doctype/working_time/working_time.py:129
#: working_time/working_time/doctype/working_time/working_time.py:130
msgid "Productive time of {0} or more requires at least {1} of break time"
msgstr ""

Expand All @@ -316,7 +330,7 @@ msgstr ""
msgid "Required Break Minutes"
msgstr ""

#: working_time/working_time/doctype/working_time/working_time.py:173
#: working_time/working_time/doctype/working_time/working_time.py:174
msgid "Rest time since previous day ({0}) is less than the required minimum ({1})"
msgstr ""

Expand Down Expand Up @@ -347,6 +361,11 @@ msgstr ""
msgid "Total Duration"
msgstr ""

#. Label of a Link field in DocType 'Working Time'
#: working_time/working_time/doctype/working_time/working_time.json
msgid "Whole Day Project"
msgstr ""

#. Label of a Duration field in DocType 'Working Time Break Policy'
#: working_time/working_time/doctype/working_time_break_policy/working_time_break_policy.json
msgid "Work Threshold"
Expand Down Expand Up @@ -395,11 +414,11 @@ msgstr ""
msgid "e.g. your-domain.atlassian.net"
msgstr ""

#: working_time/working_time/doctype/working_time/working_time.py:89
#: working_time/working_time/doctype/working_time/working_time.py:90
msgid "{0} is a blocked day according to the Working Time Policy"
msgstr ""

#: working_time/working_time/doctype/working_time/working_time.py:105
#: working_time/working_time/doctype/working_time/working_time.py:106
msgid "{0} is a holiday according to your holiday list"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion working_time/patches.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ working_time.patches.link_timesheet_and_attendance_to_working_time # 2023-08-14
[post_model_sync]
working_time.patches.billable_time_pct # 1
working_time.patches.add_total_to_old_freelancer_time
execute:from working_time.install import make_custom_fields; make_custom_fields() # 2026-03-27
execute:from working_time.install import make_custom_fields; make_custom_fields() # 2026-06-11
working_time.patches.rename_max_working_time_to_productive_time
working_time.patches.backfill_productive_and_paid_break_time # 1
22 changes: 20 additions & 2 deletions working_time/working_time/doctype/working_time/working_time.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@
"employee",
"column_break_2",
"employee_name",
"section_break_4",
"section_break_caqe",
"date",
"column_break_lyny",
"whole_day_project",
"section_break_4",
"time_logs",
"note_explainer",
"section_break_7",
Expand Down Expand Up @@ -171,6 +174,21 @@
"hide_seconds": 1,
"label": "Productive Time",
"read_only": 1
},
{
"fieldname": "section_break_caqe",
"fieldtype": "Section Break"
},
{
"fieldname": "column_break_lyny",
"fieldtype": "Column Break"
},
{
"description": "If set, all time logs for this project will be merged into a single 8-hour timesheet.",
"fieldname": "whole_day_project",
"fieldtype": "Link",
"label": "Whole Day Project",
"options": "Project"
}
],
"grid_page_length": 50,
Expand All @@ -185,7 +203,7 @@
"link_fieldname": "working_time"
}
],
"modified": "2026-05-26 23:20:02.508838",
"modified": "2026-06-11 14:44:20.957196",
"modified_by": "Administrator",
"module": "Working Time",
"name": "Working Time",
Expand Down
Loading
Loading