X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FForm.pm;h=6e781b80e1f8673350cb1b1ed056969abc0f12be;hb=786b3862388eb8d4cdcc5dfc663a37fe0e9a82a1;hp=067a002cfb0bd88d48e5d99c4c72660717e43591;hpb=2740f3f03035bd1db6d32edaceca6c413ed81496;p=kivitendo-erp.git

diff --git a/SL/Form.pm b/SL/Form.pm
index 067a002cf..6e781b80e 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -41,7 +41,6 @@ use Data::Dumper;
 use CGI;
 use CGI::Ajax;
 use Cwd;
-use List::Util qw(min max);
 use SL::Auth;
 use SL::Auth::DB;
 use SL::Auth::LDAP;
@@ -577,6 +576,7 @@ sub header {
     if ($self->{jsscript} == 1) {
 
       $jsscript = qq|
+        <script type="text/javascript" src="js/common.js"></script>
         <style type="text/css">\@import url(js/jscalendar/calendar-win2k-1.css);</style>
         <script type="text/javascript" src="js/jscalendar/calendar.js"></script>
         <script type="text/javascript" src="js/jscalendar/lang/calendar-de.js"></script>
@@ -1411,6 +1411,11 @@ sub get_standard_dbh {
 
   my ($self, $myconfig) = @_;
 
+  if ($standard_dbh && !$standard_dbh->{Active}) {
+    $main::lxdebug->message(LXDebug::INFO, "get_standard_dbh: \$standard_dbh is defined but not Active anymore");
+    undef $standard_dbh;
+  }
+
   $standard_dbh ||= $self->dbconnect_noauto($myconfig);
 
   $main::lxdebug->leave_sub(2);
@@ -1418,6 +1423,21 @@ sub get_standard_dbh {
   return $standard_dbh;
 }
 
+sub date_closed {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $date, $myconfig) = @_;
+  my $dbh = $self->dbconnect($myconfig);
+
+  my $query = "SELECT 1 FROM defaults WHERE ? < closedto";
+  my $sth = prepare_execute_query($self, $dbh, $query, $date);
+  my ($closed) = $sth->fetchrow_array;
+
+  $main::lxdebug->leave_sub();
+
+  return $closed;
+}
+
 sub update_balance {
   $main::lxdebug->enter_sub();
 
@@ -2146,41 +2166,22 @@ sub _get_warehouses {
 
   my ($self, $dbh, $param) = @_;
 
-  my ($key, $bins_key, $q_access, @values);
+  my ($key, $bins_key);
 
   if ('' eq ref $param) {
     $key = $param;
+
   } else {
     $key      = $param->{key};
     $bins_key = $param->{bins};
-
-    if ($param->{access}) {
-      $q_access =
-        qq| AND EXISTS (
-              SELECT wa.employee_id
-              FROM warehouse_access wa
-              WHERE (wa.employee_id  = (SELECT id FROM employee WHERE login = ?))
-                AND (wa.warehouse_id = w.id)
-                AND (wa.access IN ('ro', 'rw')))|;
-      push @values, $param->{access};
-    }
-
-    if ($param->{no_personal}) {
-      $q_access .= qq| AND (w.personal_warehouse_of IS NULL)|;
-
-    } elsif ($param->{personal}) {
-      $q_access .= qq| AND (w.personal_warehouse_of = ?)|;
-      push @values, conv_i($param->{personal});
-    }
   }
 
   my $query = qq|SELECT w.* FROM warehouse w
                  WHERE (NOT w.invalid) AND
                    ((SELECT COUNT(b.*) FROM bin b WHERE b.warehouse_id = w.id) > 0)
-                   $q_access
                  ORDER BY w.sortkey|;
 
-  $self->{$key} = selectall_hashref_query($self, $dbh, $query, @values);
+  $self->{$key} = selectall_hashref_query($self, $dbh, $query);
 
   if ($bins_key) {
     $query = qq|SELECT id, description FROM bin WHERE warehouse_id = ?|;
@@ -2746,36 +2747,52 @@ sub lastname_used {
 
   my ($self, $dbh, $myconfig, $table, $module) = @_;
 
-  my $arap  = ($table eq 'customer') ? "ar" : "ap";
-  $table = $table eq "customer" ? "customer" : "vendor";
-  my $where = "1 = 1";
+  my ($arap, $where);
+
+  $table         = $table eq "customer" ? "customer" : "vendor";
+  my %column_map = ("a.curr"                  => "currency",
+                    "a.${table}_id"           => "${table}_id",
+                    "a.department_id"         => "department_id",
+                    "d.description"           => "department",
+                    "ct.name"                 => $table,
+                    "current_date + ct.terms" => "duedate",
+    );
+
+  if ($self->{type} =~ /delivery_order/) {
+    $arap  = 'delivery_orders';
+    delete $column_map{"a.curr"};
 
-  if ($self->{type} =~ /_order/) {
+  } elsif ($self->{type} =~ /_order/) {
     $arap  = 'oe';
     $where = "quotation = '0'";
-  }
-  if ($self->{type} =~ /_quotation/) {
+
+  } elsif ($self->{type} =~ /_quotation/) {
     $arap  = 'oe';
     $where = "quotation = '1'";
+
+  } elsif ($table eq 'customer') {
+    $arap  = 'ar';
+
+  } else {
+    $arap  = 'ap';
+
   }
 
-  my $query = qq|SELECT MAX(id) FROM $arap
-                 WHERE $where AND ${table}_id > 0|;
-  my ($trans_id) = selectrow_query($self, $dbh, $query);
+  $where           = "($where) AND" if ($where);
+  my $query        = qq|SELECT MAX(id) FROM $arap
+                        WHERE $where ${table}_id > 0|;
+  my ($trans_id)   = selectrow_query($self, $dbh, $query);
+  $trans_id       *= 1;
 
-  $trans_id *= 1;
-  $query =
-    qq|SELECT
-         a.curr, a.${table}_id, a.department_id,
-         d.description AS department,
-         ct.name, current_date + ct.terms AS duedate
-       FROM $arap a
-       LEFT JOIN $table ct ON (a.${table}_id = ct.id)
-       LEFT JOIN department d ON (a.department_id = d.id)
-       WHERE a.id = ?|;
-  ($self->{currency},   $self->{"${table}_id"}, $self->{department_id},
-   $self->{department}, $self->{$table},        $self->{duedate})
-    = selectrow_query($self, $dbh, $query, $trans_id);
+  my $column_spec  = join(', ', map { "${_} AS $column_map{$_}" } keys %column_map);
+  $query           = qq|SELECT $column_spec
+                        FROM $arap a
+                        LEFT JOIN $table     ct ON (a.${table}_id = ct.id)
+                        LEFT JOIN department d  ON (a.department_id = d.id)
+                        WHERE a.id = ?|;
+  my $ref          = selectfirst_hashref_query($self, $dbh, $query, $trans_id);
+
+  map { $self->{$_} = $ref->{$_} } values %column_map;
 
   $main::lxdebug->leave_sub();
 }