Merge branch '2020-leistungsdatum'

[kivitendo-erp.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index 9270c55..c92d267 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -382,10 +382,11 @@ sub create_http_response {
     my $session_cookie_value = $main::auth->get_session_id();
 
     if ($session_cookie_value) {
-      $session_cookie = $cgi->cookie('-name'   => $main::auth->get_session_cookie_name(),
-                                     '-value'  => $session_cookie_value,
-                                     '-path'   => $uri->path,
-                                     '-secure' => $::request->is_https);
+      $session_cookie = $cgi->cookie('-name'    => $main::auth->get_session_cookie_name(),
+                                     '-value'   => $session_cookie_value,
+                                     '-path'    => $uri->path,
+                                     '-expires' => '+' . $::auth->{session_timeout} . 'm',
+                                     '-secure'  => $::request->is_https);
     }
   }
 
@@ -700,7 +701,10 @@ sub sort_columns {
 }
 #
 
-sub format_amount { shift; goto &SL::Helper::Number::_number; }
+sub format_amount {
+  my ($self, $myconfig, $amount, $places, $dash) = @_;
+  SL::Helper::Number::_format_number($amount, $places, %$myconfig, dash => $dash);
+}
 
 sub format_amount_units {
   $main::lxdebug->enter_sub();
@@ -787,7 +791,10 @@ sub format_string {
 
 #
 
-sub parse_amount { shift; goto &SL::Helper::Number::_parse_number; }
+sub parse_amount {
+  my ($self, $myconfig, $amount) = @_;
+  SL::Helper::Number::_parse_number($amount, %$myconfig);
+}
 
 sub round_amount { shift; goto &SL::Helper::Number::_round_number; }
 
@@ -2560,7 +2567,7 @@ sub create_links {
     $query =
       qq|SELECT
            a.cp_id, a.invnumber, a.transdate, a.${table}_id, a.datepaid, a.deliverydate,
-           a.duedate, a.ordnumber, a.taxincluded, (SELECT cu.name FROM currencies cu WHERE cu.id=a.currency_id) AS currency, a.notes,
+           a.duedate, a.tax_point, a.ordnumber, a.taxincluded, (SELECT cu.name FROM currencies cu WHERE cu.id=a.currency_id) AS currency, a.notes,
            a.mtime, a.itime,
            a.intnotes, a.department_id, a.amount AS oldinvtotal,
            a.paid AS oldtotalpaid, a.employee_id, a.gldate, a.type,
@@ -3223,7 +3230,7 @@ sub prepare_for_printing {
 
   # Format dates.
   $self->format_dates($output_dateformat, $output_longdates,
-                      qw(invdate orddate quodate pldate duedate reqdate transdate shippingdate deliverydate validitydate paymentdate datepaid
+                      qw(invdate orddate quodate pldate duedate reqdate transdate tax_point shippingdate deliverydate validitydate paymentdate datepaid
                          transdate_oe deliverydate_oe employee_startdate employee_enddate),
                       grep({ /^(?:datepaid|transdate_oe|reqdate|deliverydate|deliverydate_oe|transdate)_\d+$/ } keys(%{$self})));