From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 31 Jan 2013 14:13:14 +0000 (+0100)
Subject: Kundenstammdaten: Stundensatz bearbeiten können
X-Git-Tag: release-3.2.0beta~467^2~255
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=8bf1fc96aa2da3aa3fa957b78e943d9969484cd2;p=kivitendo-erp.git

Kundenstammdaten: Stundensatz bearbeiten können
---

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&ouml;nnen jedoch einen neuen Artikel anlegen, der dann automatisch ausgew&auml;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 %]
 
     </tr>
+
+    [% IF ( SELF.is_customer() ) %]
+     <tr>
+      <th align="right">[%- LxERP.t8("Hourly rate") %]</th>
+      <td>[% L.input_tag("cv.hourly_rate_as_number", SELF.cv.hourly_rate_as_number) %]</td>
+     </tr>
+    [% END %]
   </table>
 
   <table>