Mandantenkonfig: Standard-Stundensatz

diff --git a/SL/Controller/ClientConfig.pm b/SL/Controller/ClientConfig.pm
index c0c3593bbbb81c26fa58b65fe6ae0945935a27ce..9292ee441a08cd93bfabd269fd77541db78ab71d 100644 (file)
--- a/SL/Controller/ClientConfig.pm
+++ b/SL/Controller/ClientConfig.pm
@@ -40,6 +40,8 @@ sub action_save {
     undef $defaults->{$_} if !$defaults->{$_};
   }
 
     undef $defaults->{$_} if !$defaults->{$_};
   }
 

+  $defaults->{$_} = $::form->parse_amount(\%::myconfig, $defaults->{$_}) for qw(customer_hourly_rate);
+

   $self->defaults->assign_attributes(%{ $defaults });
 
   my %errors_idx;
   $self->defaults->assign_attributes(%{ $defaults });
 
   my %errors_idx;

diff --git a/locale/de/all b/locale/de/all
index 20cd542af6eec08fcc991470e6ce6a9b53172819..a6ea88c87b42793b935e48773af5868f3e609a29 100755 (executable)
--- 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 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',
   '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 c0ba2f0ef76f5684adcda2e50c5c5d2c1c6fc4c8..86ab2485eba236842435a49e76e0c487a5209921 100644 (file)
--- a/templates/webpages/client_config/_features.html
+++ b/templates/webpages/client_config/_features.html
@@ -27,6 +27,12 @@
    <td>[% LxERP.t8('Automatic deletion of leading, trailing and excessive (repetitive) spaces in customer or vendor names') %]</td>
   </tr>
 
    <td>[% LxERP.t8('Automatic deletion of leading, trailing and excessive (repetitive) spaces in customer or vendor names') %]</td>
   </tr>
 

+  <tr>
+   <td align="right">[% LxERP.t8('Hourly Rate') %]</td>
+   <td>[% L.input_tag('defaults.customer_hourly_rate', LxERP.format_amount(SELF.defaults.customer_hourly_rate, 2), style=style) %]</td>
+   <td>[% LxERP.t8('Default hourly rate for new customers') %]</td>
+  </tr>
+

   <tr><td class="listheading" colspan="4">[% LxERP.t8("Parts Master Data") %]</td></tr>
 
   <tr>
   <tr><td class="listheading" colspan="4">[% LxERP.t8("Parts Master Data") %]</td></tr>
 
   <tr>