From: Jan Büren <jan@lx-office-hosting.de>
Date: Wed, 12 Oct 2011 14:44:44 +0000 (+0200)
Subject: Merge branch 'master' of git@vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-2.7.0beta1~230^2~1
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/debd14edcc23a6168e827be861a052f396aee901?ds=inline;hp=-c

Merge branch 'master' of git@vc.linet-services.de:public/lx-office-erp
---

debd14edcc23a6168e827be861a052f396aee901
diff --combined SL/Form.pm
index 85ba6f0e0,a1bb2b1f3..b9ba6942f
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@@ -697,13 -697,13 +697,13 @@@ sub header 
    push @header, "<link rel='shortcut icon' href='$self->{favicon}' type='image/x-icon'>" if -f $self->{favicon};
    push @header, '<script type="text/javascript" src="js/jquery.js"></script>',
                  '<script type="text/javascript" src="js/common.js"></script>',
-                 '<style type="text/css">@import url(js/jscalendar/calendar-win2k-1.css);</style>',
+                 '<link rel="stylesheet" type="text/css" href="js/jscalendar/calendar-win2k-1.css">',
                  '<script type="text/javascript" src="js/jscalendar/calendar.js"></script>',
                  '<script type="text/javascript" src="js/jscalendar/lang/calendar-de.js"></script>',
                  '<script type="text/javascript" src="js/jscalendar/calendar-setup.js"></script>',
                  '<script type="text/javascript" src="js/part_selection.js"></script>',
                  '<script type="text/javascript" src="js/jquery-ui.js"></script>',
-                 '<style "type=text/css">@import url("css/ui-lightness/jquery-ui-1.8.12.custom.css")</style>';
+                 '<link rel="stylesheet" type="text/css" href="css/ui-lightness/jquery-ui-1.8.12.custom.css">';
    push @header, $self->{javascript} if $self->{javascript};
    push @header, map { $_->show_javascript } @{ $self->{AJAX} || [] };
    push @header, "<script type='text/javascript'>function fokus(){ document.$self->{fokus}.focus(); }</script>" if $self->{fokus};
@@@ -2757,12 -2757,20 +2757,12 @@@ sub all_vc 
    @{ $self->{all_employees} } =
      sort { $a->{name} cmp $b->{name} } @{ $self->{all_employees} };
  
 -  if ($module eq 'AR') {
  
      # prepare query for departments
      $query = qq|SELECT id, description
                  FROM department
 -                WHERE role = 'P'
                  ORDER BY description|;
  
 -  } else {
 -    $query = qq|SELECT id, description
 -                FROM department
 -                ORDER BY description|;
 -  }
 -
    $self->{all_departments} = selectall_hashref_query($self, $dbh, $query);
  
    # get languages
@@@ -2832,9 -2840,15 +2832,9 @@@ sub all_departments 
    my ($self, $myconfig, $table) = @_;
  
    my $dbh = $self->get_standard_dbh($myconfig);
 -  my $where;
 -
 -  if ($table eq 'customer') {
 -    $where = "WHERE role = 'P' ";
 -  }
  
    my $query = qq|SELECT id, description
                   FROM department
 -                 $where
                   ORDER BY description|;
    $self->{all_departments} = selectall_hashref_query($self, $dbh, $query);
  
@@@ -2954,6 -2968,9 +2954,9 @@@ sub create_links 
        $self->{$key} = $ref->{$key};
      }
  
+     # remove any trailing whitespace
+     $self->{currency} =~ s/\s*$//;
+ 
      my $transdate = "current_date";
      if ($self->{transdate}) {
        $transdate = $dbh->quote($self->{transdate});
@@@ -3130,6 -3147,9 +3133,9 @@@ sub lastname_used 
  
    map { $self->{$_} = $ref->{$_} } values %column_map;
  
+   # remove any trailing whitespace
+   $self->{currency} =~ s/\s*$// if $self->{currency};
+ 
    $main::lxdebug->leave_sub();
  }