Standardstundensatz in Tabelle defaults speichern, nicht in Konfigurationsdatei

diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm
index 1acd528b096e13d674f25a356715a112f5340c15..5ea038944bf85f829a88be19f8a0cc6d5c10b308 100644 (file)
--- a/SL/Controller/CustomerVendor.pm
+++ b/SL/Controller/CustomerVendor.pm
@@ -641,7 +641,7 @@ sub _instantiate_args {
     $self->{cv}->taxincluded_checked(undef);
   }
 
     $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;
+  $self->{cv}->hourly_rate($::instance_conf->get_customer_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};
 
   foreach my $cvar (@{$self->{cv}->cvars_by_config()}) {
     my $value = $::form->{cv_cvars}->{$cvar->config->name};

diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index 435fd2729a9e49d78b17388856dcf2ff70b711d1..c8f4ed4081e7dc694bbd23ea5c08dd415f47dc2e 100644 (file)
--- a/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@ -28,6 +28,7 @@ __PACKAGE__->meta->columns(
   coa                                           => { type => 'text' },
   company                                       => { type => 'text' },
   currency_id                                   => { type => 'integer', not_null => 1 },
   coa                                           => { type => 'text' },
   company                                       => { type => 'text' },
   currency_id                                   => { type => 'integer', not_null => 1 },

+  customer_hourly_rate                          => { type => 'numeric', precision => 2, scale => 8 },

   customernumber                                => { type => 'text' },
   datev_check_on_ap_transaction                 => { type => 'boolean', default => 'true' },
   datev_check_on_ar_transaction                 => { type => 'boolean', default => 'true' },
   customernumber                                => { type => 'text' },
   datev_check_on_ap_transaction                 => { type => 'boolean', default => 'true' },
   datev_check_on_ar_transaction                 => { type => 'boolean', default => 'true' },

diff --git a/config/kivitendo.conf.default b/config/kivitendo.conf.default
index 9cdf4d26d27985a68df50633d0f9cbaca1aa6afb..0005aba59d81a8b4754c4c7af6d55feca925bdbd 100644 (file)
--- a/config/kivitendo.conf.default
+++ b/config/kivitendo.conf.default
@@ -65,13 +65,6 @@ bind_password =
 # and "en" (English, not perfect) are available.
 language = de
 
 # 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
 [paths]
 # path to temporary files (must be writeable by the web server)
 userspath = users

diff --git a/sql/Pg-upgrade2/defaults_customer_hourly_rate.sql b/sql/Pg-upgrade2/defaults_customer_hourly_rate.sql
new file mode 100644 (file)
index 0000000..ae8ae1b
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_customer_hourly_rate.sql
@@ -0,0 +1,5 @@
+-- @tag: defaults_customer_hourly_rate
+-- @description: defaults_customer_hourly_rate
+-- @depends: requirement_specs
+ALTER TABLE defaults ADD COLUMN customer_hourly_rate NUMERIC(8, 2);
+UPDATE defaults SET customer_hourly_rate = 100.0;