X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FHelper%2FDateTime.pm;h=c79dad1b84d919cee4485fe7914cdaa43dc7e35a;hb=81b492ac44ad8fc5207a9072039b972fb954c4dd;hp=639ed45318e31173e7ca65d8adb4129887bce08b;hpb=a23454bb1b039a31b7f77710ff663fa9152d530c;p=kivitendo-erp.git

diff --git a/SL/Helper/DateTime.pm b/SL/Helper/DateTime.pm
index 639ed4531..c79dad1b8 100644
--- a/SL/Helper/DateTime.pm
+++ b/SL/Helper/DateTime.pm
@@ -12,6 +12,11 @@ sub today_local {
   return shift->now(time_zone => $::locale->get_local_time_zone)->truncate(to => 'day');
 }
 
+sub to_kivitendo_time {
+  my ($self, %params) = _hashify(1, @_);
+  return $::locale->format_date_object_to_time($self, %params);
+}
+
 sub to_kivitendo {
   my ($self, %params) = _hashify(1, @_);
   return $::locale->format_date_object($self, %params);
@@ -23,7 +28,7 @@ sub to_lxoffice {
 }
 
 sub from_kivitendo {
-  return $::locale->parse_date_to_object(\%::myconfig, $_[1]);
+  return $::locale->parse_date_to_object($_[1]);
 }
 
 sub from_lxoffice {
@@ -31,6 +36,42 @@ sub from_lxoffice {
   goto &from_kivitendo;
 }
 
+sub add_business_duration {
+  my ($self, %params) = @_;
+
+  my $abs_days = abs $params{days};
+  my $neg      = $params{days} < 0;
+  my $bweek    = $params{businessweek} || 5;
+  my $weeks    = int ($abs_days / $bweek);
+  my $days     = $abs_days % $bweek;
+
+  if ($neg) {
+    $self->subtract(weeks => $weeks);
+    $self->add(days => 8 - $self->day_of_week) if $self->day_of_week > $bweek;
+    $self->subtract(days => $self->day_of_week > $days ? $days : $days + (7 - $bweek));
+  } else {
+    $self->add(weeks => $weeks);
+    $self->subtract(days => $self->day_of_week - $bweek) if $self->day_of_week > $bweek;
+    $self->add(days => $self->day_of_week + $days <= $bweek ? $days : $days + (7 - $bweek));
+  }
+
+  $self;
+}
+
+sub add_businessdays {
+  my ($self, %params) = @_;
+
+  $self->add_business_duration(%params);
+}
+
+sub subtract_businessdays {
+  my ($self, %params) = @_;
+
+  $params{days} *= -1;
+
+  $self->add_business_duration(%params);
+}
+
 1;
 
 __END__