From: Moritz Bunkus Date: Thu, 4 Jul 2013 07:43:43 +0000 (+0200) Subject: Mandantenkonfig: Standard-Stundensatz X-Git-Tag: release-3.2.0beta~467^2~139 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=5d0c2933e983d083afdb15afd5ec24b34fcdd3c6;p=kivitendo-erp.git Mandantenkonfig: Standard-Stundensatz --- diff --git a/SL/Controller/ClientConfig.pm b/SL/Controller/ClientConfig.pm index c0c3593bb..9292ee441 100644 --- a/SL/Controller/ClientConfig.pm +++ b/SL/Controller/ClientConfig.pm @@ -40,6 +40,8 @@ sub action_save { undef $defaults->{$_} if !$defaults->{$_}; } + $defaults->{$_} = $::form->parse_amount(\%::myconfig, $defaults->{$_}) for qw(customer_hourly_rate); + $self->defaults->assign_attributes(%{ $defaults }); my %errors_idx; diff --git a/locale/de/all b/locale/de/all index 20cd542af..a6ea88c87 100755 --- a/locale/de/all +++ b/locale/de/all @@ -716,6 +716,7 @@ $self->{texts} = { 'Default client' => 'Standardmandant', 'Default currency' => 'Standardwährung', 'Default currency missing!' => 'Standardwährung fehlt!', + 'Default hourly rate for new customers' => '', 'Default output medium' => 'Standardausgabekanal', 'Default printer' => 'Standarddrucker', 'Default template format' => 'Standardvorlagenformat', diff --git a/templates/webpages/client_config/_features.html b/templates/webpages/client_config/_features.html index c0ba2f0ef..86ab2485e 100644 --- a/templates/webpages/client_config/_features.html +++ b/templates/webpages/client_config/_features.html @@ -27,6 +27,12 @@ [% LxERP.t8('Automatic deletion of leading, trailing and excessive (repetitive) spaces in customer or vendor names') %] + + [% LxERP.t8('Hourly Rate') %] + [% L.input_tag('defaults.customer_hourly_rate', LxERP.format_amount(SELF.defaults.customer_hourly_rate, 2), style=style) %] + [% LxERP.t8('Default hourly rate for new customers') %] + + [% LxERP.t8("Parts Master Data") %]