From: Bernd Bleßmann Date: Mon, 28 Dec 2020 19:00:17 +0000 (+0100) Subject: Zeiterfassung: SimpleSettings für Artikel X-Git-Tag: kivitendo-mebil_0.1-0~9^2~320 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=2b5d900517ad375ae4875874a4c4832e9ec3c223;p=kivitendo-erp.git Zeiterfassung: SimpleSettings für Artikel --- diff --git a/SL/Controller/SimpleSystemSetting.pm b/SL/Controller/SimpleSystemSetting.pm index f8dd4bc49..463d74fb3 100644 --- a/SL/Controller/SimpleSystemSetting.pm +++ b/SL/Controller/SimpleSystemSetting.pm @@ -268,6 +268,20 @@ my %supported_types = ( ], }, + time_recording_article => { + # Make locales.pl happy: $self->render("simple_system_setting/_time_recording_article_form") + class => 'TimeRecordingArticle', + auth => 'config', + titles => { + list => t8('Time Recording Articles'), + add => t8('Add time recording article'), + edit => t8('Edit time recording article'), + }, + list_attributes => [ + { title => t8('Article'), formatter => sub { $_[0]->part->displayable_name } }, + ], + }, + ); my @default_list_attributes = ( diff --git a/locale/de/all b/locale/de/all index cb1dd1ac3..616379e41 100755 --- a/locale/de/all +++ b/locale/de/all @@ -241,6 +241,7 @@ $self->{texts} = { 'Add sub function block' => 'Unterfunktionsblock hinzufügen', 'Add taxzone' => 'Steuerzone hinzufügen', 'Add text block' => 'Textblock erfassen', + 'Add time recording article' => 'Artikel für Zeiterfassung erfassen', 'Add title' => 'Titel hinzufügen', 'Add unit' => 'Einheit hinzufügen', 'Added sections and function blocks: #1' => 'Hinzugefügte Abschnitte und Funktionsblöcke: #1', @@ -1273,6 +1274,7 @@ $self->{texts} = { 'Edit the request_quotation' => 'Bearbeiten der Preisanfrage', 'Edit the sales_order' => 'Bearbeiten des Auftrags', 'Edit the sales_quotation' => 'Bearbeiten des Angebots', + 'Edit time recording article' => 'Artikel für Zeiterfassung bearbeiten', 'Edit time recordings of all staff members' => 'Zeiterfassungseinträge aller Mitarbeiter bearbeiten', 'Edit title' => 'Titiel bearbeiten', 'Edit units' => 'Einheiten bearbeiten', @@ -3753,6 +3755,7 @@ $self->{texts} = { 'Time' => 'Zeit', 'Time Format' => 'Uhrzeitformat', 'Time Recording' => 'Zeiterfassung', + 'Time Recording Articles' => 'Artikel für Zeiterfassung', 'Time Recordings' => 'Zeiterfassung', 'Time and price estimate' => 'Zeit- und Preisschätzung', 'Time estimate' => 'Zeitschätzung', diff --git a/locale/en/all b/locale/en/all index ee4f24f34..e427f3cc5 100644 --- a/locale/en/all +++ b/locale/en/all @@ -241,6 +241,7 @@ $self->{texts} = { 'Add sub function block' => '', 'Add taxzone' => '', 'Add text block' => '', + 'Add time recording article' => '', 'Add title' => '', 'Add unit' => '', 'Added sections and function blocks: #1' => '', @@ -1273,6 +1274,7 @@ $self->{texts} = { 'Edit the request_quotation' => '', 'Edit the sales_order' => '', 'Edit the sales_quotation' => '', + 'Edit time recording article' => '', 'Edit time recordings of all staff members' => '', 'Edit title' => '', 'Edit units' => '', @@ -3751,6 +3753,7 @@ $self->{texts} = { 'Time' => '', 'Time Format' => '', 'Time Recording' => '', + 'Time Recording Articles' => '', 'Time Recordings' => '', 'Time and price estimate' => '', 'Time estimate' => '', diff --git a/menus/user/10-time-recording.yaml b/menus/user/10-time-recording.yaml index dfa1d53ec..eab685f05 100644 --- a/menus/user/10-time-recording.yaml +++ b/menus/user/10-time-recording.yaml @@ -1,4 +1,11 @@ --- +- parent: system + id: system_time_recording_articles + name: Time Recording Articles + order: 2370 + params: + action: SimpleSystemSetting/list + type: time_recording_article - parent: productivity id: productivity_time_recording name: Time Recording diff --git a/templates/webpages/simple_system_setting/_time_recording_article_form.html b/templates/webpages/simple_system_setting/_time_recording_article_form.html new file mode 100644 index 000000000..2c7ddf34a --- /dev/null +++ b/templates/webpages/simple_system_setting/_time_recording_article_form.html @@ -0,0 +1,11 @@ +[%- USE LxERP -%] +[%- USE L -%] +[%- USE P -%] + + + + + +
[% LxERP.t8("Article") %] + [% P.part.picker('object.part_id', SELF.object.part, convertible_unit='min', "data-validate"="required", "data-title"=LxERP.t8("Article")) %] +