From 8bf1fc96aa2da3aa3fa957b78e943d9969484cd2 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 31 Jan 2013 15:13:14 +0100 Subject: [PATCH] =?utf8?q?Kundenstammdaten:=20Stundensatz=20bearbeiten=20k?= =?utf8?q?=C3=B6nnen?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/Controller/CustomerVendor.pm | 1 + config/kivitendo.conf.default | 7 +++++++ locale/de/all | 1 + templates/webpages/customer_vendor/tabs/billing.html | 7 +++++++ 4 files changed, 16 insertions(+) diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm index 3b6db2903..1acd528b0 100644 --- a/SL/Controller/CustomerVendor.pm +++ b/SL/Controller/CustomerVendor.pm @@ -641,6 +641,7 @@ sub _instantiate_args { $self->{cv}->taxincluded_checked(undef); } + $self->{cv}->hourly_rate($::lx_office_conf{'features/customer'}->{default_hourly_rate}) if $self->is_customer && !$self->{cv}->hourly_rate; foreach my $cvar (@{$self->{cv}->cvars_by_config()}) { my $value = $::form->{cv_cvars}->{$cvar->config->name}; diff --git a/config/kivitendo.conf.default b/config/kivitendo.conf.default index 0005aba59..9cdf4d26d 100644 --- a/config/kivitendo.conf.default +++ b/config/kivitendo.conf.default @@ -65,6 +65,13 @@ bind_password = # and "en" (English, not perfect) are available. language = de +[features] + +[features/customer] +# Default for the 'hourly rate' input in the customer master data +# dialog. +default_hourly_rate = 100 + [paths] # path to temporary files (must be writeable by the web server) userspath = users diff --git a/locale/de/all b/locale/de/all index fe9a81456..390fd797d 100755 --- a/locale/de/all +++ b/locale/de/all @@ -1093,6 +1093,7 @@ $self->{texts} = { 'History Search Engine' => 'Historien Suchmaschine', 'Homepage' => 'Homepage', 'Host' => 'Datenbankcomputer', + 'Hourly rate' => 'Stundensatz', 'However, you can create a new part which will then be selected.' => 'Sie können jedoch einen neuen Artikel anlegen, der dann automatisch ausgewählt wird.', 'I' => 'I', 'IBAN' => 'IBAN', diff --git a/templates/webpages/customer_vendor/tabs/billing.html b/templates/webpages/customer_vendor/tabs/billing.html index c65bed08f..d67740a9f 100644 --- a/templates/webpages/customer_vendor/tabs/billing.html +++ b/templates/webpages/customer_vendor/tabs/billing.html @@ -339,6 +339,13 @@ [% END %] + + [% IF ( SELF.is_customer() ) %] + + [%- LxERP.t8("Hourly rate") %] + [% L.input_tag("cv.hourly_rate_as_number", SELF.cv.hourly_rate_as_number) %] + + [% END %] -- 2.20.1