Bessere Formatierung

[mfinanz.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index 19f2b5cf59342f490a9085148d136b3720980153..94d3c566afd1ee0fa6c081d17e46ac4079800f7f 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -380,9 +380,10 @@ sub _get_request_uri {
   my $self = shift;
 
   return URI->new($ENV{HTTP_REFERER})->canonical() if $ENV{HTTP_X_FORWARDED_FOR};
   my $self = shift;
 
   return URI->new($ENV{HTTP_REFERER})->canonical() if $ENV{HTTP_X_FORWARDED_FOR};

+  return URI->new                                  if !$ENV{REQUEST_URI}; # for testing

 
   my $scheme =  $ENV{HTTPS} && (lc $ENV{HTTPS} eq 'on') ? 'https' : 'http';
 
   my $scheme =  $ENV{HTTPS} && (lc $ENV{HTTPS} eq 'on') ? 'https' : 'http';

-  my $port   =  $ENV{SERVER_PORT} || '';
+  my $port   =  $ENV{SERVER_PORT};

   $port      =  undef if (($scheme eq 'http' ) && ($port == 80))
                       || (($scheme eq 'https') && ($port == 443));
 
   $port      =  undef if (($scheme eq 'http' ) && ($port == 80))
                       || (($scheme eq 'https') && ($port == 443));
 


@@ -479,7 +480,7 @@ sub header {
   );
 
   $self->{favicon} ||= "favicon.ico";
   );
 
   $self->{favicon} ||= "favicon.ico";

-  $self->{titlebar} = join ' - ', grep $_, $self->{title}, $self->{login}, $::myconfig{dbname}, $self->{version} if $self->{title};
+  $self->{titlebar} = join ' - ', grep $_, $self->{title}, $self->{login}, $::myconfig{dbname}, $self->{version} if $self->{title} || !$self->{titlebar};

 
   # build includes
   if ($self->{refresh_url} || $self->{refresh_time}) {
 
   # build includes
   if ($self->{refresh_url} || $self->{refresh_time}) {


@@ -2736,6 +2737,9 @@ sub create_links {
     $self->{TAX} = selectall_hashref_query($self, $dbh, $query);
   }
 
     $self->{TAX} = selectall_hashref_query($self, $dbh, $query);
   }
 

+  my $extra_columns = '';
+  $extra_columns   .= 'a.direct_debit, ' if $module eq 'AR';
+

   if ($self->{id}) {
     $query =
       qq|SELECT
   if ($self->{id}) {
     $query =
       qq|SELECT


@@ -2743,7 +2747,7 @@ sub create_links {
            a.duedate, a.ordnumber, a.taxincluded, a.curr AS currency, a.notes,
            a.intnotes, a.department_id, a.amount AS oldinvtotal,
            a.paid AS oldtotalpaid, a.employee_id, a.gldate, a.type,
            a.duedate, a.ordnumber, a.taxincluded, a.curr AS currency, a.notes,
            a.intnotes, a.department_id, a.amount AS oldinvtotal,
            a.paid AS oldtotalpaid, a.employee_id, a.gldate, a.type,

-           a.globalproject_id,
+           a.globalproject_id, ${extra_columns}

            c.name AS $table,
            d.description AS department,
            e.name AS employee
            c.name AS $table,
            d.description AS department,
            e.name AS employee