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

diff --git a/SL/Helper/DateTime.pm b/SL/Helper/DateTime.pm
index 58fe6f879..c79dad1b8 100644
--- a/SL/Helper/DateTime.pm
+++ b/SL/Helper/DateTime.pm
@@ -2,6 +2,8 @@ package DateTime;
 
 use strict;
 
+use SL::Util qw(_hashify);
+
 sub now_local {
   return shift->now(time_zone => $::locale->get_local_time_zone);
 }
@@ -10,12 +12,64 @@ 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);
+}
+
 sub to_lxoffice {
-  return $::locale->format_date(\%::myconfig, $_[0]);
+  # Legacy name.
+  goto &to_kivitendo;
+}
+
+sub from_kivitendo {
+  return $::locale->parse_date_to_object($_[1]);
 }
 
 sub from_lxoffice {
-  return $::locale->parse_date_to_object(\%::myconfig, $_[1]);
+  # Legacy name.
+  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;
@@ -40,16 +94,23 @@ Returns the current time with the time zone set to the local time zone.
 
 Returns the current date with the time zone set to the local time zone.
 
-=item C<to_lxoffice>
+=item C<to_kivitendo %param>
+
+Formats the date and time according to the current kivitendo user's
+date format with L<Locale::format_datetime_object>.
 
-Formats the date according to the current Lx-Office user's date
-format.
+The legacy name C<to_lxoffice> is still supported.
 
-=item C<from_lxoffice>
+=item C<from_kivitendo $string>
 
-Parses a date string formatted in the current Lx-Office user's date
+Parses a date string formatted in the current kivitendo user's date
 format and returns an instance of L<DateTime>.
 
+Note that only dates can be parsed at the moment, not the time
+component (as opposed to L<to_kivitendo>).
+
+The legacy name C<from_lxoffice> is still supported.
+
 =back
 
 =head1 AUTHOR